fix: 11.03 新增保税区排行web端全国绩效排名

src/views/RANK/index.vue

@@ -85,6 +85,11 @@
           {{scope.row.midwestRanking}}
         </template>
       </el-table-column>
+      <el-table-column label="全国绩效排名" align="center" prop="nationalPerformanceRanking">
+        <template slot-scope="scope">
+          {{scope.row.nationalPerformanceRanking}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -115,8 +120,8 @@
 
     <!-- 添加或修改广西保税区排名对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item prop="deptId"  label-width="100px" label="保税区名称">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item prop="deptId" label="保税区名称">
           <el-select v-model="form.deptId" filterable default-first-option clearable placeholder="请选择保税区">
             <el-option
               v-for="item in deptList"
@@ -126,7 +131,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="year" label-width="100px" label="年份">
+        <el-form-item prop="year" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
               v-for="(item,i) in nearYearList"
@@ -137,14 +142,18 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="ranking" label-width="100px" label="排名">
+        <el-form-item prop="ranking" label="排名">
           <el-input  v-model="form.ranking" placeholder="请输入排名" ></el-input>
         </el-form-item>
 
-        <el-form-item prop="midwestRanking" label-width="100px" label="中西部排名">
+        <el-form-item prop="midwestRanking" label="中西部排名">
           <el-input  v-model="form.midwestRanking" placeholder="请输入排名" ></el-input>
         </el-form-item>
 
+        <el-form-item prop="nationalPerformanceRanking" label="全国绩效排名">
+          <el-input  v-model="form.nationalPerformanceRanking" placeholder="请输入排名" ></el-input>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -209,11 +218,15 @@ export default {
         ],
         ranking: [
           { required: true, message: "排名不能为空", trigger: "blur" },
-          { trigger: 'blur', validator: this.validatorFloatNum }
+          { trigger: 'blur', validator: this.validator }
         ],
         midwestRanking: [
           { required: true, message: "中西部排名不能为空", trigger: "blur" },
-          { trigger: 'blur', validator: this.validatorFloatNum }
+          { trigger: 'blur', validator: this.validator }
+        ],
+        nationalPerformanceRanking: [
+          { required: true, message: "全国绩效排名不能为空", trigger: "blur" },
+          { trigger: 'blur', validator: this.validator }
         ]
       }
     };
@@ -342,16 +355,11 @@ export default {
       }, `RANK_${new Date().getTime()}.xlsx`)
     },
     // 校验参数
-    validatorFloatNum(rule, value, callback) {
-      let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
-      if (!reg.test(value)) {
-        callback(new Error('请输入数字和正确格式的数字'));
-      } else if (value.split('.').length > 1) {
-        callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
+    validator(rule, value, callback) {
+      if (Number.isInteger(Number(value)) && Number(value) > 0 && Number(value) < 999) {
+        callback()
       } else {
-        callback();
+        callback(new Error('请输入1-999的正整数'))
       }
     }
   }