Merge branch 'dev'

@@ -111,6 +111,18 @@ export function selectZdjbxx (data) {
   })
   })
 }
 }
 
 
+/**
+ * @description: 业务办理-选择单元-查询宗地基本信息
+ * @param {*} data
+ * @author: renchao
+ */
+export function selectHQjdc (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHQjdc',
+    method: 'post',
+    data
+  })
+}
 /*
 /*
 业务办理-选择单元-查询宗地基本信息
 业务办理-选择单元-查询宗地基本信息
 */
 */

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-02-02 16:52:02
+ * @LastEditTime: 2024-03-07 09:52:35
 -->
 -->
 <!-- 批量删除弹框 -->
 <!-- 批量删除弹框 -->
 <template>
 <template>
@@ -65,7 +65,6 @@
       }
       }
     },
     },
     methods: {
     methods: {
-      // 批量删除确定按钮
       /**
       /**
        * @description: 批量删除确定按钮
        * @description: 批量删除确定按钮
        * @author: renchao
        * @author: renchao
@@ -74,6 +73,7 @@
         var formdata = new FormData();
         var formdata = new FormData();
         formdata.append("bsmSldyList", this.selectBdcdy);
         formdata.append("bsmSldyList", this.selectBdcdy);
         formdata.append("bsmSlsq", this.formData.bsmSlsq);
         formdata.append("bsmSlsq", this.formData.bsmSlsq);
+        store.dispatch('user/refreshPage', false);
         deleteSlbdcdy(formdata).then(res => {
         deleteSlbdcdy(formdata).then(res => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.$popupCacel();
             this.$popupCacel();

 <!--
 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-02-01 16:57:55
+ * @LastEditTime: 2024-03-07 09:54:56
 -->
 -->
 <template>
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -84,7 +84,7 @@
       isRefresh: {
       isRefresh: {
         handler (newVal, oldVal) {
         handler (newVal, oldVal) {
           if (newVal) {
           if (newVal) {
-            this.loadBdcdylist(true)
+            this.loadBdcdylist()
           }
           }
         },
         },
         immediate: true
         immediate: true

@@ -384,6 +384,19 @@
           @upDateQlrxxList="upDateQlrxxList"
           @upDateQlrxxList="upDateQlrxxList"
           :disabled="viewEdit"
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
           :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="slxx_title title-block">
           登记原因
           登记原因
           <div class="triangle"></div>
           <div class="triangle"></div>
@@ -414,6 +427,7 @@
 <script>
 <script>
   import ywmix from "@/views/ywbl/mixin/index";
   import ywmix from "@/views/ywbl/mixin/index";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
+  import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
   import tdytTable from "@/views/workflow/components/tdytTable";
   import tdytTable from "@/views/workflow/components/tdytTable";
   import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
   import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
   import { mapGetters } from "vuex";
   import { mapGetters } from "vuex";
@@ -460,7 +474,7 @@
         this.isSave = false
         this.isSave = false
       })
       })
     },
     },
-    components: { qlrCommonTable, tdytTable },
+    components: { qlrCommonTable, tdytTable, ywrCommonTable},
     computed: {
     computed: {
       ...mapGetters(["dictData", "flag"]),
       ...mapGetters(["dictData", "flag"]),
     },
     },

@@ -71,7 +71,7 @@
   import { ywPopupDialog } from "@/utils/popup.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectH.js";
   import { datas, sendThis } from "../javascript/selectH.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  // import { selectHQjdc } from "@/api/ywsq.js";
+  import { selectHQjdc } from "@/api/ywsq.js";
   import { startBusinessFlow, againAddSldy } from "@/api/workFlow.js";
   import { startBusinessFlow, againAddSldy } from "@/api/workFlow.js";
   export default {
   export default {
     mixins: [ywsqTable, jump],
     mixins: [ywsqTable, jump],
@@ -123,16 +123,16 @@
        * @author: renchao
        * @author: renchao
        */
        */
       queryClick () {
       queryClick () {
-        // this.$startLoading();
-        // this.queryForm.sqywbm = this.sqywInfo.djywbm;
-        // selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
-        //   this.$endLoading();
-        //   if (res.code === 200) {
-        //     let { total, records } = res.result;
-        //     this.tableData.total = total;
-        //     this.tableData.data = records;
-        //   }
-        // });
+        this.$startLoading();
+        this.queryForm.sqywbm = this.sqywInfo.djywbm;
+        selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
+          this.$endLoading();
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableData.total = total;
+            this.tableData.data = records;
+          }
+        });
       },
       },
       /**
       /**
        * @description: submitForm
        * @description: submitForm