Merge branch 'dev'

 <!--
 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 10:30:24
+ * @LastEditTime: 2023-10-10 09:00:12
 -->
 -->
 <template>
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -100,7 +100,7 @@
     },
     },
     mounted () {
     mounted () {
       this.delel = this.$parent.isEdit
       this.delel = this.$parent.isEdit
-      this.loadBdcdylist();
+      this.djbClick();
     },
     },
     beforeDestroy () {
     beforeDestroy () {
       sessionStorage.removeItem('keyPath')
       sessionStorage.removeItem('keyPath')

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 14:57:51
+ * @LastEditTime: 2023-10-10 09:07:29
 -->
 -->
 <template>
 <template>
   <div class="container">
   <div class="container">
@@ -111,7 +111,7 @@
         // 首次拿到的业务信息
         // 首次拿到的业务信息
         oneSelectProps: {},
         oneSelectProps: {},
         //材料信息选择卡索引
         //材料信息选择卡索引
-        oneget: true,
+        oneget: false,
         //页面监听时间
         //页面监听时间
         _beforeUnload_time: "",
         _beforeUnload_time: "",
         treedata: {},
         treedata: {},
@@ -147,7 +147,7 @@
                 this.tabList.forEach(function (item, index) {
                 this.tabList.forEach(function (item, index) {
                   if (item.value == "clxx") {
                   if (item.value == "clxx") {
                     that.clxxIndex = index;
                     that.clxxIndex = index;
-                    that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
+                    that.clxxForm = getForm(item.value);
                     that.clxxTab = item;
                     that.clxxTab = item;
                   }
                   }
                 })
                 })

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 17:06:44
+ * @LastEditTime: 2023-10-09 11:02:50
 -->
 -->
 <template>
 <template>
   <div class="djxxTable">
   <div class="djxxTable">
@@ -172,11 +172,10 @@
         })
         })
           .then(() => {
           .then(() => {
             this.$parent.addRepairRecord(row, del);
             this.$parent.addRepairRecord(row, del);
-
-            this.$message({
-              type: "success",
-              message: "补录成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!",
+            // });
           })
           })
           .catch(() => {
           .catch(() => {
             this.$message({
             this.$message({

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:42
+ * @LastEditTime: 2023-10-10 09:11:01
 -->
 -->
 <template>
 <template>
   <div class="djbfm">
   <div class="djbfm">
@@ -70,7 +70,7 @@
 <style lang="scss" scoped>
 <style lang="scss" scoped>
   .djbfm {
   .djbfm {
     width: 100%;
     width: 100%;
-    height: 100%;
+    height: 80%;
     background: #fff;
     background: #fff;
     line-height: 45px;
     line-height: 45px;
     text-align: center;
     text-align: center;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:42
+ * @LastEditTime: 2023-10-10 09:11:05
 -->
 -->
 <template>
 <template>
   <div class="djbfm">
   <div class="djbfm">
@@ -75,10 +75,9 @@
 <style lang="scss" scoped>
 <style lang="scss" scoped>
   .djbfm {
   .djbfm {
     width: 100%;
     width: 100%;
-    height: 100%;
+    height: 80%;
     position: relative;
     position: relative;
     .print {
     .print {
-      // background-color: #0079fe;
       z-index: 10;
       z-index: 10;
       position: absolute;
       position: absolute;
       left: 11px;
       left: 11px;

@@ -297,6 +297,7 @@
           this.previewImg.imgList = res.result ? res.result : [];
           this.previewImg.imgList = res.result ? res.result : [];
         })
         })
         this.previewImg.bsmSj = item?.bsmSj;
         this.previewImg.bsmSj = item?.bsmSj;
+        this.$refs.imageRef.initialIndex = 0
       },
       },
       /**
       /**
        * @description: 小图片点击
        * @description: 小图片点击

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:44:11
+ * @LastEditTime: 2023-10-10 08:55:39
  */
  */
 import Router from '@/router'
 import Router from '@/router'
 export default {
 export default {
@@ -19,7 +19,7 @@ export default {
     jump (data, type) {
     jump (data, type) {
       const { href } = Router.resolve(
       const { href } = Router.resolve(
         "/djbworkFrame?bsmSlsq=" + data.bsmSlsq +
         "/djbworkFrame?bsmSlsq=" + data.bsmSlsq +
-        "&bestepid=" + data.bestepid + '&sqywbm=' + type
+        "&bestepid=" + data.bestepid + "&zbhj=受理"
       );
       );
       window.open(href, "_blank");
       window.open(href, "_blank");
     },
     },

@@ -166,7 +166,7 @@
               type: 'success'
               type: 'success'
             })
             })
             if (!this.isJump) {
             if (!this.isJump) {
-              this.jump(res.result, this.djywbm)
+              this.jump(res.result)
             } else {
             } else {
               store.dispatch('user/refreshPage', true);
               store.dispatch('user/refreshPage', true);
             }
             }

@@ -100,20 +100,34 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "qlrmc",
         label: "权利人",
         label: "权利人",
+        minWidth: '100',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       },
       {
       {
-        prop: "ywrmc",
         label: "义务人",
         label: "义务人",
+        minWidth: '100',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.ywrmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.ywrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       },
       {
       {
-        prop: "mj",
+        prop: "qlmjmc",
         label: "面积",
         label: "面积",
-        width: '80'
+        width: '100'
       },
       },
       {
       {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "用途",
         label: "用途",
         minWidth: '130'
         minWidth: '130'
       },
       },