Merge branch 'v3' of http://git.jihengcc.cn/sendy/KM-PC-Front-Milestone2 into v3

src/views/modules/knowledge/components/pageList.vue

@@ -26,8 +26,8 @@
           <span>查看</span>
         </div>
       </template>
-      <template v-if="(!showJurisdiction||item.isOrganizationId==0)&&!hideLook">
-        <div class="lookBox btnSmall" @click="download(item)" v-if="item.attachment&&(type=='list0'||(type=='list1'&&item.approvalStatus!=4&&item.approvalStatus!=2))">
+      <template v-if="(!showJurisdiction||item.isOrganizationId == 0)&&!hideLook">
+        <div class="lookBox btnSmall" @click="download(item)" v-if="(!item.isOrganizationId && item.attachment)&&(type=='list0'||(type=='list1'&&item.approvalStatus!=4&&item.approvalStatus!=2))">
           <img src="../../../../image/download.png"/>
           <span>下载</span>
         </div>
@@ -235,6 +235,8 @@ export default {
     },
     // 点击下载
     download(data){
+      console.log(data.isOrganizationId)
+      return
       window.open('/api/api-system/system/core/sysFile/previewFile?fileId='+data.attachment)
     },
     // 删除关闭