diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 5000903..eefa334 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -79,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean, isReset?: false) => {
+const fetchData = (isNowPage: boolean, isReset = false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -449,7 +449,7 @@
                   取消
                 </el-button>
                 <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                   size="small"
                   link
@@ -458,6 +458,17 @@
                   @click="clickBtn(row, '删除')"
                 >
                   删除
+                </el-button> -->
+                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
+                  删除
                 </el-button>
               </template>
             </el-table-column>

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 5000903..eefa334 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -79,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean, isReset?: false) => {
+const fetchData = (isNowPage: boolean, isReset = false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -449,7 +449,7 @@
                   取消
                 </el-button>
                 <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                   size="small"
                   link
@@ -458,6 +458,17 @@
                   @click="clickBtn(row, '删除')"
                 >
                   删除
+                </el-button> -->
+                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 40101f9..cf15fd7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,11 +25,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 
 // 查询条件
@@ -408,37 +404,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6' || (status === '5' && row.approvalStatusName === '未通过-驳回'))"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -447,7 +443,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -457,7 +453,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -467,8 +463,19 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 5000903..eefa334 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -79,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean, isReset?: false) => {
+const fetchData = (isNowPage: boolean, isReset = false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -449,7 +449,7 @@
                   取消
                 </el-button>
                 <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                   size="small"
                   link
@@ -458,6 +458,17 @@
                   @click="clickBtn(row, '删除')"
                 >
                   删除
+                </el-button> -->
+                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 40101f9..cf15fd7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,11 +25,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 
 // 查询条件
@@ -408,37 +404,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6' || (status === '5' && row.approvalStatusName === '未通过-驳回'))"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -447,7 +443,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -457,7 +453,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -467,8 +463,19 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index d9974cf..4280295 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -306,12 +306,11 @@
               <el-input
                 v-model="formInline.trainName"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    :disabled="pageType === 'detail'"
                     @click="selectPlanId"
                   >
                     选择
@@ -325,7 +324,7 @@
               <el-input
                 v-model="formInline.trainPerson"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -334,7 +333,7 @@
               <el-input
                 v-model="formInline.trainNumber"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -343,7 +342,7 @@
               <el-input
                 v-model="formInline.trainHour"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -355,7 +354,7 @@
                 placeholder="培训时间"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -366,7 +365,7 @@
               <el-input
                 v-model="formInline.trainAddress"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -377,7 +376,7 @@
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -421,7 +420,7 @@
               <el-input
                 v-model="formInline.remark"
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 5000903..eefa334 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -79,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean, isReset?: false) => {
+const fetchData = (isNowPage: boolean, isReset = false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -449,7 +449,7 @@
                   取消
                 </el-button>
                 <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                   size="small"
                   link
@@ -458,6 +458,17 @@
                   @click="clickBtn(row, '删除')"
                 >
                   删除
+                </el-button> -->
+                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 40101f9..cf15fd7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,11 +25,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 
 // 查询条件
@@ -408,37 +404,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6' || (status === '5' && row.approvalStatusName === '未通过-驳回'))"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -447,7 +443,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -457,7 +453,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -467,8 +463,19 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index d9974cf..4280295 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -306,12 +306,11 @@
               <el-input
                 v-model="formInline.trainName"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    :disabled="pageType === 'detail'"
                     @click="selectPlanId"
                   >
                     选择
@@ -325,7 +324,7 @@
               <el-input
                 v-model="formInline.trainPerson"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -334,7 +333,7 @@
               <el-input
                 v-model="formInline.trainNumber"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -343,7 +342,7 @@
               <el-input
                 v-model="formInline.trainHour"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -355,7 +354,7 @@
                 placeholder="培训时间"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -366,7 +365,7 @@
               <el-input
                 v-model="formInline.trainAddress"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -377,7 +376,7 @@
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -421,7 +420,7 @@
               <el-input
                 v-model="formInline.remark"
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 6189806..958572a 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -8,9 +8,7 @@
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButtonApprove[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -29,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [

diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 17040fc..c81ef0b 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -357,7 +357,7 @@
           addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data.data
             }
           })
         })
@@ -706,7 +706,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:">
+            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordCode">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
@@ -721,7 +721,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:">
+            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
                 class="full-width-input"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 21b9831..98a2567 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -7,17 +7,15 @@
 const menus = ref<MenuType[]>([]) // 右上角菜单组
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
-    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
@@ -28,19 +26,22 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 } // 操作按钮组
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 207663f..c47d53e 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -31,7 +31,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 40 + 24
+  return props.buttons.length * 40 + 20
 })
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 // 查询条件
@@ -153,8 +153,8 @@
     .then(() => {
       cancelApproval(params).then(() => {
         ElMessage.success('已取消')
+        fetchData(true)
       })
-      fetchData(true)
     })
 }
 
@@ -380,7 +380,7 @@
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/lab/reportOnCredentialsApproval/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
@@ -397,7 +397,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
                 size="small"
@@ -406,6 +406,95 @@
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
+              </el-button> -->
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="clickBtn(row, '查看')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/agree') && row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/regect') && row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/refuse') && row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/edit') && row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '编辑')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="clickBtn(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/cancel') && row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="clickBtn(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- -----------------------------审批中的删除暂时去掉-------------------------- -->
+              <el-button
+                v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index b6c115c..cbc4a70 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-  approvalStatusName: string // 审批状态名称
+  approvalStatusName?: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index a236a10..747971d 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -269,10 +269,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IlistApproval, buttonType: string) => {
@@ -312,10 +308,7 @@
     fetchData(false)
   },
   { immediate: true })
-// 导出id类型
-interface ISupplierTable {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 62da755..6229abf 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -30,11 +30,7 @@
 const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 // 获取字典值
 async function getDict() {
@@ -481,7 +477,7 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
+              <!-- <el-button
                 v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
@@ -490,6 +486,17 @@
                 @click="clickBtn(row, '删除')"
               >
                 删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index bc8fe9d..4f4be24 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -1,19 +1,14 @@
+<!-- 设备管理点新建、详情 -->
 <script lang="ts" setup name="manageAdd">
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
-import { validatePhone } from '@/utils/validate'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import type { IAddress } from '@/components/AddressSelect/address-interface'
 import useUserStore from '@/store/modules/user'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const userInfo = useUserStore()
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -37,7 +32,7 @@
   checkResultName: '', // 检修单位名称
   createTime: '', // 创建时间
   createUser: userInfo.id, // 创建人
-  createUserName: userInfo.username, // 创建人名称
+  createUserName: userInfo.name, // 创建人名称
   fileList: [
     {
       applyId: '', // 申请id
@@ -71,7 +66,7 @@
   checkPerson: [{ required: true, message: '检查人不能为空', trigger: ['blur', 'change'] }],
   managerPoinLocation: [{ required: true, message: '管理点位置不能为空', trigger: ['blur', 'change'] }],
   checkDate: [{ required: true, message: '检查日期不能为空', trigger: ['blur', 'change'] }],
-  createUser: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
+  createUserName: [{ required: true, message: '管理点负责人不能为空', trigger: ['blur', 'change'] }],
   checkResult: [{ required: true, message: '检查结果不能为空', trigger: ['blur', 'change'] }],
   remark: [{ required: true, message: '内容描述不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
@@ -103,7 +98,7 @@
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认提交吗？',
+        '确认保存吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -117,6 +112,7 @@
           // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
           })
@@ -126,11 +122,6 @@
   })
 }
 
-const isShow = ref(false)
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -168,7 +159,7 @@
           打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          提交
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -239,7 +230,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="管理点负责人:" prop="createUser">
+              <el-form-item label="管理点负责人:" prop="createUserName">
                 <el-input
                   v-model="formInline.createUserName"
                   :placeholder="pageType === 'detail' ? '' : '请输入管理点负责人'"
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 2e4bfe4..622fdfb 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -27,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
@@ -43,7 +43,6 @@
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
-
 }
 // 当前tab
 const currentTab = ref('全部')
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 203d325..98b01f2 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -1,11 +1,12 @@
-<script lang="ts" setup name="ListSource">
+<!-- 设备管理点检查列表 -->
+<script lang="ts" setup name="ManageCheckList">
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
-import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
@@ -75,7 +76,12 @@
   listQuery.value.checkStartDate = checkDate.value[0] || ''
   listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: dayjs(item.checkDate).format('YYYY-MM-DD'),
+      }
+    })
     total.value = response.data.total
     loadingTable.value = false
   })
@@ -137,27 +143,6 @@
   fetchData(true)
 }
 
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -169,11 +154,6 @@
   fetchData(true)
 }
 
-// 批量导入
-// const uploadAll = () => {
-//   // todo: 批量导入
-//   fileRef.value.click()
-// }
 // 添加设备管理点检查
 const add = () => {
   $router.push('/maintenance/manageCheckList/add')
@@ -243,22 +223,19 @@
           v-model="checkDate"
           type="datetimerange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检查开始日期"
+          end-placeholder="检查结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
-        <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
-      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index deafc01..7bded86 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -452,6 +452,98 @@
             </template>
           </el-table-column>
         </template>
+        <template #default="{ row }">
+          <el-button
+            size="small"
+            type="primary"
+            link
+            @click="handleEdit(row, '查看', 'detail')"
+          >
+            查看
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批'"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '同意')"
+          >
+            同意
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+            size="small"
+            link
+            type="primary"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '驳回')"
+          >
+            驳回
+          </el-button>
+          <el-button
+            v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '拒绝')"
+          >
+            拒绝
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '编辑', 'edit')"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+            size="small"
+            link
+            type="primary"
+            @click="handleEdit(row, '提交')"
+          >
+            提交
+          </el-button>
+          <!-- 是发起者且审批中可以取消 -->
+          <el-button
+            v-if="row.approvalStatusName === '审批中'"
+            size="small"
+            link
+            type="info"
+            :disabled="row.approvalStatusName !== '审批中'"
+            @click="handleEdit(row, '取消')"
+          >
+            取消
+          </el-button>
+          <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+          <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+          <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+          <el-button
+            v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+            size="small"
+            link
+            type="danger"
+            :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+            @click="handleEdit(row, '删除')"
+          >
+            删除
+          </el-button>
+        </template>
+        <!-- ------------------------------------------------- -->
         <template #columns>
           <el-table-column
             label="操作"
@@ -469,37 +561,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -508,7 +600,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -518,22 +610,33 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
-                :disabled="row.approvalStatus !== '审批中'"
+                :disabled="row.approvalStatusName !== '审批中'"
                 @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <el-button
-                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
                 @click="handleEdit(row, '删除')"
               >
                 删除
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 8592140..60eeebb 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="ListSourceAdd">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
 import type { optionsType, priceForm } from './list_interface'
@@ -108,33 +108,32 @@
 })
 
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log(priceStandardName)
-  console.log(formEl)
+const getAddList = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
       // 新增提交
-        if (type === '提交' && pageType.value !== 'edit') {
+        if (pageType.value === 'add') { // 新建
           buttonLoading.value = true
           getPriceAddList(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
           }).catch(_ => buttonLoading.value = false)
         }
         // 编辑提交
-        else if (type === '提交' && pageType.value === 'edit') {
+        else if (pageType.value === 'edit') { // 保存
           formInline.value.id = infoId.value
           buttonLoading.value = true
           delete formInline.value.isDel
@@ -143,6 +142,7 @@
           delete formInline.value.updateTime
           getUpdatePriceInfo(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('保存成功')
               close()
             }
             buttonLoading.value = false
@@ -168,7 +168,6 @@
 }
 // 选择价格依据
 const verificationList = (data: dataType) => {
-  console.log(data)
   formInline.value.priceStandard = data.id
   priceStandardName.value = data.fileName
   formInline.value.priceStandardName = priceStandardName.value
@@ -179,7 +178,7 @@
   <app-container>
     <detail-page :title="`价格列表-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef, '提交')">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="getAddList(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 5000903..eefa334 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -79,7 +79,7 @@
 const loadingTable = ref(false)
 
 // 获取数据
-const fetchData = (isNowPage: boolean, isReset?: false) => {
+const fetchData = (isNowPage: boolean, isReset = false) => {
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -449,7 +449,7 @@
                   取消
                 </el-button>
                 <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
                   size="small"
                   link
@@ -458,6 +458,17 @@
                   @click="clickBtn(row, '删除')"
                 >
                   删除
+                </el-button> -->
+                <!-- ------------------------------------审批中的删除暂时去掉-------------------------------- -->
+                <el-button
+                  v-if="proxy.hasPerm('/train/plan/approve/delete') && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
+                  size="small"
+                  link
+                  type="danger"
+                  :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                  @click="clickBtn(row, '删除')"
+                >
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 40101f9..cf15fd7 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -25,11 +25,7 @@
 const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  // 审批中状态时候长度返回错误
-  if (props.status === '3' || props.status === '6') {
-    props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度
-  }
-  return props.buttons.length * 40 + 23
+  return props.buttons.length * 40 + 20
 })
 
 // 查询条件
@@ -408,37 +404,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/agree') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批'"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/regect') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
                 size="small"
                 link
                 type="primary"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/refuse') && (status === '0' || status === '2')"
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
                 size="small"
                 link
                 type="danger"
-                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/edit') && (status === '1' || status === '6' || (status === '5' && row.approvalStatusName === '未通过-驳回'))"
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -447,7 +443,7 @@
                 编辑
               </el-button>
               <el-button
-                v-if="status === '1' || status === '6'"
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
                 type="primary"
@@ -457,7 +453,7 @@
               </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/cancel') && (status === '0' || status === '3')"
+                v-if="row.approvalStatusName === '审批中'"
                 size="small"
                 link
                 type="info"
@@ -467,8 +463,19 @@
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="clickBtn(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
               <el-button
-                v-if="proxy.hasPerm('/train/plan/approve/delete') && (status !== '4' && status !== '5')"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index d9974cf..4280295 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -306,12 +306,11 @@
               <el-input
                 v-model="formInline.trainName"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    :disabled="pageType === 'detail'"
                     @click="selectPlanId"
                   >
                     选择
@@ -325,7 +324,7 @@
               <el-input
                 v-model="formInline.trainPerson"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -334,7 +333,7 @@
               <el-input
                 v-model="formInline.trainNumber"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -343,7 +342,7 @@
               <el-input
                 v-model="formInline.trainHour"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -355,7 +354,7 @@
                 placeholder="培训时间"
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -366,7 +365,7 @@
               <el-input
                 v-model="formInline.trainAddress"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -377,7 +376,7 @@
               <el-input
                 v-model="formInline.trainContent"
                 :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -421,7 +420,7 @@
               <el-input
                 v-model="formInline.remark"
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 6189806..958572a 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -8,9 +8,7 @@
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButtonApprove[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger' },
   ],
@@ -29,7 +27,7 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
     { name: '取消', type: 'info' },
   ],
   已通过: [
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 1d69fe0..eab9f8a 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -299,7 +299,7 @@
       <table-container>
         <template #btns-right>
           <icon-button v-if="proxy.hasPerm('/sys/process/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/sys/process/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <!-- <icon-button v-if="proxy.hasPerm('/sys/process/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
           <icon-button v-if="proxy.hasPerm('/sys/process/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>