Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -86,7 +86,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="权利性质：">
+            <el-form-item label="权利性质：" prop="zdjbxx.qlxz">
               <treeselect
                 :disabled="!viewEdit"
                 v-model="ruleForm.zdjbxx.qlxz"
@@ -114,7 +114,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="宗地面积：">
+            <el-form-item label="宗地面积：" prop="zdjbxx.zdmj">
               <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
             </el-form-item>
           </el-col>
@@ -178,7 +178,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="16">
-            <el-form-item label="坐落：">
+            <el-form-item label="坐落：" prop="sldy.zl">
               <el-input :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
             </el-form-item>
           </el-col>
@@ -327,7 +327,8 @@
             }
           })
           that.czrOptions = that.ruleForm.qlrList;
-          that.isSave = that.viewEdit
+          that.isSave = that.viewEdit;
+          this.rules = formValidate(this.ruleForm.sldy.djlx);
         } else {
           that.isSave = false
           that.$confirm(res.message, '提示', {
@@ -374,11 +375,7 @@
         },
         //传递参数
         propsParam: {},
-        rules: {
-          'jsydsyq.djyy': [
-            { required: true, message: '请输入登记原因', trigger: 'blur' }
-          ]
-        }
+        rules: {}
       };
     },
     methods: {
@@ -509,7 +506,7 @@
           } else {
             this.$message({
               showClose: true,
-              message: "请输入登记原因",
+              message: "请输入红框内的相关信息！",
               type: "error"
             })
             return false

@@ -4,22 +4,27 @@
  * @author: renchao
  */
 export function formValidate (djlx) {    
-    switch (djlx) {
-        case "100":
-            return fristValidate();
-        case "200":
-            return transferValidate();
-        case "300":
-            return changeValidate();
-        case "400":
-            return logoutValidate();
-        case "500":
-            return riviseValidate();
-        case "901":
-            return renewalValidate();
-        case "902":
-            return replaceValidate();
-    }   
+    var formRules={
+        'sldy.zl': [
+            { required: true, message: '坐落：', trigger: 'blur' }
+          ],       
+        'zdjbxx.zdmj': [
+            { required: true, message: '宗地面积：', trigger: 'blur' }
+          ],
+          'zdjbxx.qlxz': [
+            { required: true, message: '权利性质：', trigger: 'blur' }
+          ],
+          'jsydsyq.djyy': [
+            { required: true, message: '登记原因：', trigger: 'blur' }
+          ],
+          'jsydsyq.qdjg': [
+            { required: false, message: '取得价格：', trigger: 'blur' }
+          ]
+      }  
+        if (djlx=="200") {      
+          formRules["jsydsyq.qdjg"][0].required=true; 
+        }
+        return formRules;
 }
 
 /**
@@ -27,13 +32,7 @@ export function formValidate (djlx) {
  * @param {*} data 
  * @author: renchao
  */
-export function fristValidate () {
-  var formRules={
-    'diyaq.djyy': [
-        { required: true, message: '请输入登记原因', trigger: 'blur' }
-      ]
-  }
-  return formRules;
+export function fristValidate () {  
 }