ui调整

src/assets/styles/base.scss

@@ -141,6 +141,9 @@ body {
       display: none;
     }
   }
+  &-gray {
+    background-color: $--color-text-gray-7;
+  }
 
   &-flex {
     display: flex;
@@ -157,7 +160,7 @@ body {
   &-tips {
     font-size: 16px;
     line-height: 25px;
-    color: $--color-text-gray-2;
+    color: $--color-text-dark-1;
     margin-bottom: 15px;
   }
 
@@ -251,7 +254,7 @@ body {
   text-align: left;
 
   th {
-    padding: 14px;
+    padding: 12px;
     line-height: 1.2;
     letter-spacing: 1px;
     color: $--color-text-gray-2;
@@ -276,6 +279,20 @@ body {
     font-weight: 600;
     color: $--color-text-gray;
   }
+
+  &--border {
+    border: 1px solid $--color-border;
+    border-radius: 10px;
+    th {
+      background-color: #fcfcfd;
+      border: none;
+      border-bottom: 1px solid $--color-border;
+    }
+    td {
+      border: none;
+      border-bottom: 1px solid $--color-border;
+    }
+  }
 }
 
 /* list */
@@ -370,6 +387,25 @@ body {
   }
 }
 
+.tab-btns {
+  .el-button {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+
+    &:first-child {
+      border-bottom-left-radius: 8px;
+    }
+
+    &:last-child {
+      border-bottom-right-radius: 8px;
+    }
+  }
+
+  .el-button + .el-button {
+    margin-left: 10px;
+  }
+}
+
 .cont-link {
   color: $--color-primary;
   cursor: pointer;
@@ -405,7 +441,7 @@ body {
 // other
 .tips-info {
   font-size: 12px;
-  line-height: 25px;
+  line-height: 20px;
   color: $--color-text-gray-3;
 }
 .tips-dark {

src/assets/styles/element-ui-costom.scss

@@ -52,15 +52,13 @@
   }
 }
 .el-dialog__footer {
-  text-align: right;
+  overflow: hidden;
   .el-button {
     width: 100px;
     border-radius: 8px;
+    float: right;
+    margin-left: 10px;
   }
-  // .el-button--default {
-  //   background: rgba(245, 245, 245, 1);
-  //   color: #999;
-  // }
 }
 
 // .opacity-dialog
@@ -144,6 +142,21 @@
     }
   }
 }
+.el-select {
+  .el-input__suffix {
+    right: 0;
+    border-left: 1px solid #ddd;
+  }
+  .el-input {
+    .el-select__caret {
+      width: 30px;
+    }
+    .el-icon-arrow-up:before {
+      font-size: 12px;
+      content: "\e78f";
+    }
+  }
+}
 // upload
 .el-upload,
 .el-upload-dragger {
@@ -291,6 +304,17 @@
     }
   }
 }
+.el-table--border {
+  border-radius: 10px;
+  th {
+    padding: 12px 0;
+    background-color: #fcfcfd;
+    border-right: none;
+  }
+  td {
+    border-right: none;
+  }
+}
 // el-checkbox
 .el-checkbox {
   .el-checkbox__label {
@@ -301,17 +325,34 @@
   }
 }
 .el-checkbox__input.is-checked .el-checkbox__inner {
-  background-color: $--color-primary;
+  background-color: $--color-white;
+  border-color: $--color-primary;
+
+  &::after {
+    border-color: $--color-primary;
+  }
+}
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: $--color-white;
   border-color: $--color-primary;
+  &::before {
+    background-color: $--color-primary;
+  }
 }
+
 .el-radio {
   .el-radio__label {
     color: $--color-text-gray-2 !important;
   }
 }
 .el-radio__input.is-checked .el-radio__inner {
-  background-color: $--color-primary;
+  background-color: $--color-white;
   border-color: $--color-primary;
+  &::after {
+    width: 6px;
+    height: 6px;
+    background-color: $--color-primary;
+  }
 }
 
 // el-switch
@@ -370,15 +411,14 @@
 }
 // el-message-box
 .el-message-box {
-  width: 350px;
+  width: 320px;
   background-color: #f6f6f6;
   border-radius: 10px;
   &__title {
     display: none;
   }
   &__headerbtn {
-    top: 10px;
-    right: 10px;
+    display: none;
   }
   &__content {
     text-align: center;
@@ -386,8 +426,8 @@
     .el-message-box__status {
       position: relative;
       top: 0;
-      height: 50px;
-      width: 50px;
+      height: 48px;
+      width: 48px;
       transform: none;
       margin-bottom: 10px;
 
@@ -411,22 +451,12 @@
     }
   }
   &__btns {
-    position: relative;
     height: 75px;
     padding: 30px 20px 10px;
+    text-align: center;
 
     > .el-button {
-      width: 85px;
-      position: absolute;
-      left: 50%;
-      top: 30px;
-
-      &:first-child {
-        margin-left: 5px;
-      }
-      &:last-child {
-        margin-left: -90px;
-      }
+      width: 100px;
     }
   }
 }
@@ -449,29 +479,26 @@
 }
 // el-date-editor
 .el-date-editor {
+  border-radius: 8px;
   .el-range-separator {
     width: auto;
-    line-height: 24px;
   }
   .el-range-input {
     background-color: transparent;
   }
-  .el-input__icon {
-    line-height: 24px;
-  }
 }
 
 // el-step
 .el-step {
   &__title.is-success,
   &__description.is-success {
-    color: $--color-primary;
+    color: $--color-success;
   }
   &__head.is-success {
-    color: $--color-primary;
-    border-color: $--color-primary;
+    color: $--color-success;
+    border-color: $--color-success;
     .el-step__line {
-      background-color: $--color-primary;
+      background-color: $--color-success;
     }
   }
 }

src/assets/styles/pages.scss

@@ -41,8 +41,10 @@
     width: 80px;
     height: 80px;
     margin: 0 10px 10px 0;
-    border: 1px solid $--color-border;
+    border: 1px solid $--color-text-gray-4;
     position: relative;
+    border-radius: 5px;
+    overflow: hidden;
 
     img {
       position: absolute;
@@ -84,11 +86,14 @@
     line-height: 1;
     padding: 19px;
     text-align: center;
+    border-radius: 5px;
+    border-style: dashed;
+    overflow: hidden;
     cursor: pointer;
-    color: $--color-text-gray-4;
+    color: $--color-text-gray-5;
 
     &:hover {
-      color: $--color-text-gray;
+      color: $--color-text-gray-3;
     }
   }
 }
@@ -96,7 +101,6 @@
 .apply-audit-history {
   .audit-result {
     margin: 10px 0;
-    text-align: right;
   }
 }
 // task-list
@@ -300,5 +304,14 @@
       display: inline-block;
       text-align: right;
     }
+    .el-button--text:hover {
+      transform: scale(1.1);
+    }
+  }
+}
+// modify-print-plan
+.modify-print-plan {
+  .part-box {
+    margin-bottom: 40px;
   }
 }

src/assets/styles/variables.scss

@@ -8,6 +8,7 @@ $--color-text-gray-3: #aaa !default;
 $--color-text-gray-4: #ccc !default;
 $--color-text-gray-5: #d3d5e0 !default;
 $--color-text-gray-6: #e0e1eb !default;
+$--color-text-gray-7: #f2f4fa !default;
 $--color-border: #eff0f5;
 $--color-background: #eff0f5;
 // status

src/modules/admin/views/SystemRoleManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="role-manage">
-    <div class="box-justify mb-2">
+    <div class="part-box part-box-pad part-box-flex">
       <div></div>
       <el-button
         type="primary"

src/modules/base/components/ModifyUser.vue

@@ -136,13 +136,6 @@ export default {
         callback();
       }
     };
-    const codeValidator = (rule, value, callback) => {
-      if (value && value.length > 50) {
-        callback(new Error("工号长度不要超过50字符"));
-      } else {
-        callback();
-      }
-    };
 
     const IS_SUPER_ADMIN =
       this.$ls.get("user", { loginName: "" }).loginName === SYS_ADMIN_NAME;
@@ -179,8 +172,13 @@ export default {
         ],
         code: [
           {
-            required: false,
-            validator: codeValidator,
+            required: true,
+            message: "请输入工号",
+            trigger: "change"
+          },
+          {
+            max: 50,
+            message: "工号不能超过50",
             trigger: "change"
           }
         ],

src/modules/base/views/CommonRule.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="common-rule">
-    <div class="mb-4">
+    <div class="mb-4 tab-btns">
       <el-button
         v-for="item in menus"
         :key="item.id"
+        size="medium"
         :type="item.id == curMenu.id ? 'primary' : 'default'"
         @click="selectMenu(item)"
         >{{ item.name }}</el-button

src/modules/base/views/CourseManage.vue

@@ -44,18 +44,14 @@
       </el-form>
       <div class="part-box-action">
         <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增课程</el-button
-        >
-        <el-button v-if="checkPrivilege('button', 'TempleteDownload')"
+          type="success"
+          icon="el-icon-download"
+          v-if="checkPrivilege('button', 'TempleteDownload')"
           ><a :href="downloadUrl" :download="dfilename">模板下载</a></el-button
         >
         <upload-button
           v-if="checkPrivilege('button', 'Import')"
-          btn-icon="el-icon-upload"
+          btn-icon="el-icon-circle-plus-outline"
           btn-content="批量导入"
           btn-type="success"
           :upload-url="uploadUrl"
@@ -64,6 +60,13 @@
           @upload-success="uploadSuccess"
         >
         </upload-button>
+        <el-button
+          v-if="checkPrivilege('button', 'add')"
+          type="primary"
+          icon="el-icon-circle-plus-outline"
+          @click="toAdd"
+          >新增课程</el-button
+        >
       </div>
     </div>
     <div class="part-box part-box-pad">

src/modules/base/views/OrganizationManage.vue

@@ -1,14 +1,5 @@
 <template>
   <div class="organization-manage">
-    <div class="part-box part-box-pad part-box-flex">
-      <div></div>
-      <el-button
-        type="primary"
-        icon="el-icon-circle-plus-outline"
-        @click="toAdd"
-        >新增机构</el-button
-      >
-    </div>
     <div class="part-box part-box-pad part-box-border">
       <div class="org-tree-head">
         <div>机构名称</div>
@@ -24,19 +15,20 @@
       >
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span>{{ node.label }}</span>
-          <span v-if="data.isRoot">
-            <el-button
-              v-if="checkPrivilege('button', 'Add')"
-              type="text"
-              @click="toAdd"
-              >子部门</el-button
-            >
-          </span>
-          <div class="org-edit" v-else>
+          <div class="org-edit">
             <div class="org-type">
               {{ data.type | orgTypeFilter }}
             </div>
-            <div class="org-actions">
+            <div class="org-actions" v-if="data.type === 'SCHOOL'">
+              <el-button
+                v-if="checkPrivilege('button', 'Add')"
+                class="btn-primary"
+                type="text"
+                @click="() => append(data)"
+                >子部门</el-button
+              >
+            </div>
+            <div class="org-actions" v-else>
               <el-button
                 v-if="
                   data.type !== 'PRINTING_HOUSE' &&
@@ -105,15 +97,6 @@ export default {
       if (!this.checkPrivilege("list", "LIST")) return;
       const orgs = await organizationList();
       this.orgs = orgs || [];
-      // this.orgs = [
-      //   {
-      //     id: this.$ls.get("schoolId") + "_" + this.$randomCode(),
-      //     name: this.$ls.get("schoolName"),
-      //     isRoot: true,
-      //     parentId: null,
-      //     children: orgs
-      //   }
-      // ];
     },
     toAdd() {
       this.curOrg = {

src/modules/base/views/PrintPlanPushManage.vue

@@ -33,12 +33,10 @@
       </div>
     </div>
 
-    <div class="part-box">
+    <div class="part-box part-box-pad">
       <el-table
         ref="TableList"
         :data="dataList"
-        border
-        stripe
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
@@ -81,21 +79,19 @@
             <el-button
               class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
-              title="查看"
-            ></el-button>
+              >查看</el-button
+            >
             <el-button
               v-if="
                 scope.row.createId === curUserId && scope.row.status === 'NEW'
               "
               class="btn-primary"
               type="text"
-              icon="icon icon-edit"
-              title="推送"
               :disabled="loading"
               @click="toPush(scope.row)"
-            ></el-button>
+              >推送</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -118,16 +114,23 @@
       :ids="multipleSelection"
       @modified="mergePushed"
     ></merge-push-dialog>
+    <!-- ModifyPrintPlan -->
+    <modify-print-plan
+      ref="ModifyPrintPlan"
+      :instance="curPrintPlan"
+      edit-type="PREVIEW"
+    ></modify-print-plan>
   </div>
 </template>
 
 <script>
 import { printPlanPushListQuery, printPlanBatchPush } from "../api";
 import MergePushDialog from "../components/MergePushDialog";
+import ModifyPrintPlan from "../../print/components/ModifyPrintPlan";
 
 export default {
   name: "print-plan-push-manage",
-  components: { MergePushDialog },
+  components: { MergePushDialog, ModifyPrintPlan },
   data() {
     return {
       filter: {
@@ -139,6 +142,7 @@ export default {
       total: 0,
       loading: false,
       dataList: [],
+      curPrintPlan: {},
       multipleSelection: []
     };
   },
@@ -196,7 +200,8 @@ export default {
       this.toPage(this.current);
     },
     toPreview(row) {
-      console.log(row);
+      this.curPrintPlan = row;
+      this.$refs.ModifyPrintPlan.open();
     },
     async toPush(row) {
       if (this.loading) return;

src/modules/base/views/StudentManage.vue

@@ -21,18 +21,14 @@
       </el-form>
       <div class="part-box-action">
         <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增学生</el-button
-        >
-        <el-button v-if="checkPrivilege('button', 'import')"
+          type="success"
+          icon="el-icon-download"
+          v-if="checkPrivilege('button', 'import')"
           ><a :href="downloadUrl" :download="dfilename">模板下载</a></el-button
         >
         <upload-button
           v-if="checkPrivilege('button', 'import')"
-          btn-icon="el-icon-upload"
+          btn-icon="el-icon-circle-plus-outline"
           btn-content="批量导入"
           btn-type="success"
           :upload-url="uploadUrl"
@@ -41,6 +37,13 @@
           @upload-success="uploadSuccess"
         >
         </upload-button>
+        <el-button
+          v-if="checkPrivilege('button', 'add')"
+          type="primary"
+          icon="el-icon-circle-plus-outline"
+          @click="toAdd"
+          >新增学生</el-button
+        >
       </div>
     </div>
     <div class="part-box part-box-pad">

src/modules/base/views/UserManage.vue

@@ -63,18 +63,14 @@
       </el-form>
       <div class="part-box-action">
         <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增用户</el-button
-        >
-        <el-button v-if="checkPrivilege('button', 'export')"
+          type="success"
+          icon="el-icon-download"
+          v-if="checkPrivilege('button', 'export')"
           ><a :href="downloadUrl" :download="dfilename">模板下载</a></el-button
         >
         <upload-button
           v-if="checkPrivilege('button', 'export')"
-          btn-icon="el-icon-upload"
+          btn-icon="el-icon-circle-plus-outline"
           btn-content="导入用户"
           btn-type="success"
           :upload-url="uploadUrl"
@@ -83,6 +79,13 @@
           @upload-success="uploadSuccess"
         >
         </upload-button>
+        <el-button
+          v-if="checkPrivilege('button', 'add')"
+          type="primary"
+          icon="el-icon-circle-plus-outline"
+          @click="toAdd"
+          >新增用户</el-button
+        >
       </div>
     </div>
 

src/modules/customer/views/CustomerCard.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="customer-card">
-    <div class="mb-4">
+    <div class="mb-4 tab-btns">
       <el-button
         v-for="(val, key) in AUDITING_TYPE"
         :key="key"
+        size="medium"
         :type="filter.status == key ? 'primary' : 'default'"
         @click="selectMenu(key)"
         >{{ val }}</el-button
@@ -91,12 +92,10 @@
       </div>
     </div>
 
-    <div class="part-box">
+    <div class="part-box part-box-pad">
       <el-table
         ref="TableList"
         :data="taskList"
-        border
-        stripe
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
@@ -124,24 +123,22 @@
             scope.row.updateTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="80px">
+        <el-table-column class-name="action-column" label="操作" width="120">
           <template slot-scope="scope">
             <el-button
               v-if="AUDITED && checkPrivilege('link', 'reviewPreview')"
               class="btn-primary"
               type="text"
-              icon="icon icon-circle-right"
               @click="toPreview(scope.row)"
-              title="查看详情"
-            ></el-button>
+              >查看详情</el-button
+            >
             <el-button
               v-if="!AUDITED && checkPrivilege('link', 'notReviewDesign')"
               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/exam/components/ApplyContent.vue

@@ -19,7 +19,7 @@
                 trigger="hover"
                 :content="flow.moreUser"
               >
-                <span class="color-primary" slot="reference">更多</span>
+                <span class="color-primary ml-1" slot="reference">更多</span>
               </el-popover>
             </div>
           </div>
@@ -30,7 +30,7 @@
     <div class="task-body">
       <div v-if="IS_APPLY" class="mb-2 text-right">
         <el-button
-          type="primary"
+          type="info"
           icon="el-icon-circle-plus-outline"
           @click="addAtachment"
           >增加卷型</el-button
@@ -72,7 +72,7 @@
               @click="downloadPaper(attachment)"
             >
               <i
-                class="el-icon-download mr-1"
+                class="icon icon-download mr-1"
                 v-if="attachment.attachmentId"
               ></i>
               <i>{{ attachment.filename }}</i>

src/modules/exam/components/CreateTaskApply.vue

@@ -102,7 +102,7 @@
                 trigger="hover"
                 :content="flow.moreUser"
               >
-                <span slot="reference">更多</span>
+                <span class="color-primary ml-1" slot="reference">更多</span>
               </el-popover>
             </div>
           </div>
@@ -114,7 +114,7 @@
       <div class="task-body">
         <div class="mb-2 text-right">
           <el-button
-            type="primary"
+            type="info"
             icon="el-icon-circle-plus-outline"
             @click="addAtachment"
             >增加卷型</el-button
@@ -334,7 +334,7 @@ export default {
       flows: [
         {
           flowId: "160684605807001600",
-          taskName: "提交试卷(命题老师)",
+          taskName: "提交试卷",
           taskKey: "usertask1",
           setup: 1,
           status: "process",
@@ -342,7 +342,7 @@ export default {
         },
         {
           flowId: "160684605807001600",
-          taskName: "审核试卷(教研室主任)",
+          taskName: "审核试卷",
           taskKey: "usertask2",
           setup: 2,
           status: "wait",
@@ -350,7 +350,7 @@ export default {
         },
         {
           flowId: "160684605807001600",
-          taskName: "审核试卷(教学院长)",
+          taskName: "审核试卷",
           taskKey: "usertask3",
           setup: 3,
           status: "wait",
@@ -674,7 +674,7 @@ export default {
       this.isSubmit = false;
       if (!data) return;
 
-      this.examTask.id = data;
+      this.examTask = this.$objAssign(this.examTask, data);
 
       if (!silent) this.$message.success("保存成功！");
       return true;

src/modules/exam/components/ModifyExamTask.vue

@@ -53,9 +53,12 @@
         >
         </el-date-picker>
         <span v-else>
-          {{ modalForm.startTime | timestampFilter }} 至
-          {{ modalForm.endTime | timestampFilter }}</span
-        >
+          <span v-if="modalForm.startTime && modalForm.endTime">
+            {{ modalForm.startTime | timestampFilter }} 至
+            {{ modalForm.endTime | timestampFilter }}
+          </span>
+          <span v-else>--</span>
+        </span>
       </el-form-item>
       <el-form-item prop="cardRuleId" label="题卡规则：">
         <card-rule-select

src/modules/exam/components/ModifyTaskApply.vue

@@ -10,7 +10,7 @@
     append-to-body
     @open="visibleChange"
   >
-    <div class="part-box part-box-pad part-box-border">
+    <div class="part-box part-box-pad part-box-border part-box-gray">
       <el-form class="form-info" label-width="130px">
         <el-row>
           <el-col :span="10">
@@ -76,10 +76,11 @@
       </el-form>
     </div>
 
-    <div class="mb-4" v-if="needReview">
+    <div class="mb-4 tab-btns" v-if="needReview">
       <el-button
         v-for="item in menus"
         :key="item.id"
+        size="medium"
         :type="item.id == curMenu.id ? 'primary' : 'default'"
         @click="selectMenu(item)"
         >{{ item.name }}</el-button

src/modules/exam/components/ModifyTaskPaper.vue

@@ -102,7 +102,7 @@
                 @click="downloadPaper(attachment)"
               >
                 <i
-                  class="el-icon-download mr-1"
+                  class="icon icon-download mr-1"
                   v-if="attachment.attachmentId"
                 ></i>
                 <i>{{ attachment.filename }}</i>

src/modules/exam/components/PrintTaskStudents.vue

@@ -10,7 +10,7 @@
     append-to-body
     @open="visibleChange"
   >
-    <el-table ref="TableList" :data="dataList">
+    <el-table border ref="TableList" :data="dataList">
       <el-table-column
         type="index"
         label="序号"

src/modules/exam/views/TaskReviewManage.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="task-review-manage">
-    <div class="mb-4">
+    <div class="mb-4 tab-btns">
       <el-button
         v-for="(val, key) in AUDITING_TYPE"
         :key="key"
+        size="medium"
         :type="auditStatus == key ? 'primary' : 'default'"
         @click="selectMenu(key)"
         >{{ val }}</el-button

src/modules/login/views/SelectSchool.vue

@@ -5,7 +5,7 @@
       <div class="login-title">
         <h1>选择学校</h1>
       </div>
-      <div class="login-form">
+      <div class="school-form">
         <el-form ref="modalFormComp" :model="modalForm" :rules="rules">
           <el-form-item prop="schoolId">
             <school-select

src/modules/print/components/ModifyPlanPaper.vue

@@ -116,7 +116,10 @@
             @click="downloadPaper(attachment)"
             title="点击查看试卷"
           >
-            <i class="el-icon-download mr-1" v-if="attachment.attachmentId"></i
+            <i
+              class="icon icon-download mr-1"
+              v-if="attachment.attachmentId"
+            ></i
             >{{ attachment.filename }}
           </el-button>
         </td>

src/modules/print/components/ModifyPrintPlan.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10px"
-    width="700px"
+    width="600px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -12,11 +12,12 @@
   >
     <el-form
       ref="modalFormComp"
-      label-width="110px"
+      label-width="120px"
       :rules="rules"
       :model="modalForm"
+      label-position="left"
     >
-      <div class="part-box part-box-pad part-box-border">
+      <div class="part-box">
         <h4 class="part-box-tips">基本信息：</h4>
         <el-form-item prop="name" label="印刷计划名称：">
           <el-input
@@ -43,7 +44,7 @@
         </el-form-item>
       </div>
 
-      <div class="part-box part-box-pad part-box-border">
+      <div class="part-box">
         <h4 class="part-box-tips">试卷&题卡印品：</h4>
         <el-form-item prop="printContent" label="试卷、题卡：">
           <el-checkbox-group
@@ -87,6 +88,7 @@
             step-strictly
             :controls="false"
             :disabled="!editable"
+            style="width: 60px"
           ></el-input-number>
           <span>份</span>
         </el-form-item>
@@ -112,7 +114,7 @@
         </el-form-item>
       </div>
 
-      <div class="part-box part-box-pad part-box-border">
+      <div class="part-box">
         <h4 class="part-box-tips">变量印品：</h4>
         <el-form-item
           v-for="(item, index) in modalForm.variableContent"
@@ -163,13 +165,14 @@
               step-strictly
               :controls="false"
               :disabled="!editable"
+              style="width: 60px"
             ></el-input-number>
             <span>份</span>
           </div>
         </el-form-item>
       </div>
 
-      <div class="part-box part-box-pad part-box-border">
+      <div class="part-box">
         <h4 class="part-box-tips">普通印品：</h4>
         <el-form-item
           v-for="(item, index) in modalForm.ordinaryContent"
@@ -221,6 +224,7 @@
               step-strictly
               :controls="false"
               :disabled="!editable"
+              style="width: 60px"
             ></el-input-number>
             <span>份</span>
           </div>

src/modules/print/components/PreviewBusinessDetail.vue

@@ -10,7 +10,7 @@
       append-to-body
       @open="visibleChange"
     >
-      <div class="part-box part-box-pad part-box-border">
+      <div class="part-box part-box-pad part-box-border part-box-gray">
         <el-form ref="modalFormComp" class="form-info" label-width="100px">
           <el-row>
             <el-col :span="12">
@@ -64,7 +64,7 @@
       </div>
 
       <div class="part-box">
-        <el-table ref="TableList" :data="dataList">
+        <el-table border ref="TableList" :data="dataList">
           <el-table-column
             type="index"
             label="序号"

src/modules/print/views/BusinessDataExport.vue

@@ -80,11 +80,20 @@
         <el-button
           v-if="checkPrivilege('button', 'TempleteDownload')"
           icon="el-icon-download"
+          type="success"
           :loading="loading"
           @click="toDownloadTemplate"
         >
           考务数据模板下载
         </el-button>
+        <el-button
+          v-if="checkPrivilege('button', 'import')"
+          icon="el-icon-circle-plus-outline"
+          type="success"
+          @click="toUpload"
+        >
+          导入
+        </el-button>
         <el-button
           v-if="checkPrivilege('button', 'export')"
           icon="el-icon-download"
@@ -94,14 +103,6 @@
         >
           导出查询结果
         </el-button>
-        <el-button
-          v-if="checkPrivilege('button', 'import')"
-          icon="el-icon-upload2"
-          type="warning"
-          @click="toUpload"
-        >
-          导入
-        </el-button>
       </div>
     </div>