Merge branch 'dev'

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-14 16:17:11
+ * @LastEditTime: 2024-01-17 10:56:52
 -->
 <template>
   <!-- 受理信息 -->
@@ -226,8 +226,8 @@
                 placeholder="持证人"
                 :disabled="!viewEdit">
                 <el-option
-                  v-for="(item,index) in czrOptions"
-                  :key="index"
+                  v-for="item in czrOptions"
+                  :key="item.id"
                   :label="item.sqrmc"
                   :value="item.id">
                 </el-option>
@@ -240,6 +240,20 @@
           :disabled="viewEdit"
           @upDateQlrxxList="upDateQlrxxList"
           :gyfs="ruleForm.sldy.gyfs" />
+
+        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0 && ruleForm.qlxx.djlx==200">
+          <div class="slxx_title title-block">
+            义务人信息
+            <div class="triangle"></div>
+          </div>
+          <ywrCommonTable
+            v-if="ruleForm.ywrList"
+            :disabled="viewEdit"
+            :tableData="ruleForm.ywrList"
+            :key="key"
+            @upDateQlrxxList="upDateYwrxxList" />
+        </div>
+
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>
@@ -271,6 +285,7 @@
   import { mapGetters } from "vuex";
   import ywmix from "@/views/ywbl/mixin/index";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+  import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
   import tdytTable from "@/views/workflow/components/tdytTable";
   import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
   export default {
@@ -311,12 +326,13 @@
         this.isSave = false
       })
     },
-    components: { qlrCommonTable, tdytTable },
+    components: { qlrCommonTable, tdytTable, ywrCommonTable },
     computed: {
       ...mapGetters(["dictData", "flag"]),
     },
     data () {
       return {
+        key: 0,
         isSave: true,
         loading: false,
         // 键名转换，方法默认是label和children进行树状渲染