Browse Source

合并冲突

yujinwen 5 days ago
parent
commit
82021c9a4f
2 changed files with 6 additions and 1 deletions
  1. 3 1
      src/views/report/List.vue
  2. 3 0
      src/views/report/PreviewDetail.vue

+ 3 - 1
src/views/report/List.vue

@@ -440,6 +440,8 @@ function handleConfirmClassify(arr){
 // 跳转详情
 function goDetail(item){
     console.log(item);
+    //权益研报不跳转
+    if(item.RaiReportId>0) return
     //若没有预览权限,则不跳转
     if(!checkAuthBtn(reportManageBtn.reportManage_reportView)) return 
     router.push({
@@ -694,7 +696,7 @@ onMounted(async ()=>{
                             <span v-permission="reportManageBtn.reportManage_reportList_uv">UV:{{item.Uv}}</span>
                         </div>
                         
-                        <div class="handle-icon" @click.stop="handleOptReportItem(item)" v-if="item.ClassifyEnabled">
+                        <div class="handle-icon" @click.stop="handleOptReportItem(item)" v-if="item.ClassifyEnabled&&item.RaiReportId===0">
                             <svg width="24" height="24" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
                                 <path d="M16 8C17.1045 8 18 7.10455 18 6C18 4.89545 17.1045 4 16 4C14.8955 4 14 4.89545 14 6C14 7.10455 14.8955 8 16 8Z" fill="black" fill-opacity="0.9"/>
                                 <path d="M16 18C17.1045 18 18 17.1046 18 16C18 14.8954 17.1045 14 16 14C14.8955 14 14 14.8954 14 16C14 17.1046 14.8955 18 16 18Z" fill="black" fill-opacity="0.9"/>

+ 3 - 0
src/views/report/PreviewDetail.vue

@@ -39,7 +39,10 @@ function formatSmartStyle() {
     })
 }
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> yb11.1
 const configStore = useConfigSettingStore()
 const { etaConfigInfo } = storeToRefs(configStore)
     //获取基本配置,判断是否走审批流