Merge branch 'dev'

@@ -231,7 +231,6 @@ export default {
       this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
       this.key++;
     },
-    // 更新权利人信息
     /**
      * @description: 更新权利人信息
      * @param {*} val

@@ -481,33 +481,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"

@@ -375,33 +375,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"

@@ -259,7 +259,7 @@
                   v-model="ruleForm.ygdj.jzmj"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select
-                   v-model="ruleForm.ygdj.mjdw"
+                  v-model="ruleForm.ygdj.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%">
                   <el-option
@@ -376,33 +376,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -433,7 +406,7 @@
   </div>
 </template>
 <script>
-   import ywmix from "./dataprocessing";
+  import ywmix from "./dataprocessing";
   import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
   import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
   import tdytTable from "@/views/workflow/components/tdytTable";
@@ -443,7 +416,7 @@
     components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
     data () {
       return {
-              //传递参数\
+        //传递参数\
         rules: {
           ztQlxxrules: [
             { required: true, message: "抵押不动产信息", trigger: "blur" },

@@ -132,14 +132,11 @@
        * @author: renchao
        */
       getCurrentSelectProps (val) {
+        console.log(val, 'valvalvalval');
         this.currentSelectProps = val
-
         getZdInfo(val.bdcdyid).then(res => {
           this.bsmZd = res?.result[0]?.bsmZd
         })
-        // getZdInfo(val.bdcdyid).then(res => {
-        //   this.bsmZd = res?.result[0]?.bsmZd
-        // })
       },
       /**
        * @description: beforeunloadHandler

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-11 08:30:37
+ * @LastEditTime: 2023-08-14 12:53:15
 -->
 <template>
   <!-- 受理信息 -->
@@ -354,6 +354,7 @@
       upDateQlrxxList (val) {
         if (!_.isEqual(val, this.ruleForm.qlrList)) {
           this.ruleForm.qlrList = _.cloneDeep(val);
+          this.czrOptions = this.ruleForm.qlrList;
         }
       },
       // 更新义务人信息

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-14 10:26:42
+ * @LastEditTime: 2023-08-14 11:23:50
 -->
 <template>
   <div class="slxx">
@@ -117,31 +117,42 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <!-- <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 == '2'">
+            </el-col> -->
+            <el-col :span="5" v-show="ruleForm.sldy.gyfs != '0'">
               <el-form-item label="是否分别持证：">
-                <el-radio-group v-model="ruleForm.sldy.sqfbcz" :disabled="!ableOperation">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
+                <el-radio-group
+                  v-model="ruleForm.sldy.sqfbcz"
+                  :disabled="!ableOperation">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'">
+            <el-col
+              :span="5"
+              v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
               <el-form-item label="持证人：">
-                <el-select v-model="ruleForm.slsq.czr" placeholder="持证人" :disabled="!ableOperation">
-                  <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
+                <el-select
+                  v-model="ruleForm.czr"
+                  placeholder="持证人"
+                  :disabled="!ableOperation">
+                  <el-option
+                    v-for="item in czrOptions"
+                    :key="item.zjh"
+                    :label="item.sqrmc"
+                    :value="item.zjh">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+
           </el-row>
           <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
             :gyfs="ruleForm.slsq.gyfs" />
@@ -242,7 +253,6 @@
       }
     },
     methods: {
-      // 更新土地用途信息
       /**
        * @description: 更新土地用途信息
        * @param {*} val
@@ -250,10 +260,8 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -261,6 +269,8 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
+        this.key++;
       },
       /**
        * @description: showCZInfo

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:23:11
+ * @LastEditTime: 2023-08-14 10:56:46
 -->
 <template>
   <div class="slxx">
@@ -187,15 +187,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="6" v-show="ruleForm.sldy.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
@@ -334,7 +325,7 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
+
         this.key++;
       },
 
@@ -345,6 +336,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
       },
       /**
        * @description: 更新权利人信息

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:27:21
+ * @LastEditTime: 2023-08-14 12:48:45
 -->
 <template>
   <div class="slxx">
@@ -364,7 +364,6 @@
             }
           });
       },
-      // 更新土地用途信息
       /**
        * @description: 更新土地用途信息
        * @param {*} val
@@ -372,10 +371,8 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -383,6 +380,8 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
+        this.key++;
       },
       // 更新权利人信息
       /**

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-08-14 10:37:56
+ * @LastEditTime: 2023-08-14 10:54:26
 -->
 <template>
   <div class="slxx">
@@ -251,8 +251,6 @@
         this.splicingFdcq2.zts = fdcq2List.length;
 
       },
-
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -260,7 +258,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
-        
+        this.czrOptions = this.ruleForm.qlrList;
       },
       /**
        * @description: showCZInfo

@@ -270,7 +270,6 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
         this.key++;
       },
       /**
@@ -280,6 +279,8 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
+        this.key++
       },
       /**
        * @description: onSubmit

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-14 10:27:58
+ * @LastEditTime: 2023-08-14 12:49:48
 -->
 <template>
   <div class="slxx">
@@ -172,36 +172,29 @@
               </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="6" v-show="ruleForm.sldy.gyfs == '2'">
+          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
                 v-model="ruleForm.sldy.sqfbcz"
                 :disabled="!ableOperation">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs == '2'">
+          <el-col
+            :span="6"
+            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
             <el-form-item label="持证人：">
               <el-select
-                v-model="ruleForm.slsq.czr"
+                v-model="ruleForm.czr"
                 placeholder="持证人"
                 :disabled="!ableOperation">
                 <el-option
-                  v-for="item in czrOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                  v-for="(item,index) in czrOptions"
+                  :key="index"
+                  :label="item.sqrmc"
+                  :value="item.zjh">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -313,7 +306,6 @@
       };
     },
     methods: {
-      // 更新土地用途信息
       /**
        * @description: 更新土地用途信息
        * @param {*} val
@@ -321,8 +313,6 @@
        */
       upDateTdytxxList (val) {
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.czrOptions = this.ruleForm.qlrList;
-        this.key++;
       },
       // 更新权利人信息
       /**
@@ -332,6 +322,8 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
+        this.key++;
       },
       // 更新权利人信息
       /**

@@ -49,7 +49,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="宗地代码：">
-              <el-input disabled v-model="ruleForm.zdjbxx.zddm" ></el-input>
+              <el-input disabled v-model="ruleForm.zdjbxx.zddm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -322,6 +322,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val)
+        this.czrOptions = this.ruleForm.qlrList;
       },
       /**
        * @description: upDateJtcyList

@@ -323,6 +323,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val)
+        this.czrOptions = this.ruleForm.qlrList;
       },
       // 更新义务人信息
       /**

@@ -270,6 +270,7 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList
       },
       // 更新权利人信息
       /**

@@ -237,7 +237,6 @@
             }
           });
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -245,8 +244,8 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList;
       },
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val

@@ -290,7 +290,6 @@
       };
     },
     methods: {
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -298,10 +297,10 @@
        */
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
+        this.czrOptions = this.ruleForm.qlrList
       },
-      // 更新权利人信息
       /**
-       * @description: 更新权利人信息
+       * @description: 义务人信息
        * @param {*} val
        * @author: renchao
        */

@@ -280,6 +280,7 @@
       upDateQlrxxList (val) {
         if (!_.isEqual(val, this.ruleForm.qlrList)) {
           this.ruleForm.qlrList = _.cloneDeep(val);
+          this.czrOptions = this.ruleForm.qlrList;
         }
       },
       // 更新义务人信息

@@ -324,7 +324,6 @@
         });
       },
 
-      // 更新权利人信息
       /**
        * @description: 更新权利人信息
        * @param {*} val
@@ -333,6 +332,7 @@
       upDateQlrxxList (val) {
         if (!_.isEqual(val, this.ruleForm.qlrList)) {
           this.ruleForm.qlrList = _.cloneDeep(val);
+          this.czrOptions = this.ruleForm.qlrList
         }
       },
       // 更新义务人信息

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 09:54:32
+ * @LastEditTime: 2023-08-14 11:21:48
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -50,8 +50,8 @@ class data extends filter {
       },
       {
         prop: "qllxmc",
-        width: '100',
         showOverflowTooltip: true,
+        width: '100',
         label: "权利类型",
       },
       {