Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/model/Ditopn/Pattern.js

@@ -78,11 +78,11 @@ export default {
     ],
     "didgrp.rec.nomtop": [
         { type: "string", required: false, message: "必输项", trigger: "blur" },
-        { max: 8, message: "长度不能超过8", trigger: "blur" }
+        { max: 9, message: "长度不能超过9", trigger: "blur" }
     ],
     "didgrp.rec.nomton": [
         { type: "string", required: false, message: "必输项", trigger: "blur" },
-        { max: 8, message: "长度不能超过8", trigger: "blur" }
+        { max: 9, message: "长度不能超过9", trigger: "blur" }
     ],
     "didgrp.apl.pts.youzbm": [
         { type: "string", required: false, message: "必输项" },
@@ -175,9 +175,8 @@ export default {
     ],
 
     "didgrp.beb.pts.bankno": [
-        { type: "string", required: false, message: "必输项" },
-        //TODO  三位汉字的判断没加
-        { pattern: /^[0-9A-Za-z]{6,}$/, message: "至少输入3个字或6位行号" },
+        { type: "string", required: true, message: "必输项" },
+        { pattern: (/^[\u4E00-\u9FA5]{3,}|^[0-9A-Za-z]{6,}$/), message: "至少输入3个字或6位行号" },
         { max: 20, message: "长度不能超过20" }
     ],
 

src/views/Business/Ditopn/Detp.vue

@@ -149,7 +149,7 @@ export default {
                 this.model.didgrp.blk.defdet = "";
             }
             const arg = Utils.flatObject(this.model);
-            Api.post("ditopn/executeDefault/didgrp.rec.avbby", arg).then(
+            Api.post("ditopn/executeCheck/didgrp.rec.avbby", arg).then(
                 (res) => {
                     if (res.respCode == "AAAAAA"){
                         Utils.copyValueFromVO(this.model, res.data);

src/views/Business/Ditopn/Ovwp.vue

@@ -116,6 +116,7 @@
                 <el-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
                     <c-input
                         v-model="model.didgrp.rec.nomtop"
+                        maxlength="9"
                         placeholder="请输入Amount Tolerance - Positive"
                     ></c-input>
                 </el-form-item>
@@ -129,7 +130,7 @@
                 >
                     <c-input
                         v-model="model.didgrp.rec.nomton"
-                        maxlength="6"
+                        maxlength="9"
                         placeholder="请输入Amount Tolerance - Negative"
                     ></c-input>
                 </el-form-item>