问题修改

src/api/knowledge/album/checkInfo.js

@@ -12,12 +12,5 @@ returnData.info=function (parameter) {
   })
 }
 
-// 专辑点评审核
-returnData.approve=function (parameter) {
-  var url= returnData.baseUrl + '/album/yelp/approve'
-  return rxAjax.postJson(url,parameter).then (res => {
-    return res
-  })
-}
 
 export default returnData

src/api/knowledge/album/commentAudit.js

@@ -8,4 +8,11 @@ returnData.baseUrl= '/api-knowledge';
 // 点评审核列表搜索查询
 returnData.query = returnData.baseUrl + '/album/yelp/approve/query'
 
+// 专辑版本审核
+returnData.approve=function (parameter) {
+  var url= returnData.baseUrl + '/album/yelp/approve'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
 export default returnData

src/views/modules/knowledge/album/albumAuditList.vue

@@ -316,10 +316,14 @@ export default {
         if(!this.willAuditData.length) {
           this.$message.error("请选择要审核的专辑");
             return 
-        } 
+        }
         for(let i of this.willAuditData) {
-          if(i.approvalStateName != '待节点审核' && i.approvalStateName != '待最终审核') {
-            this.$message.error("审核存在状态为驳回/通过的节点,无法审批");
+          // if(i.approvalStateName != '待节点审核' && i.approvalStateName != '待最终审核') {
+          //   this.$message.error("审核存在状态为驳回/通过的节点,无法审批");
+          //   return 
+          // }
+          if(i.actionFlag.indexOf('view') > -1) {
+            this.$message.error("审核存在状态为驳回/通过的节点或您不是审批人,无法审批");
             return 
           }
         }

src/views/modules/knowledge/album/albumClassifyList.vue

@@ -73,7 +73,7 @@
           </a-form-item>
           <a-form-item label="排序" prop="sort">
             <div style="width:40%">
-              <a-input-number v-model="classForm.sort" :min="0" />
+              <a-input-number v-model="classForm.sort" :min="1" />
             </div>
           </a-form-item>
         </a-form>

src/views/modules/knowledge/album/albumInfo.vue

@@ -76,7 +76,7 @@
               </template>
               <!--  专辑审批   -->
               <!-- 审核页进入的并且版本状态是审核中的才能审批-->
-              <template v-if="(actionFlag.indexOf('open') > -1) && item.state == 1">
+              <template v-if="showCheck && item.state == 1">
                 <div class="album-check">
                   <div>专辑审批</div>
                   <a-radio-group v-model="auditForm.result" style="margin-bottom: 16px;">
@@ -190,6 +190,7 @@ export default {
       api,
       // 专辑id
       pkId: '',
+      showCheck: false,
       baseInfo: {
         name: '',
         owner: '',
@@ -209,6 +210,7 @@ export default {
       versionId: '',
       versionInfo: {
         summary: '',
+        // 审核id
         approvalId: '',
         approvalFlows: []
       },
@@ -271,6 +273,7 @@ export default {
   },
   created() {
     this.pkId = this.$route.query.pkId
+    this.showCheck = this.$route.query.showCheck
     this.init()
   },
   beforeDestroy() {
@@ -300,7 +303,6 @@ export default {
           if(res.code == 200) {
             if(res.data.length) {
               this.yelpList = res.data
-              console.log(res.data)
             }
           }
         })
@@ -396,7 +398,7 @@ export default {
     // 审核
     handleCheckClick() {
       this.handleCheckClick = false
-      this.auditForm.pkIds = [ this.pkId ]
+      this.auditForm.pkIds = [ this.versionInfo.approvalId ]
       albumAuditApi.approve(this.auditForm).then(res => {
         if(res.code) {
           setTimeout(() => 

src/views/modules/knowledge/album/albumList.vue

@@ -229,6 +229,11 @@ export default {
     }
   },
   created() {
+    let albumClassifyId = this.$route.query.pkId
+    if(albumClassifyId) {
+      this.queryParam.categoryId = albumClassifyId
+      this.categoryIds = [ albumClassifyId ]
+    }
     this.init()
   },
   computed: {
@@ -297,7 +302,7 @@ export default {
       this.$router.push({
         path: '/knowledge/albumInfo',
         // pkId   state: 专辑状态  versionState: 版本状态 showCheck
-        query: { pkId: record.pkId }
+        query: { pkId: record.pkId, showCheck: false }
       })
     },
     // 重新加载表格

src/views/modules/knowledge/album/commentAuditList.vue

@@ -333,8 +333,12 @@ export default {
             return 
         } 
         for(let i of this.willAuditData) {
-          if(i.approvalStateName != '待节点审核' && i.approvalStateName != '待最终审核') {
-            this.$message.error("审核存在状态为驳回/通过的节点,无法审批");
+          // if(i.approvalStateName != '待节点审核' && i.approvalStateName != '待最终审核') {
+          //   this.$message.error("审核存在状态为驳回/通过的节点,无法审批");
+          //   return 
+          // }
+          if(i.actionFlag.indexOf('view') > -1) {
+            this.$message.error("审核存在状态为驳回/通过的节点或您不是审批人,无法审批");
             return 
           }
         }

src/views/modules/knowledge/map/addUpdateMap.vue

@@ -27,35 +27,21 @@
               </a-form-model-item>
               <span class="titleBox">权限信息</span>
               <a-form-model-item label="*所属组织:" prop="groupId">
-                <!-- <a-tree-select
-                    v-model="mapForm.groupId"
-                    tree-data-simple-mode
-                    allow-clear
-                    :dropdown-style="{ minHeight: '200px', maxHeight: '400px', overflow: 'auto' }"
-                    :tree-data="orgData"
-                    tree-checkable
-                    placeholder="请选择"
-                    :show-checked-strategy="showParent"
-                    :load-data="onLoadGroupTree"
-                    @change="handleTreeChange"
-                    @select="handleTreeSelect"
-                  >
-                  </a-tree-select> -->
-                  <a-tree-select
-                    v-model="mapForm.groupId"
-                    
-                    allow-clear
-                    :dropdown-style="{ minHeight: '200px', maxHeight: '400px', overflow: 'auto' }"
-                    :tree-data="orgData"
-                    multiple
-                    placeholder="请选择"
-                    
-                    treeNodeLabelProp="label"
-                    @change="handleTreeChange"
-                    @select="handleTreeSelect"
-                    :treeDataSimpleMode="true"
-                  >
-                  </a-tree-select>
+                <a-tree-select
+                  v-model="mapForm.groupId"
+                  
+                  allow-clear
+                  :dropdown-style="{ minHeight: '200px', maxHeight: '400px', overflow: 'auto' }"
+                  :tree-data="orgData"
+                  multiple
+                  placeholder="请选择"
+                  
+                  treeNodeLabelProp="label"
+                  @change="handleTreeChange"
+                  @select="handleTreeSelect"
+                  :treeDataSimpleMode="true"
+                >
+                </a-tree-select>
               </a-form-model-item>
               <a-form-model-item label="*阅读权限:" prop="groupPurview">
                 <a-select v-model="mapForm.groupPurview" placeholder="请选择" :disabled="!mapForm.groupId.length" :showArrow="false">
@@ -598,6 +584,7 @@ export default {
     },
     // 选中知识
     async handleKnowledgeChange(value) {
+      console.log(value)
       let res = await api.knowledgeSnapshot({'pkId': value})
       this.knowledgeInfo = res.data
     },

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

@@ -7,7 +7,7 @@
         </template>
         <template v-else>
           <div>{{ item.titles }}</div>
-          <div class="classify">{{ item.category }}</div>
+          <div class="classify">{{ item.category.join(" ") }}</div>
           <div>
             {{ item.summary }}
           </div>