角色组用户bug修改

src/modules/base/components/ModifyRoleUser.vue

@@ -86,7 +86,7 @@ export default {
     return {
       modalIsShow: false,
       filter: {
-        username: ""
+        name: ""
       },
       userList: [],
       curUser: {},
@@ -100,6 +100,7 @@ export default {
   },
   methods: {
     visibleChange() {
+      this.filter.name = "";
       this.getList();
     },
     cancel() {
@@ -113,7 +114,8 @@ export default {
         ...this.filter,
         roleId: this.role.id
       };
-      const data = await roleGroupList(datas);
+      const data = (await roleGroupList(datas)) || [];
+
       this.userList = data.map(item => {
         let nitem = { ...item.user };
         nitem.memberList = item.memberList;

src/modules/exam/components/ModifyTaskApply.vue

@@ -66,18 +66,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="examRoomInfoList.length && IS_MODEL2">
-          <el-col :span="12">
-            <el-form-item label="总人数：">
-              <span>{{ examRoomInfoList[0].studentCount }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="总印份数：">
-              <span>{{ examRoomInfoList[0].printCount }}</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
 
       <table
@@ -100,6 +88,19 @@
           <td>{{ item.printCount }}</td>
         </tr>
       </table>
+
+      <div
+        class="part-box part-box-pad task-exam-room"
+        v-if="examRoomInfoList.length && IS_MODEL2"
+      >
+        <p>
+          正式考生{{ examRoomInfoList[0].studentCount }}个，总印份数{{
+            examRoomInfoList[0].printCount
+          }}份（正式考生{{ examRoomInfoList[0].studentCount }}份，备用卷{{
+            examRoomInfoList[0].backupCount
+          }}份）
+        </p>
+      </div>
     </div>
 
     <apply-content
@@ -225,7 +226,20 @@ export default {
     async getExamRoomInfo() {
       const data = await taskApplyExamObject(this.instance.paperNumber);
 
-      this.examRoomInfoList = data.examRoomInfoList || [];
+      if (this.IS_MODEL2) {
+        const { printCount } = data.examRoomInfoList[0];
+        const nums = printCount.split("+").map(item => item * 1);
+        console.log(nums);
+        this.examRoomInfoList = [
+          {
+            backupCount: nums[1],
+            studentCount: nums[0],
+            printCount: nums[0] + nums[1]
+          }
+        ];
+      } else {
+        this.examRoomInfoList = data.examRoomInfoList || [];
+      }
       this.printTotalCount = data.printTotalCount;
       this.modalForm.paperName = data.paperName || "";
       const { date, time } = parseTimeRangeDateAndTime(