Merge branch '陈航-老年食堂新增字段与残疾证号规则修改' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/domain/LnstJcxx.java

@@ -219,6 +219,10 @@ public class LnstJcxx extends BaseEntity
     @ApiModelProperty(value = "食堂用餐启用/禁用")
     private String ylstate;
 
+    /** 是否可以自由输入金额 */
+    @ApiModelProperty(value = "是否可以自由输入金额(0否 1是)")
+    private String isSrje;
+
     /** 建筑面积 */
     @Excel(name = "建筑面积")
     @ApiModelProperty(value = "建筑面积")

ruoyi-modules/mz-lnst/src/main/resources/mapper/lnst/LnstJcxxMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnit"    column="update_unit"    />
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
+        <result property="isSrje"    column="is_srje"    />
         <result property="ssxzqhName"    column="ssxzqh_name"    />
         <result property="szxzqhName"    column="szxzqh_name"    />
     </resultMap>

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/domain/YljgKhJbxx.java

@@ -267,7 +267,7 @@ public class YljgKhJbxx extends BaseEntity
     /** 残疾证号 */
 //    @Excel(name = "残疾证号")
     @ApiModelProperty(value = "残疾证号")
-    @Size(max = 20, message = "{残疾证号}")
+    @Size(min = 20,max = 20, message = "{残疾证号}")
     @EncryptionV
     private String cjzh;
 

ruoyi-ui/src/views/business/btgl/lrbtgl/index.vue

@@ -629,7 +629,8 @@ export default {
             trigger: 'change'
           }],
         // xjd: [{ required: true, message: '现居地不能为空', trigger: 'blur' }],
-        cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        // cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        cjzh: [{ min: 20,max: 20, message: '残疾证号为20个字符', trigger: 'blur' }],
         sfcjsb: [{ required: true, message: '是否参加社保不能为空', trigger: 'change' }],
         sfxschx: [{ required: true, message: '是否享受长护险不能为空', trigger: 'blur' }],
         sbkh: [{ max: 18, message: '社保卡号不能超过18个字符', trigger: 'blur' }],

ruoyi-ui/src/views/business/btgl/lrbtsh/index.vue

@@ -492,7 +492,8 @@ export default {
         hjszd: [{ required: true, message: '户籍所在地不能为空', trigger: 'blur' }],
         jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
         xjd: [{ required: true, message: '现居地不能为空', trigger: 'blur' }],
-        cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        // cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        cjzh: [{ min: 20,max: 20, message: '残疾证号为20个字符', trigger: 'blur' }],
         sfcjsb: [{ required: true, message: '是否参加社保不能为空', trigger: 'change' }],
         sbkh: [{ max: 12, message: '社保卡号不能超过12个字符', trigger: 'blur' }],
         jhrxm: [

ruoyi-ui/src/views/business/btgl/lrbtsp/index.vue

@@ -504,7 +504,8 @@ export default {
         hjszd: [{ required: true, message: '户籍所在地不能为空', trigger: 'blur' }],
         jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
         xjd: [{ required: true, message: '现居地不能为空', trigger: 'blur' }],
-        cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        // cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        cjzh: [{ min: 20,max: 20, message: '残疾证号为20个字符', trigger: 'blur' }],
         sfcjsb: [{ required: true, message: '是否参加社保不能为空', trigger: 'change' }],
         sbkh: [{ max: 12, message: '社保卡号不能超过12个字符', trigger: 'blur' }],
         jhrxm: [

ruoyi-ui/src/views/organization/kugl/khjbxx/index.vue

@@ -1100,7 +1100,8 @@ export default {
         ],
         cjzh: [
           { required: true, message: '残疾证号不能为空', trigger: 'blur' },
-          { max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }
+          { min: 20,max: 20, message: '残疾证号为20个字符', trigger: 'blur' }
+          // { max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }
         ]
       },
       familyRules: {

ruoyi-ui/src/views/search/xxcx/btxx/lrbt/index.vue

@@ -305,7 +305,9 @@ export default {
         hjszd: [{ required: true, message: '户籍所在地不能为空', trigger: 'blur' }],
         jg: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
         xjd: [{ required: true, message: '现居地不能为空', trigger: 'blur' }],
-        cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        // cjzh: [{ max: 20, message: '残疾证号不能超过20个字符', trigger: 'blur' }],
+        cjzh: [{ min: 20,max: 20, message: '残疾证号为20个字符', trigger: 'blur' }],
+
         sfcjsb: [{ required: true, message: '是否参加社保不能为空', trigger: 'change' }],
         sbkh: [{ max: 12, message: '社保卡号不能超过12个字符', trigger: 'blur' }],
         jhrxm: [