Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/print/utils/common.js

@@ -1,3 +1,16 @@
+/* 是否为数组 */
+export function checkArray(value) {
+  if (!value) {
+    return false;
+  }
+  if (typeof Array.isArray === "function") {
+    /* 兼容IE */
+    return Array.isArray(value);
+  } else {
+    return Object.prototype.toString.call(value) === "[object Array]";
+  }
+}
+
 /* 是否为整数数字(并包括0) */
 export function checkEmptyNumber(number) {
   //console.log("number:" + number);

src/modules/print/view/CourseStatistic.vue

@@ -13,7 +13,6 @@
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
-              clearable
               @change="loadExamList(formSearch.orgId)"
             >
               <el-option
@@ -79,6 +78,7 @@
             <el-input
               v-model="formSearch.paperName"
               style="width: 221px"
+              clearable
             ></el-input>
           </el-form-item>
 
@@ -384,7 +384,7 @@
 
       <el-dialog
         title="试卷整体导出"
-        width="450px"
+        width="430px"
         :visible.sync="exportAllDialog"
         @close="closeExportAllDialog"
       >
@@ -401,7 +401,7 @@
               v-model="exportAllForm.orgId"
               @change="loadExportExamList(exportAllForm.orgId)"
               placeholder="请选择"
-              class="w220"
+              class="w245"
             >
               <el-option
                 v-for="item in orgList"
@@ -417,7 +417,7 @@
               v-model="exportAllForm.examId"
               @change="loadExamCoursePaperTotal"
               placeholder="请选择"
-              class="w220"
+              class="w245"
             >
               <el-option
                 v-for="item in exportExamList"
@@ -1030,4 +1030,7 @@ export default {
 .w220 {
   width: 220px;
 }
+.w245 {
+  width: 245px;
+}
 </style>

src/modules/print/view/ExamStructure.vue

@@ -13,7 +13,6 @@
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
-              clearable
               @change="loadExamList(formSearch.orgId)"
             >
               <el-option
@@ -123,7 +122,7 @@
       <!-- 新增考试结构弹窗 -->
       <el-dialog
         title="新增考试结构"
-        width="400px"
+        width="480px"
         :visible.sync="addStructureDialog"
         @close="closeAddStructureDialog"
       >
@@ -197,7 +196,7 @@
       <!-- 复用考试结构弹窗 -->
       <el-dialog
         title="复用考试结构"
-        width="450px"
+        width="440px"
         :visible.sync="cloneStructureDialog"
         @close="closeCloneStructureDialog"
       >

src/modules/print/view/Project.vue

@@ -13,7 +13,6 @@
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
-              clearable
               @change="loadExamList(formSearch.orgId)"
             >
               <el-option
@@ -81,6 +80,14 @@
           </el-form-item>
 
           <el-form-item style="padding-left: 60px">
+            <el-button
+              size="small"
+              icon="el-icon-refresh"
+              @click="resetSearchForm"
+            >
+              重置
+            </el-button>
+
             <el-button
               size="small"
               type="primary"
@@ -150,176 +157,122 @@
       <!-- 项目设置弹窗 -->
       <el-dialog
         title="项目设置"
-        width="750px"
+        width="700px"
         :visible.sync="projectSettingDialog"
         @close="closeProjectSettingDialog"
       >
         <el-form
-          :model="projectSettingForm"
-          ref="projectSettingForm"
+          :model="settingForm"
+          ref="settingForm"
           :rules="rules"
           label-position="right"
           label-width="110px"
           inline-message
         >
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="学校" prop="orgId">
-                <el-select
-                  v-model="projectSettingForm.orgId"
-                  placeholder="请选择"
-                  :disabled="true"
-                  class="w220"
-                >
-                  <el-option
-                    v-for="item in orgList"
-                    :label="item.orgName"
-                    :value="item.orgId"
-                    :key="item.orgId"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="考试" prop="examId">
-                <el-select
-                  v-model="projectSettingForm.examId"
-                  placeholder="请选择"
-                  :disabled="true"
-                  class="w220"
-                >
-                  <el-option
-                    v-for="item in examList"
-                    :label="item.examName"
-                    :value="item.examId"
-                    :key="item.examId"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="项目经理" prop="pmId">
-                <el-select
-                  v-model="projectSettingForm.pmId"
-                  placeholder="请选择"
-                  @change="selectPmName"
-                  clearable
-                  class="w220"
-                >
-                  <el-option
-                    v-for="item in pmList"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="供应商" prop="supplierId">
-                <el-select
-                  v-model="projectSettingForm.supplierId"
-                  placeholder="请选择"
-                  @change="selectSupplierName"
-                  clearable
-                  class="w220"
-                >
-                  <el-option
-                    v-for="item in supplierList"
-                    :label="item.name"
-                    :value="item.id"
-                    :key="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="准备开始时间" prop="prepareStartTime">
-                <el-date-picker
-                  v-model="projectSettingForm.prepareStartTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择开始时间"
-                  class="w220"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="准备结束时间" prop="prepareEndTime">
-                <el-date-picker
-                  v-model="projectSettingForm.prepareEndTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择结束时间"
-                  class="w220"
-                  :picker-options="prepareEndTimePicker"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="印刷开始时间" prop="printStartTime">
-                <el-date-picker
-                  v-model="projectSettingForm.printStartTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择开始时间"
-                  class="w220"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="印刷结束时间" prop="printEndTime">
-                <el-date-picker
-                  v-model="projectSettingForm.printEndTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择结束时间"
-                  class="w220"
-                  :picker-options="printEndTimePicker"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="邮寄开始时间" prop="mailStartTime">
-                <el-date-picker
-                  v-model="projectSettingForm.mailStartTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择开始时间"
-                  class="w220"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="邮寄结束时间" prop="mailEndTime">
-                <el-date-picker
-                  v-model="projectSettingForm.mailEndTime"
-                  type="datetime"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择结束时间"
-                  class="w220"
-                  :picker-options="mailEndTimePicker"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item label="学校" prop="orgId">
+            <el-select
+              v-model="settingForm.orgId"
+              placeholder="请选择"
+              :disabled="true"
+              class="w440"
+            >
+              <el-option
+                v-for="item in orgList"
+                :label="item.orgName"
+                :value="item.orgId"
+                :key="item.orgId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="考试" prop="examId">
+            <el-select
+              v-model="settingForm.examId"
+              placeholder="请选择"
+              :disabled="true"
+              class="w440"
+            >
+              <el-option
+                v-for="item in examList"
+                :label="item.examName"
+                :value="item.examId"
+                :key="item.examId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="项目经理" prop="pmId">
+            <el-select
+              v-model="settingForm.pmId"
+              placeholder="请选择"
+              @change="selectPmName"
+              clearable
+              class="w440"
+            >
+              <el-option
+                v-for="item in pmList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="供应商" prop="supplierId">
+            <el-select
+              v-model="settingForm.supplierId"
+              placeholder="请选择"
+              @change="selectSupplierName"
+              clearable
+              class="w440"
+            >
+              <el-option
+                v-for="item in supplierList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="准备时间" prop="prepareTime">
+            <el-date-picker
+              v-model="prepareTime"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+              >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="印刷时间" prop="printTime">
+            <el-date-picker
+              v-model="printTime"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+              >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="邮寄时间" prop="mailTime">
+            <el-date-picker
+              v-model="mailTime"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :default-time="['00:00:00', '23:59:59']"
+            >
+              >
+            </el-date-picker>
+          </el-form-item>
         </el-form>
 
         <div style="text-align: center">
@@ -337,71 +290,34 @@
 import { CORE_API, PRINT_API } from "@/constants/constants";
 import {} from "../constants/constants.js";
 import { mapState } from "vuex";
-import { checkEmptyStr, checkEmptyNumber, formatGMT } from "../utils/common.js";
+import {
+  checkEmptyStr,
+  checkEmptyNumber,
+  checkArray,
+  formatGMT
+} from "../utils/common.js";
 
 export default {
   data() {
-    let validatePrepareStartTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.prepareStartTime) {
-        callback(new Error("请选择开始日期！"));
-      } else {
-        this.$refs.projectSettingForm.validateField("prepareEndTime");
-        callback();
-      }
-    };
-
-    let validatePrepareEndTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.prepareEndTime) {
-        callback(new Error("请选择结束日期！"));
-      } else if (
-        this.projectSettingForm.prepareStartTime >
-        this.projectSettingForm.prepareEndTime
-      ) {
-        callback(new Error("开始日期大于结束日期！"));
+    let validatePrepareTime = (rule, value, callback) => {
+      if (!checkArray(this.prepareTime)) {
+        callback(new Error("请选择准备时间！"));
       } else {
         callback();
       }
     };
 
-    let validatePrintStartTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.printStartTime) {
-        callback(new Error("请选择开始日期！"));
+    let validatePrintTime = (rule, value, callback) => {
+      if (!checkArray(this.printTime)) {
+        callback(new Error("请选择印刷时间！"));
       } else {
-        this.$refs.projectSettingForm.validateField("printEndTime");
         callback();
       }
     };
 
-    let validatePrintEndTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.printEndTime) {
-        callback(new Error("请选择结束日期！"));
-      } else if (
-        this.projectSettingForm.printStartTime >
-        this.projectSettingForm.printEndTime
-      ) {
-        callback(new Error("开始日期大于结束日期！"));
-      } else {
-        callback();
-      }
-    };
-
-    let validateMailStartTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.mailStartTime) {
-        callback(new Error("请选择开始日期！"));
-      } else {
-        this.$refs.projectSettingForm.validateField("mailEndTime");
-        callback();
-      }
-    };
-
-    let validateMailEndTime = (rule, value, callback) => {
-      if (!this.projectSettingForm.mailEndTime) {
-        callback(new Error("请选择结束日期！"));
-      } else if (
-        this.projectSettingForm.mailStartTime >
-        this.projectSettingForm.mailEndTime
-      ) {
-        callback(new Error("开始日期大于结束日期！"));
+    let validateMailTime = (rule, value, callback) => {
+      if (!checkArray(this.mailTime)) {
+        callback(new Error("请选择邮寄时间！"));
       } else {
         callback();
       }
@@ -426,7 +342,7 @@ export default {
       pmList: [],
       supplierList: [],
       projectSettingDialog: false,
-      projectSettingForm: {
+      settingForm: {
         id: "",
         orgId: "",
         examId: "",
@@ -441,6 +357,9 @@ export default {
         mailStartTime: "",
         mailEndTime: ""
       },
+      prepareTime: [],
+      printTime: [],
+      mailTime: [],
       rules: {
         orgId: [
           {
@@ -460,7 +379,6 @@ export default {
         ],
         supplierId: [
           {
-            type: "number",
             required: true,
             message: "请选择供应商！",
             trigger: "change"
@@ -468,106 +386,36 @@ export default {
         ],
         pmId: [
           {
-            type: "number",
             required: true,
             message: "请选择项目经理！",
             trigger: "change"
           }
         ],
-        prepareStartTime: [
+        prepareTime: [
           {
-            type: "date",
             required: true,
-            validator: validatePrepareStartTime,
+            validator: validatePrepareTime,
             trigger: "change"
           }
         ],
-        prepareEndTime: [
+        printTime: [
           {
-            type: "date",
             required: true,
-            validator: validatePrepareEndTime,
+            validator: validatePrintTime,
             trigger: "change"
           }
         ],
-        printStartTime: [
+        mailTime: [
           {
-            type: "date",
             required: true,
-            validator: validatePrintStartTime,
-            trigger: "change"
-          }
-        ],
-        printEndTime: [
-          {
-            type: "date",
-            required: true,
-            validator: validatePrintEndTime,
-            trigger: "change"
-          }
-        ],
-        mailStartTime: [
-          {
-            type: "date",
-            required: true,
-            validator: validateMailStartTime,
-            trigger: "change"
-          }
-        ],
-        mailEndTime: [
-          {
-            type: "date",
-            required: true,
-            validator: validateMailEndTime,
+            validator: validateMailTime,
             trigger: "change"
           }
         ]
-      },
-      prepareEndTimePicker: this.prepareEndTimePickerLimit(),
-      printEndTimePicker: this.printEndTimePickerLimit(),
-      mailEndTimePicker: this.mailEndTimePickerLimit()
+      }
     };
   },
   methods: {
-    prepareEndTimePickerLimit() {
-      let self = this;
-      return {
-        disabledDate(time) {
-          if (self.projectSettingForm.prepareStartTime) {
-            return (
-              new Date(self.projectSettingForm.prepareStartTime).getTime() >
-              time.getTime()
-            );
-          }
-        }
-      };
-    },
-    printEndTimePickerLimit() {
-      let self = this;
-      return {
-        disabledDate(time) {
-          if (self.projectSettingForm.printStartTime) {
-            return (
-              new Date(self.projectSettingForm.printStartTime).getTime() >
-              time.getTime()
-            );
-          }
-        }
-      };
-    },
-    mailEndTimePickerLimit() {
-      let self = this;
-      return {
-        disabledDate(time) {
-          if (self.projectSettingForm.mailStartTime) {
-            return (
-              new Date(self.projectSettingForm.mailStartTime).getTime() >
-              time.getTime()
-            );
-          }
-        }
-      };
-    },
     handlePagerNo(pageNo) {
       /* 处理分页 */
       this.searchRecords(pageNo);
@@ -577,6 +425,17 @@ export default {
       this.formSearch.pageSize = pageSize;
       this.searchRecords(1);
     },
+    resetSearchForm() {
+      if (this.curUserRole.isPM) {
+        this.formSearch.supplierId = "";
+      } else if (this.curUserRole.isSupplier) {
+        this.formSearch.pmId = "";
+      } else {
+        this.formSearch.pmId = "";
+        this.formSearch.supplierId = "";
+      }
+      //this.searchRecords(1);
+    },
     searchRecords(pageNo) {
       this.formSearch.pageNo = pageNo;
 
@@ -704,7 +563,7 @@ export default {
       obj = this.pmList.find(function(item) {
         return item.id === key;
       });
-      this.projectSettingForm.pmName = obj.name;
+      this.settingForm.pmName = obj.name;
     },
     selectSupplierName(key) {
       /* 处理供应商名称 */
@@ -715,7 +574,7 @@ export default {
       obj = this.supplierList.find(function(item) {
         return item.id === key;
       });
-      this.projectSettingForm.supplierName = obj.name;
+      this.settingForm.supplierName = obj.name;
     },
     gotoProjectStatistic(row) {
       /* 查看项目统计 */
@@ -724,32 +583,19 @@ export default {
     },
     editProjectSetting() {
       /* 保存项目设置 */
-      this.$refs.projectSettingForm.validate(valid => {
+      this.$refs.settingForm.validate(valid => {
         if (!valid) {
           return false;
         }
-        this.selectPmName(this.projectSettingForm.pmId);
+        this.selectPmName(this.settingForm.pmId);
+        this.selectSupplierName(this.settingForm.supplierId);
 
-        this.selectSupplierName(this.projectSettingForm.supplierId);
-
-        this.projectSettingForm.prepareStartTime = formatGMT(
-          this.projectSettingForm.prepareStartTime
-        );
-        this.projectSettingForm.prepareEndTime = formatGMT(
-          this.projectSettingForm.prepareEndTime
-        );
-        this.projectSettingForm.printStartTime = formatGMT(
-          this.projectSettingForm.printStartTime
-        );
-        this.projectSettingForm.printEndTime = formatGMT(
-          this.projectSettingForm.printEndTime
-        );
-        this.projectSettingForm.mailStartTime = formatGMT(
-          this.projectSettingForm.mailStartTime
-        );
-        this.projectSettingForm.mailEndTime = formatGMT(
-          this.projectSettingForm.mailEndTime
-        );
+        this.settingForm.prepareStartTime = formatGMT(this.prepareTime[0]);
+        this.settingForm.prepareEndTime = formatGMT(this.prepareTime[1]);
+        this.settingForm.printStartTime = formatGMT(this.printTime[0]);
+        this.settingForm.printEndTime = formatGMT(this.printTime[1]);
+        this.settingForm.mailStartTime = formatGMT(this.mailTime[0]);
+        this.settingForm.mailEndTime = formatGMT(this.mailTime[1]);
 
         let curLoading = this.$loading({
           lock: true,
@@ -757,7 +603,7 @@ export default {
         });
 
         let url = PRINT_API + "/printing/project/update";
-        this.$http.post(url, this.projectSettingForm).then(
+        this.$http.post(url, this.settingForm).then(
           () => {
             curLoading.close();
             this.$notify({
@@ -783,27 +629,26 @@ export default {
     openProjectSettingDialog(row) {
       /* 打开项目设置弹窗 */
       this.projectSettingDialog = true;
-      this.projectSettingForm.id = row.id;
-      this.projectSettingForm.orgId = row.orgId;
-      this.projectSettingForm.examId = row.examId;
-      this.projectSettingForm.pmId = row.pmId;
-      this.projectSettingForm.pmName = row.pmName;
-      this.projectSettingForm.supplierId = row.supplierId;
-      this.projectSettingForm.supplierName = row.supplierName;
-      this.projectSettingForm.prepareStartTime = this.settingDate(
-        row.prepareStartTime
-      );
-      this.projectSettingForm.prepareEndTime = this.settingDate(
-        row.prepareEndTime
-      );
-      this.projectSettingForm.printStartTime = this.settingDate(
-        row.printStartTime
-      );
-      this.projectSettingForm.printEndTime = this.settingDate(row.printEndTime);
-      this.projectSettingForm.mailStartTime = this.settingDate(
-        row.mailStartTime
-      );
-      this.projectSettingForm.mailEndTime = this.settingDate(row.mailEndTime);
+      this.settingForm.id = row.id;
+      this.settingForm.orgId = row.orgId;
+      this.settingForm.examId = row.examId;
+      this.settingForm.pmId = row.pmId;
+      this.settingForm.pmName = row.pmName;
+      this.settingForm.supplierId = row.supplierId;
+      this.settingForm.supplierName = row.supplierName;
+
+      this.prepareTime = [
+        this.settingDate(row.prepareStartTime),
+        this.settingDate(row.prepareEndTime)
+      ];
+      this.printTime = [
+        this.settingDate(row.printStartTime),
+        this.settingDate(row.printEndTime)
+      ];
+      this.mailTime = [
+        this.settingDate(row.mailStartTime),
+        this.settingDate(row.mailEndTime)
+      ];
     },
     closeProjectSettingDialog() {
       /* 关闭项目设置弹窗 */
@@ -858,4 +703,7 @@ export default {
 .w220 {
   width: 220px;
 }
+.w440 {
+  width: 440px;
+}
 </style>

src/modules/print/view/ProjectStatistic.vue

@@ -14,7 +14,6 @@
               :disabled="showGoBack"
               v-model="formSearch.orgId"
               placeholder="请选择"
-              clearable
               @change="loadExamList(formSearch.orgId)"
             >
               <el-option
@@ -149,7 +148,7 @@
       <!-- 备份设置弹窗 -->
       <el-dialog
         title="备份设置"
-        width="500px"
+        width="450px"
         :visible.sync="backupSettingDialog"
         @close="closeBackupSettingDialog"
       >
@@ -171,7 +170,7 @@
                 <el-input
                   v-model="backupSettingForm.eachPkgPercent"
                   :disabled="!backupSettingForm.needEachPkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   ></el-input
@@ -181,7 +180,7 @@
                 <el-input
                   v-model="backupSettingForm.eachPkgMax"
                   :disabled="!backupSettingForm.needEachPkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   ></el-input
@@ -191,7 +190,7 @@
                 <el-input
                   v-model="backupSettingForm.eachPkgMin"
                   :disabled="!backupSettingForm.needEachPkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   ></el-input
@@ -211,7 +210,7 @@
                   v-model="backupSettingForm.groupType"
                   :disabled="!backupSettingForm.needAlonePkg"
                   placeholder="请选择"
-                  class="w300"
+                  class="w200"
                 >
                   <el-option
                     v-for="item in groupTypeList"
@@ -225,7 +224,7 @@
                 <el-input
                   v-model="backupSettingForm.alonePkgPercent"
                   :disabled="!backupSettingForm.needAlonePkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   >
@@ -235,7 +234,7 @@
                 <el-input
                   v-model="backupSettingForm.alonePkgMax"
                   :disabled="!backupSettingForm.needAlonePkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   ></el-input
@@ -245,7 +244,7 @@
                 <el-input
                   v-model="backupSettingForm.alonePkgMin"
                   :disabled="!backupSettingForm.needAlonePkg"
-                  class="w300"
+                  class="w200"
                   ><template slot="append"
                     >%</template
                   ></el-input
@@ -911,6 +910,9 @@ export default {
 .pull-left {
   float: left;
 }
+.w200 {
+  width: 200px;
+}
 .w300 {
   width: 300px;
 }

src/modules/print/view/ProjectTemplate.vue

@@ -13,7 +13,6 @@
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
-              clearable
               @change="loadExamList(formSearch.orgId)"
             >
               <el-option