diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 19f62f2..ed79d61 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -406,7 +406,7 @@
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 19f62f2..ed79d61 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -406,7 +406,7 @@
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 293b325..273413e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -20,7 +20,7 @@
 const getMenuList = async () => {
   const response = await getDictByCode('fileType')
   menu.value.forEach((item: menuType, index: Number) => {
-    item.name = response.data[index].name
+    item.name = response.data[index as number].name
   })
   console.log(menu, 'menu')
 }

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 19f62f2..ed79d61 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -406,7 +406,7 @@
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 293b325..273413e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -20,7 +20,7 @@
 const getMenuList = async () => {
   const response = await getDictByCode('fileType')
   menu.value.forEach((item: menuType, index: Number) => {
-    item.name = response.data[index].name
+    item.name = response.data[index as number].name
   })
   console.log(menu, 'menu')
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bd26dd9..c75b5c1 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -399,7 +399,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 19f62f2..ed79d61 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -406,7 +406,7 @@
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 293b325..273413e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -20,7 +20,7 @@
 const getMenuList = async () => {
   const response = await getDictByCode('fileType')
   menu.value.forEach((item: menuType, index: Number) => {
-    item.name = response.data[index].name
+    item.name = response.data[index as number].name
   })
   console.log(menu, 'menu')
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bd26dd9..c75b5c1 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -399,7 +399,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 5c915a2..aa70557 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -243,9 +243,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
                 <template #append>
-                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -254,17 +254,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
               <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
@@ -311,13 +311,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>

diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 6e0ecd2..37bfead 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -117,6 +117,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -286,6 +287,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/advice/delete')"
                 size="small"
                 link
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index f212125..5c569a8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -483,7 +483,7 @@
     <detail-page v-loading="loading" :title="`客户-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印1
+          打印
         </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue
index ef1ceca..f2a36a5 100644
--- a/src/views/customer/customerInfo/customerList.vue
+++ b/src/views/customer/customerInfo/customerList.vue
@@ -140,6 +140,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -298,6 +299,7 @@
                 详情
               </el-button>
               <el-button
+                v-show="false"
                 v-if="proxy.hasPerm('/meter/customer/delete')"
                 size="small"
                 link
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index a59267d..0a4cf0a 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -588,6 +588,7 @@
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
+                v-show="activeTitle === '草稿箱' ? true : false"
                 v-if="proxy.hasPerm('/device/borrow/borrowapply/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
                 size="small"
                 link
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 8b6b4ac..65ec9ca 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -411,7 +411,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/${$props.authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index 2f0609d..be8a578 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/device/fixedAssets/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/device/fixedAssets/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 4ee4d44..1d06902 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -606,6 +606,7 @@
                   取消
                 </el-button>
                 <el-button
+                  v-show="activeTitle === '草稿箱' ? true : false"
                   v-if="proxy.hasPerm('/device/unusedApply/delete') && !['未通过', '已通过'].includes(activeTitle)"
                   :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
                   size="small"
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index f58da25..44876b7 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -165,7 +165,10 @@
     },
   )
     .then(() => {
-      approvalCancel({ processInstanceId: processId }).then((res) => {
+      approvalCancel({
+        comments: '',
+        processInstanceId: processId,
+      }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -361,7 +364,7 @@
                     拒绝
                   </el-button>
                 </template>
-                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" link @click="cancel(row)">
+                <el-button v-if="proxy.hasPerm('/file/approve/cancle') && ['审批中', '全部'].includes(activeTitle)" size="small" type="primary" :disabled="row.approvalStatusName !== '审批中'" link @click="cancel(row)">
                   取消
                 </el-button>
                 <el-button v-if="proxy.hasPerm('/file/approve/delete') && !['已通过', '未通过'].includes(activeTitle)" size="small" type="danger" link @click="remove(row)">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 19f62f2..ed79d61 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -406,7 +406,7 @@
                 <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue
index 293b325..273413e 100644
--- a/src/views/measure/file/quality.vue
+++ b/src/views/measure/file/quality.vue
@@ -20,7 +20,7 @@
 const getMenuList = async () => {
   const response = await getDictByCode('fileType')
   menu.value.forEach((item: menuType, index: Number) => {
-    item.name = response.data[index].name
+    item.name = response.data[index as number].name
   })
   console.log(menu, 'menu')
 }
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index bd26dd9..c75b5c1 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -399,7 +399,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue
index 5c915a2..aa70557 100644
--- a/src/views/measure/person/components/addRecord.vue
+++ b/src/views/measure/person/components/addRecord.vue
@@ -243,9 +243,9 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="人员编号" prop="staffNo">
-              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title === '详情'" @focus="selectPerson">
+              <el-input v-model.trim="meterStaff.staffNo" placeholder="人员编号" :disabled="title !== '新建'" @focus="selectPerson">
                 <template #append>
-                  <el-button size="small" :disabled="title === '详情'" @click="selectPerson">
+                  <el-button size="small" :disabled="title !== '新建'" @click="selectPerson">
                     选择
                   </el-button>
                 </template>
@@ -254,17 +254,17 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="姓名" prop="meterStaff.name">
-              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title === '详情'" />
+              <el-input v-model.trim="meterStaff.name" placeholder="姓名" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="身份证号" prop="idCard">
-              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title === '详情'" />
+              <el-input ref="cardRef" v-model.trim="meterStaff.idCard" placeholder="身份证号" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="性别" prop="meterStaff.sex">
-              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.sex" placeholder="请选择性别" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in sexList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -273,21 +273,21 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="文化程度" prop="meterStaff.education">
-              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.education" placeholder="文化程度" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in educationList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="技术职务" prop="meterStaff.technologyJob">
-              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.technologyJob" placeholder="技术职务" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in technologyJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="行政职务" prop="meterStaff.administrationJob">
-              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="meterStaff.administrationJob" placeholder="行政职务" :disabled="title !== '新建'" style="width: 100%;">
                 <el-option v-for="item in administrationJobList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="工作部门" prop="deptId">
-              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
+              <dept-select v-model="meterStaff.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title !== '新建'" style="width: 100%;" />
               <!-- <el-select v-if="title === '详情'" v-model="meterStaff.deptId" disabled style="width: 100%;">
                 <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
@@ -311,13 +311,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="计量专业" prop="major">
-              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-input v-model.trim="meterStaff.major" placeholder="计量专业" :disabled="title !== '新建'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="从事日期" prop="workDate">
               <el-date-picker
-                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                v-model="meterStaff.workDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title !== '新建'"
                 placeholder="请选择从事日期" style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index fbd4aab..79c8659 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -308,7 +308,7 @@
                 <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
+                <el-button v-show="false" v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>