--no commit message

@@ -69,7 +69,7 @@
             <el-form-item label="登记类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
                 <el-option
-                  v-for="item in dictData['A21']"
+                  v-for="item in djlxlist"
                   :key="item.dcode"
                   :label="item.dname"
                   :value="item.dcode"
@@ -219,27 +219,27 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="不动产权证号：">
+            <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh"  :rules="rules.bdcqzhrules">
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="区县代码：">
+            <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记机构：">
+            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登簿人：">
+            <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
               <el-input v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记时间：">
+            <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
               <el-input v-model="ruleForm.qlxx.djsj"></el-input>
             </el-form-item>
           </el-col>
@@ -366,6 +366,34 @@ export default {
 
       //表单是否可操作
       propsParam: this.$attrs,
+           // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
+        },
+
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
       // 权属状态
       qsztlist: [
         {
@@ -383,8 +411,16 @@ export default {
       disabled: true,
       czrOptions: [],
       ruleForm: {},
-      //传递参数\
-      rules: {},
+     //传递参数\
+         rules: {
+          bdcqzhrules:[
+            { required: true, message: "不动产权证号：", trigger: "change" },
+          ],
+        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+      },
     };
   },
   created() {
@@ -423,6 +459,8 @@ export default {
       this.key++;
     },
     onSubmit() {
+       this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
       if (this.ruleForm.qlrData.length == 0) {
         this.$message({
           showClose: true,
@@ -496,7 +534,11 @@ export default {
             type: "error",
           });
         }
+      });         } else {
+          return false;
+        }
       });
+
     },
   },
 };

@@ -69,7 +69,7 @@
             <el-form-item label="登记类型：">
               <el-select v-model="ruleForm.qlxx.djlx">
                 <el-option
-                  v-for="item in dictData['A21']"
+                  v-for="item in djlxlist"
                   :key="item.dcode"
                   :label="item.dname"
                   :value="item.dcode"
@@ -107,17 +107,17 @@
               <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="使用权起始时间">
               <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
             </el-form-item>
           </el-col>
-             <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="使用权结束时间">
               <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
             </el-form-item>
           </el-col>
-             <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="土地使用期限">
               <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
             </el-form-item>
@@ -148,27 +148,47 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="不动产权证号：">
+            <el-form-item
+              label="不动产权证号："
+              prop="qlxx.bdcqzh"
+              :rules="rules.bdcqzhrules"
+            >
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="区县代码：">
+            <el-form-item
+              label="区县代码："
+              prop="qlxx.qxdm"
+              :rules="rules.qxdmrules"
+            >
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记机构：">
+            <el-form-item
+              label="登记机构："
+              prop="qlxx.djjg"
+              :rules="rules.djjgrules"
+            >
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登簿人：">
+            <el-form-item
+              label="登簿人："
+              prop="qlxx.dbr"
+              :rules="rules.dbrrules"
+            >
               <el-input v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记时间：">
+            <el-form-item
+              label="登记时间："
+              prop="qlxx.djsj"
+              :rules="rules.djsjrules"
+            >
               <el-input v-model="ruleForm.qlxx.djsj"></el-input>
             </el-form-item>
           </el-col>
@@ -289,6 +309,34 @@ export default {
       propsParam: this.$attrs,
       ableOperation: true,
       key: 0,
+      // 登记类型
+      djlxlist: [
+        {
+          dcode: "100",
+          dname: "首次登记",
+        },
+        {
+          dcode: "200",
+          dname: "转移登记",
+        },
+        {
+          dcode: "300",
+          dname: "变更登记",
+        },
+        {
+          dcode: "500",
+          dname: "更正登记",
+        },
+
+        {
+          dcode: "901",
+          dname: "补证",
+        },
+        {
+          dcode: "902",
+          dname: "换证",
+        },
+      ],
       // 权属状态
       qsztlist: [
         {
@@ -300,13 +348,21 @@ export default {
           dname: "历史",
         },
       ],
-      tdxz:null,
+      tdxz: null,
       isShow: false,
       disabled: true,
       czrOptions: [],
       ruleForm: {},
       //传递参数\
-      rules: {},
+      rules: {
+        bdcqzhrules: [
+          { required: true, message: "不动产权证号：", trigger: "change" },
+        ],
+        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
+        dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
+        djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+      },
     };
   },
   created() {
@@ -319,14 +375,14 @@ export default {
       return store.getters.dictData[val];
     },
     loadData() {
-    this.propsParam.isEdit=this.$parent.isEdit
+      this.propsParam.isEdit = this.$parent.isEdit;
       init(this.propsParam).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
-            if( this.ruleForm.tdytqxList.length>0){
-            this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm
-          }else{
-            this.tdxz=null
+          if (this.ruleForm.tdytqxList.length > 0) {
+            this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
+          } else {
+            this.tdxz = null;
           }
           this.isShow = true;
         }
@@ -349,57 +405,63 @@ export default {
       this.key++;
     },
     onSubmit() {
-      if (this.ruleForm.qlrData.length == 0) {
-        this.$message({
-          showClose: true,
-          message: "请确认权利人信息",
-          type: "error",
-        });
-        return false;
-      }
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.qlrData.length == 0) {
+            this.$message({
+              showClose: true,
+              message: "请确认权利人信息",
+              type: "error",
+            });
+            return false;
+          }
 
-      if (this.ruleForm.qlxx.gyfs == "0") {
-        if (this.ruleForm.qlrData.length > 1) {
-          this.$message({
-            showClose: true,
-            message: "共有方式：单独所有，权利人只能是一个人",
-            type: "error",
-          });
-          return false;
-        }
-        this.ruleForm.qlrData[0].sfczr = "1";
-      }
-      if (this.ruleForm.qlxx.gyfs == "1") {
-        //是否分别持证
-        if (this.ruleForm.qlxx.sqfbcz == "1") {
-          //是
-          this.ruleForm.qlrData.forEach((item, index) => {
-            item.sfczr = "1";
-          });
-        } else {
-          this.ruleForm.qlrData.forEach((item, index) => {
-            if (item.zjh == this.ruleForm.czr) {
-              item.sfczr = "1";
+          if (this.ruleForm.qlxx.gyfs == "0") {
+            if (this.ruleForm.qlrData.length > 1) {
+              this.$message({
+                showClose: true,
+                message: "共有方式：单独所有，权利人只能是一个人",
+                type: "error",
+              });
+              return false;
+            }
+            this.ruleForm.qlrData[0].sfczr = "1";
+          }
+          if (this.ruleForm.qlxx.gyfs == "1") {
+            //是否分别持证
+            if (this.ruleForm.qlxx.sqfbcz == "1") {
+              //是
+              this.ruleForm.qlrData.forEach((item, index) => {
+                item.sfczr = "1";
+              });
             } else {
-              item.sfczr = "0";
+              this.ruleForm.qlrData.forEach((item, index) => {
+                if (item.zjh == this.ruleForm.czr) {
+                  item.sfczr = "1";
+                } else {
+                  item.sfczr = "0";
+                }
+              });
+            }
+          }
+          save(this.ruleForm).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                showClose: true,
+                message: "保存成功！",
+                type: "success",
+              });
+              this.$store.dispatch("user/refreshPage", true);
+            } else {
+              this.$message({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
             }
           });
-        }
-      }
-      save(this.ruleForm).then((res) => {
-        if (res.code === 200) {
-          this.$message({
-            showClose: true,
-            message: "保存成功！",
-            type: "success",
-          });
-          this.$store.dispatch("user/refreshPage", true);
         } else {
-          this.$message({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
+          return false;
         }
       });
     },

@@ -100,7 +100,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="登记机构："  prop="qlxx.djjg" :rules="rules.djjgrules">
+            <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>