超管中心UI调整

src/assets/styles/pages.scss

@@ -92,6 +92,13 @@
     }
   }
 }
+// apply-audit-history
+.apply-audit-history {
+  .audit-result {
+    margin: 10px 0;
+    text-align: right;
+  }
+}
 // task-list
 .task-head {
   font-size: 16px;

src/modules/admin/components/ModifySystemRole.vue

@@ -9,28 +9,27 @@
     fullscreen
     @opened="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item prop="name" label="角色名称：">
-          <el-input
-            v-model.trim="modalForm.name"
-            placeholder="请输入角色名称"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="角色权限：" required></el-form-item>
-      </el-form>
-      <privilege-set
-        v-if="menus && menus.length"
-        ref="PrivilegeSet"
-        :menus="menus"
-      ></privilege-set>
-    </div>
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item prop="name" label="角色名称：">
+        <el-input
+          v-model.trim="modalForm.name"
+          style="width:282px;"
+          placeholder="请输入角色名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="角色权限：" required></el-form-item>
+    </el-form>
+    <privilege-set
+      v-if="menus && menus.length"
+      ref="PrivilegeSet"
+      :menus="menus"
+    ></privilege-set>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button
@@ -112,7 +111,8 @@ export default {
       }
       this.$nextTick(() => {
         this.$refs.modalFormComp.clearValidate();
-        this.$refs.PrivilegeSet.buildTableData(privilegeIds);
+        this.$refs.PrivilegeSet &&
+          this.$refs.PrivilegeSet.buildTableData(privilegeIds);
       });
     },
     cancel() {

src/modules/admin/components/ModifyUser.vue

@@ -4,58 +4,56 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10vh"
-    width="600px"
+    width="448px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
-      <el-form
-        ref="modalFormComp"
-        :model="modalForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item prop="loginName" label="用户名：">
-          <el-input
-            v-model.trim="modalForm.loginName"
-            placeholder="请输入用户名"
-            :disabled="isEdit"
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="realName" label="姓名：">
-          <el-input
-            v-model.trim="modalForm.realName"
-            placeholder="请输入姓名"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="mobileNumber" label="手机号：">
-          <el-input
-            v-model.trim="modalForm.mobileNumber"
-            placeholder="请输入手机号"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item prop="roleIds" label="角色：">
-          <el-select
-            style="width:100%;"
-            v-model="modalForm.roleIds"
-            placeholder="请选择角色"
-            multiple
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-position="top"
+    >
+      <el-form-item prop="loginName" label="用户名：">
+        <el-input
+          v-model.trim="modalForm.loginName"
+          placeholder="请输入用户名"
+          :disabled="isEdit"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="realName" label="姓名：">
+        <el-input
+          v-model.trim="modalForm.realName"
+          placeholder="请输入姓名"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="mobileNumber" label="手机号：">
+        <el-input
+          v-model.trim="modalForm.mobileNumber"
+          placeholder="请输入手机号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="roleIds" label="角色：">
+        <el-select
+          style="width:100%;"
+          v-model="modalForm.roleIds"
+          placeholder="请选择角色"
+          multiple
+        >
+          <el-option
+            v-for="item in roles"
+            :key="item.id"
+            :value="item.id"
+            :label="item.name"
           >
-            <el-option
-              v-for="item in roles"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-    </div>
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
       <el-button type="primary" :disabled="isSubmit" @click="submit"
         >确认</el-button

src/modules/admin/views/Admin.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="admin">
     <div class="home-header">
-      <div class="head-logo">
-        <h1>分布式印刷</h1>
-      </div>
       <div class="head-user menu-list">
         <ul>
           <li @click="toSelectSchool">
@@ -11,22 +8,24 @@
             <span>切换学校</span>
           </li>
           <li class="menu-item menu-item-account">
-            <i class="el-icon-s-custom"></i>
+            <i class="icon icon-account"></i>
             <span :title="username">{{ username }}</span>
           </li>
           <li class="menu-item" @click="toLogout">
-            <i class="el-icon-switch-button"></i>
-            <span>退出登录</span>
+            <i class="icon icon-logout" title="退出登录"></i>
           </li>
         </ul>
       </div>
     </div>
 
     <div class="home-navs">
+      <div class="head-logo">
+        <h1>分布式印刷</h1>
+      </div>
       <div v-for="(menu, sindex) in menus" :key="sindex" class="nav-part">
         <div class="nav-head">
-          <i :class="menu.icon"></i>
           <span>{{ menu.title }}</span>
+          <i class="nav-head-right-icon el-icon-caret-bottom"></i>
         </div>
         <ul class="nav-list">
           <li
@@ -42,16 +41,6 @@
               @click="toNav(nav)"
             >
               <p class="nav-item-cont">{{ nav.title }}</p>
-              <span class="nav-item-icon nav-item-icon-right">
-                <i
-                  :class="[
-                    'icon',
-                    curActNav === nav.router
-                      ? 'icon-arrow-right-act'
-                      : 'icon-arrow-right'
-                  ]"
-                ></i>
-              </span>
             </div>
           </li>
         </ul>
@@ -61,10 +50,11 @@
     <div class="home-body">
       <div class="home-main">
         <div class="home-breadcrumb" v-if="breadcrumbs.length">
-          <el-breadcrumb separator=">">
-            <el-breadcrumb-item>
-              <i class="el-icon-s-home" style="margin-top: -2px;"></i>
-            </el-breadcrumb-item>
+          <span class="breadcrumb-tips">
+            <i class="icon icon-location"></i>
+            <span>当前所在位置：</span>
+          </span>
+          <el-breadcrumb separator="/">
             <el-breadcrumb-item
               v-for="(bread, index) in breadcrumbs"
               :key="index"

src/modules/admin/views/AdminUserManage.vue

@@ -6,15 +6,15 @@
           <el-input
             style="width: 142px;"
             v-model.trim="filter.realName"
-            placeholder="请输入内容"
+            placeholder="姓名"
             clearable
           ></el-input>
         </el-form-item>
         <el-form-item label="启用/禁用：" label-width="90px">
           <el-select
             v-model="filter.enable"
-            style="width: 142px;"
-            placeholder="请选择"
+            style="width: 110px;"
+            placeholder="启用/禁用"
             clearable
           >
             <el-option
@@ -40,7 +40,7 @@
       </div>
     </div>
 
-    <div class="part-box">
+    <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="users">
         <el-table-column
           type="index"
@@ -66,28 +66,21 @@
             <el-button
               class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
             <el-button
-              class="btn-primary"
+              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
               type="text"
-              :icon="
-                scope.row.enable
-                  ? 'icon icon-circle-stop'
-                  : 'icon icon-circle-caret-right'
-              "
               @click="toEnable(scope.row)"
-              :title="scope.row.enable ? '禁用' : '启用'"
-            ></el-button>
+              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
+            >
             <el-button
-              class="btn-primary"
+              class="btn-danger"
               type="text"
-              icon="icon icon-circle-lock"
               @click="toResetPwd(scope.row)"
-              title="重置密码"
-            ></el-button>
+              >重置密码</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/admin/views/SystemRoleManage.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="role-manage">
-    <div class="flex-between mb-2">
+    <div class="box-justify mb-2">
+      <div></div>
       <el-button
         type="primary"
         icon="el-icon-circle-plus-outline"
@@ -8,7 +9,7 @@
         >添加角色</el-button
       >
     </div>
-    <div class="part-box">
+    <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="roles">
         <el-table-column
           type="index"
@@ -22,10 +23,9 @@
             <el-button
               class="btn-primary"
               type="text"
-              icon="icon icon-edit"
               @click="toEdit(scope.row)"
-              title="编辑"
-            ></el-button>
+              >编辑</el-button
+            >
           </template>
         </el-table-column>
       </el-table>

src/modules/base/views/OrganizationManage.vue

@@ -116,9 +116,8 @@ export default {
       // ];
     },
     toAdd() {
-      const data = this.orgs[0];
       this.curOrg = {
-        parentName: data.name
+        parentName: this.$ls.get("schoolName")
       };
       this.orgTypes = [
         { type: "COLLEGE", name: "学院" },

src/modules/exam/components/ApplyAuditHistory.vue

@@ -1,34 +1,31 @@
 <template>
-  <div class="apply-audit-history part-box part-box-pad part-box-border">
+  <div class="apply-audit-history">
     <div v-if="auditHistory.length">
-      <p class="tips-info mb-2" v-if="latestHistory">
+      <p class="audit-result" v-if="latestHistory">
         <span>审核结果：</span>
         <span
           :class="
-            latestHistory.reviewStatus === 'PASS'
-              ? 'color-dark'
-              : 'color-danger'
+            latestHistory.approvePass === 'REJECT'
+              ? 'color-danger'
+              : 'color-dark'
           "
-          >{{ latestHistory.reviewStatus | reviewStatusFilter }}</span
+          >{{ latestHistory.reviewStatus }}</span
         >
       </p>
-      <el-table :data="auditHistory">
+      <el-table border :data="auditHistory">
         <el-table-column prop="operateTime" label="审核日期">
           <span slot-scope="scope"
             >{{ scope.row.operateTime | timestampFilter }}
           </span>
         </el-table-column>
         <el-table-column prop="reviewStatus" label="审核结果">
-          <template slot-scope="scope">
-            {{ scope.row.reviewStatus | reviewStatusFilter }}
-          </template>
         </el-table-column>
         <el-table-column prop="reason" label="审核意见"></el-table-column>
         <el-table-column prop="operateName" label="审核人"></el-table-column>
       </el-table>
     </div>
     <div class="history-none" v-else>
-      <p>暂无数据</p>
+      <p class="tips-info text-center">暂无数据</p>
     </div>
   </div>
 </template>

src/modules/exam/components/ApplyContent.vue

@@ -76,21 +76,26 @@
           <td :rowspan="paperAttachments.length" v-if="index === 0">
             {{ createCardTypeName }}
           </td>
-          <td
-            class="td-link"
-            :rowspan="paperAttachments.length"
-            v-if="index === 0"
-          >
-            <span v-if="IS_APPLY" @click="toCreateOrViewCard">{{
-              cardTodoName
-            }}</span>
-            <span v-else @click="toViewCard">
-              <i>查看题卡</i>
-            </span>
+          <td :rowspan="paperAttachments.length" v-if="index === 0">
+            <el-button
+              type="text"
+              class="btn-primary"
+              v-if="IS_APPLY"
+              @click="toCreateOrViewCard"
+              >{{ cardTodoName }}</el-button
+            >
+            <el-button
+              v-else
+              type="text"
+              class="btn-primary"
+              @click="toViewCard"
+            >
+              查看题卡
+            </el-button>
             <el-button
               v-if="curTaskApply.makeMethod && IS_APPLY"
-              size="mini"
-              type="primary"
+              type="text"
+              class="btn-danger"
               @click="changeCreateCardType"
               >切换题卡创建方式</el-button
             >
@@ -326,6 +331,10 @@ export default {
       default() {
         return {};
       }
+    },
+    editType: {
+      type: String,
+      default: ""
     }
   },
   data() {
@@ -390,13 +399,19 @@ export default {
   },
   computed: {
     IS_APPLY() {
-      return this.curTaskApply.setup === 1;
+      return this.editType
+        ? this.editType === "APPLY"
+        : this.curTaskApply.setup === 1 || this.curTaskApply.setup === null;
     },
     IS_PREVIEW() {
-      return this.curTaskApply.setup === 0;
+      return this.editType
+        ? this.editType === "PREVIEW"
+        : this.curTaskApply.setup === 0;
     },
     IS_AUDIT() {
-      return this.curTaskApply.setup > 1;
+      return this.editType
+        ? this.editType === "AUDIT"
+        : this.curTaskApply.setup > 1;
     },
     cardTodoName() {
       let name = "创建答题卡";

src/modules/exam/components/ModifyTaskApply.vue

@@ -91,7 +91,7 @@
       </el-form>
     </div>
 
-    <div class="mb-2" v-if="needReview">
+    <div class="mb-4" v-if="needReview">
       <el-button
         v-for="item in menus"
         :key="item.id"
@@ -105,6 +105,7 @@
         v-show="curMenu.id === '1'"
         ref="ApplyContent"
         :exam-task="modalForm"
+        :edit-type="editType"
         @cancel="cancel"
         @modified="modified"
       ></apply-content>
@@ -157,16 +158,31 @@ export default {
       default() {
         return {};
       }
+    },
+    editType: {
+      type: String,
+      default: ""
     }
   },
   computed: {
     title() {
-      const names = {
-        APPLY: "提交入库申请",
-        PREVIEW: "入库申请详情",
-        AUDIT: "审核入库申请"
-      };
-      return names[this.editType];
+      // editType为主
+      if (this.editType) {
+        const names = {
+          APPLY: "提交入库申请",
+          PREVIEW: "入库申请详情",
+          AUDIT: "审核入库申请"
+        };
+        return names[this.editType];
+      }
+
+      if (this.modalForm.setup === 1 || this.modalForm.setup === null) {
+        return "提交入库申请";
+      } else if (this.modalForm.setup === 0) {
+        return "入库申请详情";
+      } else {
+        return "审核入库申请";
+      }
     }
   },
   data() {

src/modules/exam/views/TaskReviewManage.vue

@@ -152,6 +152,7 @@
           v-if="!AUDITED"
           type="selection"
           width="55"
+          align="center"
           :selectable="checkAbleSelected"
         ></el-table-column>
         <el-table-column
@@ -299,7 +300,7 @@ export default {
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
-      editType: "APPLY",
+      editType: "AUDIT",
       AUDITING_RESULT,
       AUDITING_STATUS,
       caches: {},
@@ -368,7 +369,7 @@ export default {
       console.log(this.multipleSelection);
     },
     checkAbleSelected(row) {
-      return row.createId === this.curUserId;
+      return row.myself;
     },
     selectMenu(val) {
       if (this.auditStatus === val) return;

src/modules/exam/views/WaitTask.vue

@@ -45,7 +45,6 @@
     <!-- ModifyTaskApply -->
     <modify-task-apply
       ref="ModifyTaskApply"
-      :edit-type="editType"
       :instance="curTask"
       @modified="taskModified"
     ></modify-task-apply>
@@ -66,8 +65,7 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       dataList: [],
-      curTask: {},
-      editType: "AUDIT"
+      curTask: {}
     };
   },
   mounted() {