Merge branch 'xiaoqin' into mergeBranch

src/HManagement/archives_sc/list/modules/details.vue

@@ -85,7 +85,7 @@
           </div>
         </el-col>
         <el-col :span="12">
-          <scopeOfauth :onlyread="true" :defaultData="defaultData" appidname="sat_coursewareid" obiectName="sat_courseware" :dataid="$route.query.id"
+          <scopeOfauth v-if="Object.keys(defaultData).length" :onlyread="true" :defaultData="defaultData" appidname="sat_coursewareid" obiectName="sat_courseware" :dataid="$route.query.id"
             @onChecked="onChecked"></scopeOfauth>
         </el-col>
       </el-row>

src/HManagement/archives_sc/list/modules/edit.vue

@@ -154,9 +154,10 @@ export default {
         })
         
         this.selectDetail()
-        this.insertCoursewareauth()
+        this.insertCoursewareauth(() => {
+          this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
+        })
         callback?callback(res):''
-        this.$router.push({path:'/archives_scdetails',query:{id:res.data.sat_coursewareid,rowindex:res.data.rowindex}})
       });
     },
     async selectDetail() {
@@ -224,7 +225,7 @@ export default {
       this.authData = param
     },
     // 新增授权范围
-    async insertCoursewareauth() {
+    async insertCoursewareauth(callback) {
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.courseware.coursewareauth",
         "method": "insert",
@@ -235,6 +236,7 @@ export default {
         message: res.data,
         type: 'error'
       }) : ''
+      callback && callback()
     },
     // 查询授权信息
     async query_auth() {