fix

src/views/approve_manage/approveList.vue

@@ -115,7 +115,13 @@
                             <template v-if="activeTab==='originate'">
                                 <el-button type="text" style="padding:0;" @click="toApproveDetail(row,'myself')">{{$t('AprrovalPage.details_table')}}</el-button>
                                 <el-button type="text" style="padding:0;" @click="cancelApprove(row)" 
-                                    v-if="row.State!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">{{$t('AprrovalPage.cancel_table')}}</el-button>
+                                    v-if="
+                                        ((row.State!==4&&activeMainTab==='bi') 
+                                          || [2,4].includes(activeMainTab)
+                                        )
+                                        &&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')
+                                    "
+                                >{{$t('AprrovalPage.cancel_table')}}</el-button>
                                 <el-button type="text" style="padding:0" @click="handleShowDetail(row)" 
                                     v-if="row.State===3&&permissionBtn.isShowBtn('approvePermission','reportApprove_rejectreason')">{{$t('AprrovalPage.rejection_table')}}</el-button>
                             </template>
@@ -185,7 +191,7 @@ export default {
                 { label: '提交时间',key:'CreateTime',show: true,sortable:true },
                 { label: '审批状态',key:'RecordState',show: this.activeTab==='pending' },
                 { label: '处理时间',key:'HandleTime',show: ['processed','originate'].includes(this.activeTab) },
-                { label: '处理状态',key:'RecordState',show: ['processed','originate'].includes(this.activeTab) },
+                { label: '处理状态',key:'State',show: ['processed','originate'].includes(this.activeTab) },
             ]
 
             let resultCols = columns.filter(_ => _.show);

src/views/approve_manage/components/EdbChartApproveWrapper.vue

@@ -56,7 +56,7 @@
                 v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_agree')">同意</el-button>
 
             <el-button type="primary" @click="$parent.changeApprove('return')"
-              v-if="formType==='myself'&&approveInfo.state!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
+              v-if="formType==='myself'&&![2,4].includes(approveInfo.state)&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
             <el-button type="primary" plain @click="$router.replace(`/approveList?formType=${formType}&mainType=${mainType}`)">返回</el-button>
         </div>
       </div>

src/views/dataEntry_manage/databaseComponents/edbTableList.vue

@@ -171,7 +171,7 @@ export default {
 				{
 					label: '创建人',
 					key: 'SysUserRealName',
-          isShow: !this.isBasicBase
+          isShow: !this.isBasicBase && this.treeName!=='collect'
 				},
 				{
 					label: '创建日期',