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

@@ -2,7 +2,8 @@
  * @Description:
  * @Autor: renchao
  :show-message="false"
- * @LastEditTime: 2023-08-07 17:31:09
+ * @LastEditTime: 2023-08-07 17:32:31
+ 610102123666GS00003W00000000
 -->
 <template>
   <!-- 受理信息 -->

@@ -746,11 +746,6 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             this.$endLoading();
             this.isShow = true;
             let djlx = this.ruleForm.qlxx.djlx;

@@ -629,11 +629,6 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;
@@ -727,7 +722,7 @@
                 return false;
               }
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",

@@ -506,7 +506,6 @@
           },
         ],
         key: 0,
-        tdxz: null,
         isShow: false,
         disabled: true,
         czrOptions: [],
@@ -630,22 +629,12 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;
             }
             this.ruleForm.fdcq2.jedw = "1";
             this.$endLoading();
-            if (this.ruleForm.tdytqxList.length > 0) {
-              this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
-            } else {
-              this.tdxz = null;
-            }
             this.isShow = true;
             //获取主体信息
             getSsQlxx({
@@ -706,7 +695,7 @@
               });
               return false;
             }
-            if (this.ruleForm.tdytqxList.length == 0 && !this.tdxz) {
+            if (this.ruleForm.tdytqxList.length == 0) {
               this.$message({
                 showClose: true,
                 message: "请补充土地用途信息",
@@ -730,14 +719,6 @@
                 });
                 return false;
               }
-              if (this.ruleForm.tdytqxList.length == 0 && !this.tdxz) {
-                this.$message({
-                  showClose: true,
-                  message: "请补充土地用途信息",
-                  type: "error",
-                });
-                return false;
-              }
             }
             if (this.ruleForm.sldy.gyfs == "0") {
               if (this.ruleForm.qlrData.length > 1) {

@@ -368,7 +368,6 @@
             dname: "历史",
           },
         ],
-        tdxz: null,
         isShow: false,
         disabled: true,
         czrOptions: [],
@@ -494,21 +493,12 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;
             }
             this.$endLoading();
-            if (this.ruleForm.tdytqxList.length > 0) {
-              this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
-            } else {
-              this.tdxz = null;
-            }
+
             this.isShow = true;
             //获取主体信息
             getSsQlxx({

@@ -616,11 +616,6 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;

@@ -690,11 +690,6 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;

@@ -638,11 +638,6 @@
         init(this.propsParam).then((res) => {
           if (res.code == 200) {
             this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
             let djlx = this.ruleForm.qlxx.djlx;
             if (djlx == null || djlx == 100) {
               this.ssqlxxshow = false;
@@ -727,7 +722,7 @@
                 return false;
               }
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-07 17:31:32
+ * @LastEditTime: 2023-08-07 18:12:57
 -->
 <template>
   <!-- 受理信息 -->
@@ -596,57 +596,49 @@ export default {
             message: "已取消同步",
           });
         });
-    },
-    /**
-     * @description: djlxchange
-     * @param {*} val
-     * @author: renchao
-     */
-    djlxchange(val) {
-      if (val == null || val == 100) {
-        this.ssqlxxshow = false;
-      } else {
-        this.ssqlxxshow = true;
-      }
-    },
-    /**
-     * @description: loadData
-     * @author: renchao
-     */
-    loadData() {
-      this.$startLoading();
-      this.propsParam.isEdit = this.$parent.isEdit;
-      init(this.propsParam).then((res) => {
-        if (res.code == 200) {
-          this.ruleForm = res.result;
-          let djlx = this.ruleForm.qlxx.djlx;
-          if (djlx == null || djlx == 100) {
-            this.ssqlxxshow = false;
-          }
-          this.$endLoading();
-          this.isShow = true;
-          //获取主体信息
-          getSsQlxx({
-            bdcdyid: this.propsParam.bdcdyid,
-            qllx: this.propsParam.qllx,
-            bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.ssQlxxList = res.result;
-            }
-          });
-          //获取上手信息
-          getZtQlxx({
-            bdcdyid: this.propsParam.bdcdyid,
-            bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.ztQlxxList = res.result;
-            }
-          });
+      },
+      /**
+       * @description: djlxchange
+       * @param {*} val
+       * @author: renchao
+       */
+      djlxchange (val) {
+        if (val == null || val == 100) {
+          this.ssqlxxshow = false;
+        } else {
+          this.ssqlxxshow = true;
         }
-      });
-    },
+      },
+      /**
+       * @description: loadData
+       * @author: renchao
+       */
+        loadData () {
+        this.$startLoading();
+        this.propsParam.isEdit = this.$parent.isEdit;
+        init(this.propsParam).then((res) => {
+          if (res.code == 200) {
+            this.ruleForm = res.result;
+            let djlx = this.ruleForm.qlxx.djlx;
+            if (djlx == null || djlx == 100) {
+              this.ssqlxxshow = false;
+            }
+
+            this.$endLoading();
+            this.isShow = true;
+            //获取主体信息
+            getSsQlxx({
+              bdcdyid: this.propsParam.bdcdyid,
+              qllx: this.propsParam.qllx,
+              bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.ssQlxxList = res.result;
+              }
+            });
+          }
+        });
+      },
     // 更新土地用途信息
     /**
      * @description: 更新土地用途信息

@@ -223,6 +223,21 @@
           }
         });
       },
+            //选项卡切换事件
+    /**
+     * @description: 右侧表单选项卡事件
+     * @param {*} handleClick
+     * @author: renchao
+     */
+       handleClick(a) {
+      let p = Object.keys(this.tabList[0]).filter(
+        (item) => item == "ableOperation"
+      );
+      if (p) {
+        this.ableOperation = this.tabList[a.index].ableOperation;
+      }
+
+    },
       //右侧表单选项卡事件
       /**
        * @description: 右侧表单选项卡事件