bug修改

src/modules/admin/components/ModifyPrivilege.vue

@@ -114,7 +114,7 @@ export default {
         name: [
           {
             required: true,
-            length: 30,
+            max: 30,
             message: "菜单名称不能超过30",
             trigger: "change"
           }

src/modules/base/components/ModifyUser.vue

@@ -182,6 +182,11 @@ export default {
             required: true,
             message: "请输入用户名",
             trigger: "change"
+          },
+          {
+            max: 50,
+            message: "用户名不能超过50",
+            trigger: "change"
           }
         ],
         realName: [
@@ -189,6 +194,11 @@ export default {
             required: true,
             message: "请输入姓名",
             trigger: "change"
+          },
+          {
+            max: 50,
+            message: "姓名不能超过50",
+            trigger: "change"
           }
         ],
         roleIds: [

src/modules/base/views/OrganizationManage.vue

@@ -16,6 +16,13 @@
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span>{{ node.label }}</span>
           <span>
+            <el-button
+              class="btn-table-icon"
+              type="text"
+              icon="icon icon-plus-act"
+              @click="() => append(data)"
+              title="新增"
+            ></el-button>
             <el-button
               class="btn-table-icon"
               type="text"
@@ -30,13 +37,6 @@
               @click="() => remove(node, data)"
               title="删除"
             ></el-button>
-            <el-button
-              class="btn-table-icon"
-              type="text"
-              icon="icon icon-plus-act"
-              @click="() => append(data)"
-              title="新增"
-            ></el-button>
           </span>
         </span>
       </el-tree>

src/modules/exam/components/ApplyContent.vue

@@ -125,6 +125,7 @@
         clearable
         show-word-limit
         placeholder="建议不超过1000个字"
+        ref="ReasonInput"
       ></el-input>
     </div>
     <div class="task-action">
@@ -465,24 +466,22 @@ export default {
         .catch(() => {});
     },
     toAuditApply(type) {
-      if (type === "PASS") {
-        this.auditApply(type);
-      } else {
-        if (!this.reason) {
-          this.$message.error("请输入审核意见！");
-          return;
-        }
+      if (type === "NOT_PASS" && !this.reason) {
+        this.$message.error("请输入审核意见！");
+        this.$refs.ReasonInput.focus();
+        return;
+      }
 
-        this.$confirm("确定不通过该申请吗？", "提示", {
-          cancelButtonClass: "el-button--danger is-plain",
-          confirmButtonClass: "el-button--primary",
-          type: "warning"
+      const actionName = type === "NOT_PASS" ? "不通过" : "通过";
+      this.$confirm(`确定${actionName}该申请吗？`, "提示", {
+        cancelButtonClass: "el-button--danger is-plain",
+        confirmButtonClass: "el-button--primary",
+        type: "warning"
+      })
+        .then(() => {
+          this.auditApply(type);
         })
-          .then(() => {
-            this.auditApply(type);
-          })
-          .catch(() => {});
-      }
+        .catch(() => {});
     },
     async auditApply(type) {
       const data = await updateTaskReview({

src/modules/exam/components/BatchAddExamTask.vue

@@ -159,7 +159,7 @@ export default {
           }
         ]
       },
-      downloadUrl: this.GLOBAL.domain + "/temps/考试计划导入模板.xlsx",
+      downloadUrl: this.GLOBAL.domain + "/temps/命题任务导入模板.xlsx",
       // import
       uploadExamTaskUrl: "/api/admin/exam/task/import"
     };

src/modules/exam/views/TaskReviewManage.vue

@@ -210,7 +210,7 @@
     <el-dialog
       class="modify-task-apply"
       :visible.sync="auditDialogShow"
-      title="审核意见"
+      title="审核不通过"
       width="500px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -349,12 +349,21 @@ export default {
         this.$message.error("请选择要审核的记录！");
         return;
       }
-      if (isPass) {
-        this.auditApply("PASS", this.multipleSelection);
-      } else {
-        this.auditModal.reason = "";
-        this.auditDialogShow = true;
-      }
+      const actionName = isPass ? "通过" : "不通过";
+      this.$confirm(`确定${actionName}这些申请吗？`, "提示", {
+        cancelButtonClass: "el-button--danger is-plain",
+        confirmButtonClass: "el-button--primary",
+        type: "warning"
+      })
+        .then(() => {
+          this.auditModal.reason = "";
+          if (isPass) {
+            this.auditApply("PASS", this.multipleSelection);
+          } else {
+            this.auditDialogShow = true;
+          }
+        })
+        .catch(() => {});
     },
     async auditNotPass() {
       const valid = await this.$refs.AuditForm.validate().catch(() => {});

src/modules/print/components/ModifyPlanPaper.vue

@@ -143,7 +143,6 @@ import { attachmentPreview } from "../../login/api";
 
 const initModalForm = {
   id: null,
-  examDetailId: null,
   paperNumber: "",
   relatePaperType: ""
 };
@@ -168,13 +167,6 @@ export default {
       paperAttachments: [],
       cardId: "",
       rules: {
-        paperNumber: [
-          {
-            required: true,
-            message: "请选择试卷编号",
-            trigger: "change"
-          }
-        ],
         relatePaperType: [
           {
             required: true,
@@ -245,7 +237,12 @@ export default {
 
       if (this.isSubmit) return;
       this.isSubmit = true;
-      const data = await updatePlanLinkPaper(this.modalForm).catch(() => {});
+      const datas = {
+        examTaskId: this.modalForm.id,
+        relatePaperType: this.modalForm.relatePaperType,
+        printPlanId: this.instance.printPlanId
+      };
+      const data = await updatePlanLinkPaper(datas).catch(() => {});
       this.isSubmit = false;
       if (!data) return;
 

src/modules/print/components/ModifyPrintPlan.vue

@@ -372,8 +372,8 @@ export default {
         name: [
           {
             required: true,
-            message: "请输入印刷计划名称，长度不要超过100个字符",
-            max: 100,
+            message: "请输入印刷计划名称，长度不要超过50个字符",
+            max: 50,
             trigger: "change"
           }
         ],