通用规则新增考号位数设置

src/modules/base/components/ModifyCardRule.vue

@@ -64,7 +64,7 @@
         label="考号位数："
         class="inline-block"
       >
-        <el-input-number
+        <!-- <el-input-number
           v-model="modalForm.examNumberDigit"
           :min="5"
           :max="15"
@@ -72,7 +72,8 @@
           step-strictly
           :controls="false"
           style="width: 100px;"
-        ></el-input-number>
+        ></el-input-number> -->
+        {{ modalForm.examNumberDigit }}
       </el-form-item>
       <el-form-item prop="paperType" label="AB卷版式：" class="inline-block">
         <el-select
@@ -184,7 +185,7 @@ const initModalForm = {
   name: "",
   remark: "",
   examNumberStyle: "",
-  examNumberDigit: 13,
+  examNumberDigit: 8,
   paperType: "PRINT",
   examAbsent: true,
   discipline: true,
@@ -337,6 +338,8 @@ export default {
   methods: {
     initData(val) {
       this.modalForm = this.$objAssign(initModalForm, val);
+      this.modalForm.examNumberDigit =
+        this.modalForm.examNumberDigit || initModalForm.examNumberDigit;
 
       if (val.id) {
         this.modalForm.requiredFields = JSON.parse(val.requiredFields);

src/modules/base/components/RuleExam.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="rule-exam part-box part-box-pad part-box-border">
     <h4 class="part-box-tips">变量印刷考务字段配置：</h4>
-    <el-form ref="modalFormComp" :model="modalForm" label-width="170px">
+    <el-form
+      ref="modalFormComp"
+      :model="modalForm"
+      :rules="rules"
+      label-width="170px"
+    >
       <el-form-item label="必选字段：" required>
         <el-checkbox
           v-for="field in modalForm.requiredFields"
@@ -36,6 +41,17 @@
           </div>
         </div>
       </el-form-item>
+      <el-form-item prop="examNumberDigit" label="考号位数：" required>
+        <el-input-number
+          v-model="modalForm.examNumberDigit"
+          :min="5"
+          :max="15"
+          :step="1"
+          step-strictly
+          :controls="false"
+          style="width: 100px;"
+        ></el-input-number>
+      </el-form-item>
       <el-form-item label="是否启用入库审核：" required>
         <el-switch v-model="modalForm.review" inactive-color="#dcdfe6">
         </el-switch>
@@ -83,6 +99,7 @@ const initModalForm = {
   id: null,
   review: true,
   includePaper: true,
+  examNumberDigit: 8,
   printMethod: "AUTO",
   requiredFields: "[]",
   extendFields: "[]"
@@ -95,7 +112,16 @@ export default {
     return {
       modalForm: { ...initModalForm },
       isSubmit: false,
-      CONFIRM_PRINT_TYPE
+      CONFIRM_PRINT_TYPE,
+      rules: {
+        examNumberDigit: [
+          {
+            required: true,
+            message: "请输入考号位数",
+            trigger: "change"
+          }
+        ]
+      }
     };
   },
   mounted() {
@@ -105,7 +131,10 @@ export default {
     async init() {
       const requiredFields = await getEnums("REQUIRED_FIELDS");
       const examRule = await examRuleDetail();
-      this.modalForm = Object.assign(initModalForm, examRule || {});
+      this.modalForm = Object.assign({}, initModalForm, examRule || {});
+      this.modalForm.examNumberDigit =
+        examRule.examNumberDigit || initModalForm.examNumberDigit;
+
       this.modalForm.requiredFields = requiredFields.map(item => {
         return {
           code: item.code,
@@ -113,7 +142,7 @@ export default {
           enable: true
         };
       });
-      console.log(this.modalForm.extendFields);
+      // console.log(this.modalForm.extendFields);
       this.modalForm.extendFields = JSON.parse(this.modalForm.extendFields);
     },
     validateRequiredFields() {

src/modules/base/views/CardRuleManage.vue

@@ -173,6 +173,7 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       rules: [],
+      examRule: {},
       curRule: {},
       editType: "ADD",
       cardRequiredFields: [],
@@ -212,6 +213,7 @@ export default {
         });
         return;
       }
+      this.examRule = examRule;
 
       this.cardExtendFields = [
         ...extendFields,
@@ -242,6 +244,7 @@ export default {
     },
     toAdd() {
       this.curRule = {
+        examNumberDigit: this.examRule.examNumberDigit,
         requiredFields: this.cardRequiredFields.map(item => {
           return {
             code: item.code,

src/modules/print/views/PrintTaskManage.vue

@@ -363,7 +363,7 @@
       :visible.sync="padViewDialogVisible"
       title="请选择PDF类型"
       top="10vh"
-      width="400px"
+      width="820px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       append-to-body

src/views/HomePage.vue

@@ -4,7 +4,7 @@
       <div class="tab-summary-item">
         <i v-if="summary.waitTaskCount" class="tab-summary-rp"></i>
         <i class="tab-summary-icon icon icon-wait"></i>
-        <h4 class="tab-summary-title">代办任务</h4>
+        <h4 class="tab-summary-title">待办任务</h4>
         <p class="tab-summary-cont">{{ summary.waitTaskCount }}</p>
       </div>
       <div class="tab-summary-item">