提交

src/views/modules/knowledge/statistics/search.vue

@@ -24,7 +24,7 @@
         </div>
         <div class="table-style">
           <div>
-             组织访问量TOP10
+             组织访问量
              <span>(pv)</span>
           </div>
           <DataShow :type="type" interface="4"></DataShow>

src/views/modules/knowledge/warehouse/auditManageList.vue

@@ -371,7 +371,6 @@ export default {
         document.querySelector('.ant-cascader-menus').scrollLeft = 20480
       }
     }
-
     // setInterval(() => {
     //   document.querySelectorAll('.ant-cascader-menu-item').forEach(el => {
     //     el.onclick = function() {
@@ -423,6 +422,7 @@ export default {
             type: 'auditManageList', 
             auditId: record.approvalsFirst.pkId,
             show: true,
+            isLook: true
           }
         } else {
           // 审核
@@ -442,7 +442,8 @@ export default {
             pkId: record.knowledgerId, 
             type: 'auditManageList', 
             auditId: record.pkId,
-            show: true
+            show: true,
+            isLook: true
           }
         } else {
           // 审核
@@ -592,6 +593,7 @@ export default {
       }
       if(!this.willAuditData.length) return
       this.auditShow = true
+      this.$nextTick(() => document.getElementsByClassName('ant-form-item-control-wrapper')[8].style.width = '70%')
     },
     transCheckedTargets(arg) {
       this.checkedTargets = arg

src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -99,10 +99,12 @@
                 </a-form-model-item>
               </template>
               <!-- 最终节点审 核时 -->
-              <a-form-model-item v-if="(isShowOrg || (type == 'knowledgeManageList' && !this.$route.query.show)) && (knowledgeForm.type == 1 || !knowledgeForm.type)" prop="actualApproverName">
+              <!-- <a-form-model-item v-if="(isShowOrg || (type == 'knowledgeManageList' && !this.$route.query.show)) && (knowledgeForm.type == 1 || !knowledgeForm.type)" prop="actualApproverName"> -->
+              <!-- <a-form-model-item v-if="!$route.query.isLook && (knowledgeForm.type == 1 || !knowledgeForm.type)" prop="actualApproverName"> -->
+              <a-form-model-item v-if="(knowledgeForm.type == 1 || !knowledgeForm.type)" prop="actualApproverName">
                 <span slot="label">&emsp;&emsp;权限</span>
                 <div @click="handleAuthClickshow">
-                  <a-select v-model="authName" :showArrow="false" :open="false" placeholder="请选择组织部门、职系、职称等授予知识访问权限"></a-select>
+                  <a-select :disabled="!isAuth" v-model="authName" :showArrow="false" :open="false" placeholder="请选择组织部门、职系、职称等授予知识访问权限"></a-select>
                 </div>
               </a-form-model-item>
               <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
@@ -116,7 +118,7 @@
                 </div>
               </a-form-model-item>
               <!-- 知识管理 查看 -->
-              <a-form-model-item v-if="type == 'knowledgeManageList' && !!pkId && this.$route.query.show" label="访问权限:" prop="accessAuthority" style="margin: 20px 0;">
+              <a-form-model-item v-if="type == 'knowledgeManageList' && !!pkId && $route.query.show" label="访问权限:" prop="accessAuthority" style="margin: 20px 0;">
                 <a-input disabled v-model="accessAuthority" />
               </a-form-model-item>
             </a-form-model>
@@ -263,7 +265,8 @@ export default {
       // 职等
       gradesInfo: {},
       widthVar: 800,
-      organizationIdsInfo: {}
+      organizationIdsInfo: {},
+      isAuth: false
     }
   },
   created() {
@@ -330,6 +333,10 @@ export default {
         // }
         // 待最终节点审批
         this.isShowOrg = res.data.approvalStatus == 3 ? true : false
+        this.isAuth = this.isShowOrg
+        if(this.$route.query.isEdit) {
+          this.isAuth = true
+        }
       })
     } else {
       this.pkId = ''
@@ -337,6 +344,7 @@ export default {
       this.knowledgeForm.createBy = this.$store.state.appSetting.user.userId
       this.knowledgeForm.author = this.$store.state.appSetting.user.fullName
       this.getFindAllNodes()
+      this.isAuth = true
     }
     this.init()
     var token = Vue.ls.get(ACCESS_TOKEN);
@@ -357,6 +365,8 @@ export default {
         document.querySelector('.ant-cascader-menus').scrollLeft = 20480
       }
     }
+    document.getElementsByClassName('ant-form-item-control-wrapper')[7].style.width = '70%'
+    document.getElementsByClassName('ant-form-item-control-wrapper')[8].style.width = '70%'
     /*setInterval(() => {
       document.querySelectorAll('.ant-cascader-menu-item').forEach(el => {
         el.onclick = function() {
@@ -371,8 +381,10 @@ export default {
   },
   methods: {
     handleAuthClickshow() {
-      this.organizationIdsInfo = this.knowledgeForm.organizationIds
-      this.showAuditFlag = true      
+      if(this.isAuth) {
+        this.organizationIdsInfo = this.knowledgeForm.organizationIds
+        this.showAuditFlag = true   
+      }
     },
     goBack(){
       localStorage.setItem("cancle",true)

src/views/modules/knowledge/warehouse/knowledgeManageList.vue

@@ -137,7 +137,7 @@
                     </div>
                   </div> -->
                 </a-form>
-                <rx-button alias="knowAdd" :butn-icon="'false'" @click="$router.push('/knowledge/knowledgeAddUpdate')">新增知识</rx-button>
+                <rx-button alias="knowAdd" :butn-icon="'false'" @click="handleAddKnowledgeClick">新增知识</rx-button>
                 <rx-button :class="{'knowledge-manage':num != 0}" :data-attr="num" alias="knowProcess" :butn-icon="'false'" @click="handleJumpPathClick">知识审核</rx-button>
               </div>
             </div>
@@ -354,6 +354,12 @@ export default {
         query: { showUnchecked: true }
       })
     },
+    handleAddKnowledgeClick() {
+        this.$router.push({
+        path: '/knowledge/knowledgeAddUpdate',
+        query: { isAuth: true }
+      })
+    },
     // 编辑
     handleJumpUpdateClick(record,arg) {
       let query = {}
@@ -370,7 +376,8 @@ export default {
           pkId: record.pkId, 
           type: 'knowledgeManageList', 
           show: false,
-          isAudit: true
+          isAudit: true,
+          isEdit: true
         }
       }
       this.$router.push({