Merge remote-tracking branch 'origin/master'

package-lock.json

+{
+  "name": "refined-platform",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}

refined-manager-ui/admin/src/assets/mixins/formdialog.js

@@ -66,6 +66,7 @@ export default {
       el.validate((valid) => {
         if (!valid) return;
         this.loading = true;
+        console.log(this.form);
         this.$post(this.urls.saveUrl || this.pageInfo.saveUrl, this.beforeSubmit(this.form))
           .then(res => {
             this.$message.success(res.msg);

refined-manager-ui/admin/src/views/care/constraint/dialogshow.vue

@@ -6,7 +6,7 @@
               <Field :span="20" label="姓名" prop="name" v-model="form.name" placeholder="请输入个人姓名"/>
               <Field :span="20" label="联系方式" prop="contact" v-model="form.contact" placeholder="请输入联系方式"/>
               <Field :span="20" label="证件类型" prop="idCardType" v-model="form.idCardType" type="radio" :enumData="dict.idCardType" placeholder="请输入证件类型"/>
-              <Field :span="20" label="证件号码" prop="idCardNo" v-model="form.idCard" placeholder="请输入证件号码"/>
+              <Field :span="20" label="证件号码" prop="idCard" v-model="form.idCard" placeholder="请输入证件号码"/>
             </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -25,6 +25,24 @@
             dialogShow ,
         },
         data() {
+            let validatorSheet = (rule, value, callback)=>{
+                let Reg = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
+                let regt =  /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+                
+                if( Reg.test( value ) || regt.test( value )  ) {
+                    callback()
+                } else {
+                    callback(new Error('输入正确格式的身份证号'))
+                }
+            }
+            let phoneReg = (rule, value, callback) =>{
+                let regExp=/^(((\+86)|(\+86-))|((86)|(86\-))|((0086)|(0086\-)))?1[3|5|7|8]\d{9}$/;
+                if(regExp.test(value)){
+                    callback()
+                }else{
+                    callback(new Error('请输入正确格式的手机号码'))
+                }
+            }
             return {
                 // 子表选中数据
                 checkedCareConstraintTrack: [],
@@ -48,14 +66,28 @@
                     idCard: [
                         {required: true,message: "请输入身份证号码", trigger: "blur" },
                         {max: 18,message: "最多只能录入18个字符",trigger: "blur",},
+                        {validator: validatorSheet,trigger: "blur"}
+                    ],
+                    name: [
+                        {required: true,message: "请输入姓名", trigger: "blur" },
                     ],
+                    idCardType: [
+                        {required: true,message: "请输入证件类型", trigger: "blur" },
+                    ],
+                    contact:[
+                        {required: true,message: "请输入联系方式", trigger: "blur" },
+                        {validator:phoneReg, trigger: "blur" },
+                    ]
 
                 }
             };
         },
 
         methods: {
-
+            // beforeSubmit(data){
+            //     console.log(data);
+            //     return data
+            // },
             // 渲染前置处理
             beforeRender(data) {
                 if(data.entity.careConstraintTrackList) {

refined-manager-ui/admin/src/views/system/resource/dialogshow.vue

@@ -19,7 +19,7 @@
           type="select"
         />
         <!-- <Field label="用户类型" prop="userType" v-model="form.userType" :enumData='dict.userType' type='select' /> -->
-        <Field label="链接地址" prop="url" :span="20">
+        <Field label="链接地址" prop="urls" :span="20">
           <el-button
             icon="el-icon-plus"
             circle
@@ -192,6 +192,7 @@ export default {
 
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        urls:[{ required: true, message: "地址不能为空", trigger: "blur" }]
       },
     };
   },