Browse Source

修改机构页面-统一社会信用代码格式校验问题

953954216 1 year ago
parent
commit
7519707332

+ 0 - 1
ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/controller/YljgFwcdCwController.java

@@ -42,7 +42,6 @@ public class YljgFwcdCwController extends BaseController
     public TableDataInfo list(YljgFwcdCw yljgFwcdCw)
     {
         startPage();
-        yljgFwcdCw.setCwzt("1");
         List<YljgFwcdCw> list = yljgFwcdCwService.selectYljgFwcdCwList(yljgFwcdCw);
         return getDataTable(list);
     }

+ 2 - 1
ruoyi-ui/src/views/business/lhcj/sxxx/yljgSxxx/index.vue

@@ -340,7 +340,8 @@ export default {
         ],
         tyshxydm: [
           { required: true, message: "统一社会信用代码不能为空", trigger: "blur" },
-          { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+          // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+          { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
         ],
         sjly: [
           { required: true, message: "数据来源不能为空", trigger: "change" },

+ 4 - 2
ruoyi-ui/src/views/organization/jggl/jcxx/index.vue

@@ -773,7 +773,8 @@ export default {
         rules: {
           tyshxydm: [
             { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
-            { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
           ],
           jgmc: [
             { required: true, message: '单位名称不能为空', trigger: 'blur' },
@@ -1430,7 +1431,8 @@ export default {
           this.form.tyshxydm = this.cacheTyshxydm
           this.rules.tyshxydm = [
             { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
-            { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
           ]
         }
       },

+ 2 - 1
ruoyi-ui/src/views/organization/jggl/sqJcxx/index.vue

@@ -1637,7 +1637,8 @@ export default {
         } else {
           this.rules.tyshxydm = [
             { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
-            { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+            { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
           ]
         }
       },

+ 1 - 1
ruoyi-ui/src/views/system/zhgl/sqyljg/index.vue

@@ -287,7 +287,7 @@ export default {
         ],
         tyshxydm: [
           { required: true, message: "统一社会信用代码不能为空", trigger: "blur" },
-	        { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
+	        // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
           { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur'},
         ],
         frxm: [

+ 1 - 1
ruoyi-ui/src/views/system/zhgl/yljg/index.vue

@@ -181,7 +181,7 @@ export default {
         ],
         tyshxydm: [
           { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
-          { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
+          // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
           { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur'},
         ],
         frxm: [