Merge branch 'dev'

@@ -135,10 +135,22 @@ export function getZtQlxx (params) {
  * @author: renchao
  */
  export function getShList (data) {
-   console.log(data);
   return request({
     url: SERVER.SERVERAPI + '/rest/djbRepair/getShList?bsmRepair='+data.bsmRepair,
     method: 'post',
     data
   })
 }
+
+/**
+ * @description:初始化内容
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getQlxxByQlxxBsm (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbRepair/getQlxxByQlxxBsm',
+    method: 'get',
+    params
+  })
+}

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:08:30
+ * @LastEditTime: 2023-08-03 14:50:08
 -->
 <template>
   <transition name="msgbox-fade">
@@ -136,7 +136,6 @@
   }
 
   .ls-mask-window {
-    background: white;
     position: relative;
     left: 50%;
     top: 50%;
@@ -162,6 +161,7 @@
   }
 
   .mask-content {
+    background: #ffffff;
     padding: 20px;
     width: 100%;
     min-height: 30%;

@@ -71,7 +71,7 @@
           </el-col>
 
           <el-col :span="8" v-if="ssqlxxshow">
-            <el-form-item label="上手权利信息：">
+            <el-form-item label="上手权利信息："  prop="ssQlxx.bdcqzh" :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
                 :table-width="550"
@@ -433,7 +433,7 @@
 <script>
   import { mapGetters } from "vuex";
   import ywmix from "@/views/ywbl/mixin/index"
-  import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbRepair.js";
+  import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js";
   import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
   import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
   import tdytTable from "@/views/workflow/components/tdytTable";
@@ -510,6 +510,9 @@
         ableOperation: false,
         //传递参数\
         rules: {
+          ssQlxxrules: [
+            { required: true, message: "上手权利信息", trigger: "blur" },
+          ],
           ztQlxxrules: [
             { required: true, message: "抵押不动产信息", trigger: "blur" },
           ],
@@ -546,7 +549,65 @@
       ssQlxxchange (val) {
         this.ruleForm.ssQlxx = val;
         this.ruleForm.qlxx.ssywh = val.ywh;
+              this.ssQlxxchangediolog (val)
       },
+      // 弹框事件
+       ssQlxxchangediolog (val) {
+          console.log("确定了",this.ruleForm)
+        this.$confirm("是否将上手权利信息同步到表单", "提示", {
+            iconClass: "el-icon-question", //自定义图标样式
+            confirmButtonText: "确认", //确认按钮文字更换
+            cancelButtonText: "取消", //取消按钮文字更换
+            showClose: true, //是否显示右上角关闭按钮
+          type: "warning",
+        }).then(() => {
+        getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
+          if (res.code == 200) {
+            this.nowlist = res.result;
+            console.log("his.nowlist", this.nowlist);
+            console.log("this.ruleForm", this.ruleForm);
+            for (var key in this.ruleForm.dyiq) {
+              if (
+                this.ruleForm.dyiq[key] == "" ||
+                this.ruleForm.dyiq[key] == null
+              ) {
+                this.ruleForm.dyiq[key] = this.nowlist.dyiq[key];
+              }
+            }
+            for (var key in this.ruleForm.qlxx) {
+              if (
+                (this.ruleForm.qlxx[key] == null && key != "ywh") ||
+                this.ruleForm.qlxx[key] == null
+              ) {
+                console.log("this.ruleForm.qlxx[key]", key);
+                if (key != "ywh") {
+                  this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
+                }
+              }
+            }
+            if (!this.ruleForm.tdytqxList.length) {
+              this.ruleForm.tdytqxList = this.nowlist.tdytqxList;
+            }
+            if (!this.ruleForm.qlrData.length) {
+              this.ruleForm.qlrData = this.nowlist.qlrData;
+            }
+            if (!this.ruleForm.ywrData.length) {
+              this.ruleForm.ywrData = this.nowlist.ywrData;
+            }
+            console.log("this.ruleForm", this.ruleForm);
+            this.$message({
+              type: "success",
+              message: "同步成功!",
+            });
+          }
+        });
+      }).catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消同步",
+          });
+      });
+    },
       /**
        * @description: djlxchange
        * @param {*} val
@@ -576,24 +637,29 @@
             }
             this.$endLoading();
             this.isShow = true;
-          }
-        });
-        //获取主体信息
-        getSsQlxx({
-          bdcdyid: this.propsParam.bdcdyid,
-          qllx: this.propsParam.qllx,
-        }).then((res) => {
-          if (res.code == 200) {
-            this.ssQlxxList = res.result;
-          }
-        });
-        //获取上手信息
-        getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
-          if (res.code == 200) {
-            this.ztQlxxList = res.result;
-          }
-        });
-      },
+
+          //获取主体信息
+          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: 更新土地用途信息

@@ -97,6 +97,8 @@ export default {
     yjsqOptions: {
       handler(val) {
         console.log("val", val);
+        console.log("this.tableData[this.currentindex]",this.tableData[this.currentindex]);
+
         this.add(val);
       },
       deep: true,