Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

src/components/Course/courseForm.vue

@@ -666,6 +666,19 @@ export default {
 
         this.courseInfo.orgId=this.userInfo.departId;
 
+        if(!this.courseInfo.orgId){
+          this.courseInfo.orgId=this.userInfo.departId;
+        }
+        this.orgKid='';
+        if(this.courseInfo.orgId){
+          apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
+             if(rrs.status==200){
+               this.orgName=rrs.result.name;
+               this.orgKid=rrs.result.kid;
+             }
+          })
+        }
+
       } else {
         //console.log(editData,'editData');
         this.weikeReset = editData.id;
@@ -683,18 +696,7 @@ export default {
           this.biaoke.dlgShow = true;
         }
       }
-      if(!this.courseInfo.orgId){
+
-        this.courseInfo.orgId=this.userInfo.departId;
-      }
-      this.orgKid='';
-      if(this.courseInfo.orgId){
-        apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{
-           if(rrs.status==200){
-             this.orgName=rrs.result.name;
-             this.orgKid=rrs.result.kid;
-           }
-        })
-      }
     },
     resetCurCourseContent() {
       this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id };
@@ -775,6 +777,20 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
+          
+          if(!this.courseInfo.orgId){
+            this.courseInfo.orgId=this.userInfo.departId;
+          }
+          //$this.orgKid='';
+          if($this.courseInfo.orgId){
+            apiOrg.getSimple($this.courseInfo.orgId).then(rrs=>{
+               if(rrs.status==200){
+                 $this.orgName=rrs.result.name;
+                 $this.orgKid=rrs.result.kid;
+               }
+            })
+          }
+          
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1065,8 +1081,10 @@ export default {
         });
     },
     submitCourse() {
+      console.log(this.courseInfo.orgId,'this.courseInfo.orgId');
+      console.log(this.orgKid,'this.orgKid');
       if(!this.courseInfo.orgId || !this.orgKid){
-        this.$message.success('请选择资源归属');
+        this.$message.error('请选择资源归属');
         return;
       }
       //console.log(this.resOwnerListMap[0],'this.resOwnerListMap[0]');

src/views/course/WaitAudited.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div class="u-page">
-    <div style="padding: 2px 0px 20px 0px;">
+    <div style="padding: 2px 0px 10px 0px;">
         <el-row :gutter="20">
            <el-col :span="4">
             <el-cascader placeholder="内容分类" clearable v-model="sysTypeList" :props="defaultTypeProps" :options="sysTypeListMap"></el-cascader>

src/views/examine/NotApproved.vue

@@ -28,9 +28,7 @@
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
-        <el-row :gutter="10" style="margin-top:10px">
      
-        </el-row>
     </div>
     <!-- <div style="padding-left">
 

src/views/examine/Reviewed.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div class="u-page">
-    <div style="padding: 2px 0px 20px 0px;">
+    <div style="padding: 2px 0px 10px 0px;">
         <el-row :gutter="20">
            <el-col :span="4">
             <el-cascader placeholder="内容分类" clearable v-model="sysTypeList" :props="defaultTypeProps" :options="sysTypeListMap"></el-cascader>