Merge branch 'dev'

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2024-03-26 09:51:36
+ * @LastEditTime: 2024-03-26 11:05:43
 -->
 <template>
   <div class="slxx">
@@ -113,7 +113,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="土地性质：" prop="fdcq2.tdxz">
+            <el-form-item label="土地性质：" prop="fdcq2.tdxz" :class="{ 'is-error': isError }">
               <treeselect
                 :disabled="!viewEdit"
                 v-model="ruleForm.fdcq2.tdxz"
@@ -495,6 +495,7 @@
     },
     data () {
       return {
+        isError: false,
         normalizer (node) {
           if (node.children == null || node.children == "null") {
             delete node.children;
@@ -637,6 +638,7 @@
        * @author: renchao
        */
       onSubmit () {
+        this.isError = false
         let that = this;
         let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
         if (arr.length > 0) {
@@ -700,7 +702,7 @@
             })
           }
         }
-        this.$refs['ruleForm'].validate((valid) => {
+        this.$refs['ruleForm'].validate((valid, errors) => {
           if (valid) {
             that.$store.dispatch("user/refreshPage", false);
             saveData(that.ruleForm).then((res) => {
@@ -715,12 +717,16 @@
                 that.$message({
                   showClose: true,
                   message: res.message,
-                  type: "error",
-                });
+                  type: "error"
+                })
               }
             })
 
           } else {
+            const fieldErrors = errors['fdcq2.tdxz'];
+            if (fieldErrors.length > 0) {
+              this.isError = true
+            }
             that.$message({
               showClose: true,
               message: "请输入红框内的相关信息！",
@@ -812,4 +818,9 @@
   /deep/.el-form-item__label {
     padding-bottom: 0px;
   }
+
+  /* 当校验失败时的边框样式 */
+  /deep/.is-error .vue-treeselect div {
+    border-color: #f56c6c; /* 设置失败时的边框颜色为红色 */
+  }
 </style>

@@ -12,7 +12,7 @@ export function formValidate (djlx) {
             { required: true, message: '宗地面积：', trigger: 'blur' }
           ],
           'fdcq2.tdxz': [
-            { required: false, message: '土地性质：', trigger: 'blur' }
+            { required: true, message: '土地性质：', trigger: 'blur' }
           ],
           'fdcq2.fwxz': [
             { required: true, message: '房屋性质：', trigger: 'blur' }

@@ -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;
 }
 
 /**
@@ -28,12 +33,6 @@ export function formValidate (djlx) {
  * @author: renchao
  */
 export function fristValidate () {  
-  var formRules={
-    'diyaq.djyy': [
-        { required: true, message: '请输入登记原因', trigger: 'blur' }
-      ]
-  }
-  return formRules;
 }