Merge branch 'dev_1.2.0' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.0

src/modules/card/views/CardManage.vue

@@ -42,7 +42,7 @@
       </el-form>
 
       <div class="part-box-action">
-        <div>
+        <div v-if="!onlyAssignTeacher">
           <el-button
             type="primary"
             plain
@@ -129,6 +129,7 @@
         <el-table-column width="170" label="操作">
           <template slot-scope="scope">
             <el-button
+              v-if="!onlyAssignTeacher"
               size="mini"
               :type="scope.row.enable ? 'danger' : 'primary'"
               plain
@@ -141,7 +142,7 @@
                 更多<i class="el-icon-more el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown" class="action-dropdown">
-                <el-dropdown-item>
+                <el-dropdown-item v-if="!onlyAssignTeacher">
                   <el-button
                     size="mini"
                     type="primary"
@@ -168,7 +169,7 @@
                     >查看题卡
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item>
+                <el-dropdown-item v-if="!onlyAssignTeacher">
                   <el-button
                     size="mini"
                     type="danger"
@@ -282,6 +283,15 @@ export default {
     ...mapState({
       user: (state) => state.user,
     }),
+    onlyAssignTeacher() {
+      if (this.isAdmin) {
+        return false;
+      } else {
+        return this.user.roleList.some(
+          (role) => role.roleCode == "ASSIGN_TEACHER"
+        );
+      }
+    },
   },
   mounted() {
     const cacheInfo = window.sessionStorage.getItem("card-manage");

src/modules/questions/views/data_previllege_add_course.vue

@@ -32,7 +32,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="search"> 查询 </el-button>
+        <el-button type="danger" @click="handleSearchBtn"> 查询 </el-button>
       </el-form-item>
     </el-form>
 
@@ -107,8 +107,11 @@ export default {
     };
   },
   methods: {
-    async search() {
+    handleSearchBtn() {
       this.currentPage = 1;
+      this.search();
+    },
+    async search() {
       var param = new URLSearchParams(this.form);
       var url =
         QUESTION_API +