Merge branch 'dev'

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-14 11:23:50
+ * @LastEditTime: 2023-08-14 13:12:06
 -->
 <template>
   <div class="slxx">
@@ -117,14 +117,6 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="5">
-              <el-form-item label="发证方式：">
-                <el-radio-group v-model="ruleForm.slsq.fzfs" :disabled="!ableOperation">
-                  <el-radio label="1">小证</el-radio>
-                  <el-radio label="2">大证</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col> -->
             <el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'">
               <el-form-item label="是否分别持证：">
                 <el-radio-group
@@ -210,8 +202,12 @@
             ...res.result,
             ...res.result.qlxxdatas,
           }
-          //初始化发证方式，1：小证，2：大正
-          this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
+          this.ruleForm.qlrList.forEach((item, index) => {
+            if (item.sfczr == 1) {
+              this.$set(this.ruleForm, "czr", item.zjh)
+            }
+          })
+          this.czrOptions = this.ruleForm.qlrList;
         }
       });
     },

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:56:46
+ * @LastEditTime: 2023-08-14 12:57:21
 -->
 <template>
   <div class="slxx">
@@ -276,12 +276,13 @@
           })
           //初始化发证方式，1：小证，2：大正
           this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
+          this.czrOptions = this.ruleForm.qlrList;
         }
-      });
+      })
     },
     components: { qlrCommonTable, tdytTable },
     computed: {
-      ...mapGetters(["dictData", "flag"]),
+      ...mapGetters(["dictData", "flag"])
     },
     data () {
       return {
@@ -325,7 +326,6 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-
         this.key++;
       },
 

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 12:48:45
+ * @LastEditTime: 2023-08-14 13:12:36
 -->
 <template>
   <div class="slxx">
@@ -282,8 +282,7 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
-          //初始化发证方式，1：小证，2：大正
-          this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
+          this.czrOptions = this.ruleForm.qlrList;
         }
       });
     },

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:54:26
+ * @LastEditTime: 2023-08-14 12:58:35
 -->
 <template>
   <div class="slxx">
@@ -182,6 +182,7 @@
       BatchInit(formdata).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
+          this.czrOptions = this.ruleForm.qlrList;
           this.splicingFdcq2Info();
         }
       })

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 15:45:47
+ * @LastEditTime: 2023-08-14 13:03:32
 -->
 <template>
   <!-- 受理信息 -->
@@ -163,7 +163,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <qlrCommonTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" />
+        <qlrCommonTable :tableData="ruleForm.qlrList" :gyfs="ruleForm.gyfs" :disabled="!ableOperation" />
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>
@@ -206,6 +206,7 @@
             ...res.result.qlxxdatas,
             ...res.result.jsydsyqdatas,
           };
+          this.czrOptions = this.ruleForm.qlrList;
         }
       });
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:27:43
+ * @LastEditTime: 2023-08-14 13:04:38
 -->
 <template>
   <!-- 受理信息 -->
@@ -270,7 +270,6 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       /**

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:28:15
+ * @LastEditTime: 2023-08-14 12:54:53
 -->
 <template>
   <!-- 受理信息 -->
@@ -237,6 +237,7 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
         }
         this.$endLoading();
       });

@@ -263,12 +263,14 @@
             ...res.result,
             ...res.result.qlxxdatas,
           };
-          //初始化发证方式，1：小证，2：大正
-          this.ruleForm.slsq.fzfs == null
-            ? (this.ruleForm.slsq.fzfs = "1")
-            : this.ruleForm.slsq.fzfs;
+          this.ruleForm.qlrList.forEach((item, index) => {
+            if (item.sfczr == 1) {
+              this.$set(this.ruleForm, "czr", item.zjh)
             }
-      });
+          })
+          this.czrOptions = this.ruleForm.qlrList;
+        }
+      })
     },
     components: { qlrCommonTable, tdytTable },
     computed: {
@@ -314,7 +316,6 @@
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -325,9 +326,8 @@
         this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
-      // 更新权利人信息
       /**
-       * @description: 更新权利人信息
+       * @description: 更新业务人信息
        * @param {*} val
        * @author: renchao
        */

@@ -263,12 +263,8 @@
             this.ruleForm.czr = item.zjh
           }
         })
+        this.czrOptions = this.ruleForm.qlrList;
         this.$endLoading();
-        if (res.code === 200) {
-        }
-        else {
-          this.$alert(res.message, '提示');
-        }
       })
     },
     components: { qlrCommonTable, JtcyTable },

@@ -268,12 +268,9 @@
             this.ruleForm.czr = item.zjh
           }
         })
+        this.czrOptions = this.ruleForm.qlrList;
         this.$endLoading();
-        if (res.code === 200) {
-        }
-        else {
-          this.$alert(res.message, '提示');
-        }
+
       })
     },
     components: { qlrCommonTable, JtcyTable },
@@ -315,7 +312,6 @@
           }
         });
       },
-      //权利人更新
       /**
        * @description: 权利人更新
        * @param {*} val
@@ -325,7 +321,6 @@
         this.ruleForm.qlrList = _.cloneDeep(val)
         this.czrOptions = this.ruleForm.qlrList;
       },
-      // 更新义务人信息
       /**
        * @description: 更新义务人信息
        * @param {*} val

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:47:29
+ * @LastEditTime: 2023-08-14 13:10:18
 -->
 <template>
   <!-- 受理信息 -->
@@ -363,9 +363,9 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
           that.$endLoading();
           that.isShow = true;
-          this.czrOptions = this.ruleForm.qlrList;
         });
       });
     },
@@ -408,7 +408,6 @@
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
         this.key++;
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val

@@ -234,6 +234,7 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
           this.$endLoading();
         }
       })
@@ -262,7 +263,6 @@
       };
     },
     methods: {
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -272,9 +272,8 @@
         this.ruleForm.qlrList = _.cloneDeep(val);
         this.czrOptions = this.ruleForm.qlrList
       },
-      // 更新权利人信息
       /**
-       * @description: 更新权利人信息
+       * @description: 更新业务人信息
        * @param {*} val
        * @author: renchao
        */

@@ -203,6 +203,7 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
         }
       });
     },
@@ -247,7 +248,7 @@
         this.czrOptions = this.ruleForm.qlrList;
       },
       /**
-       * @description: 更新权利人信息
+       * @description: 更新业务人信息
        * @param {*} val
        * @author: renchao
        */

@@ -265,6 +265,7 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
           setTimeout(() => {
             that.loading = false
           }, 300)

@@ -222,9 +222,8 @@
       bacthInit(formdata).then((res) => {
         this.$endLoading();
         if (res.code === 200 && res.result) {
-          this.$nextTick(() => {
           this.ruleForm = res.result;
-          })
+          this.czrOptions = this.ruleForm.qlrList;
         } else {
           this.$message.error(res.message);
         }

@@ -279,8 +279,8 @@
               this.$set(this.ruleForm, "czr", item.zjh)
             }
           })
+          this.czrOptions = this.ruleForm.qlrList;
           this.$endLoading();
-          //this.ruleForm.diyaq.sfczjzhxz = "0";
         }
       })
     },