Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2024-02-01 16:58:20
+ * @LastEditTime: 2024-03-08 12:52:22
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -96,7 +96,15 @@
     watch: {
       isRefresh: {
         handler (newVal, oldVal) {
-          if (newVal) this.loadBdcdylist(true)
+          let that = this
+          if (newVal) {
+            if (that.activeIndex >= 0) {
+              that.unitClick(sessionStorage.getItem('keyPath') - 0)
+            }
+            if (that.activeHIndex >= 0) {
+              that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0)
+            }
+          }
         },
         immediate: true
       },
@@ -139,9 +147,10 @@
               this.judgeBatchShow();
               if (!status) {
                 if (sessionStorage.getItem('keyPath')) {
-                  if (this.aroundShow) {
+                  if (that.activeIndex >= 0) {
                     that.unitClick(sessionStorage.getItem('keyPath') - 0)
-                  } else {
+                  }
+                  if (that.activeHIndex >= 0) {
                     that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0)
                   }
                 } else {
@@ -178,9 +187,10 @@
               this.judgeBatchShow();
               if (!status) {
                 if (sessionStorage.getItem('keyPath')) {
-                  if (this.aroundShow) {
+                  if (that.activeIndex >= 0) {
                     that.unitClick(sessionStorage.getItem('keyPath') - 0)
-                  } else {
+                  }
+                  if (that.activeHIndex >= 0) {
                     that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0)
                   }
                 } else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 14:13:02
+ * @LastEditTime: 2024-03-08 14:02:15
 -->
 <template>
   <div>
@@ -172,18 +172,30 @@
           </div>
         );
       },
-      // 修改事件
       /**
        * @description: 修改事件
        * @author: renchao
        */
+      getTreeName (list, dcode) {
+        let _this = this
+        for (let i = 0; i < list.length; i++) {
+          let a = list[i]
+          if (a.dcode === dcode) {
+            return a.dname
+          } else {
+            if (a.children && a.children.length > 0) {
+              let res = _this.getTreeName(a.children, dcode)
+              if (res) {
+                return res
+              }
+            }
+          }
+        }
+      },
       addrow (a) {
-        // this.tableDataList = this.tableDataList.map((item) => {
-        //   return {
-        //     ...item,
-        //     yt: a.yt,
-        //   };
-        // });
+        this.tableDataList.forEach(item => {
+          item.ytmc = this.getTreeName(this.dictData['tdyt'], item.yt)
+        })
         this.$emit("upDateTdytxxList", this.tableDataList);
       },
       /**

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-31 10:14:22
+ * @LastEditTime: 2024-03-08 14:03:28
 -->
 <template>
   <!-- 受理信息 -->

@@ -256,7 +256,7 @@ export default {
                       let key = index + 1
                       this.$set(infoRes.result, "file" + key, it.sjmc)
                       this.$set(infoRes.result, "file" + key + 'ys', it.ys)
-                      // this.$set(infoRes.result, "file" + key + 'xs', it.)
+                      this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件")
                     })
                   }
                   infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]

@@ -109,7 +109,7 @@
           label="权利性质">
         </el-table-column>
         <el-table-column
-          property="syqmj"
+          property="qlmjmc"
           label="面积">
         </el-table-column>
         <el-table-column

@@ -42,7 +42,7 @@
         </ul>
       </div>
       <!-- 登记簿补录 -->
-      <div v-if="selectType == 'amend'" class="right-situation el-card">
+      <div v-show="selectType == 'amend'" class="right-situation el-card">
         <div class="right-title">登记簿补录</div>
         <ul>
           <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
@@ -55,8 +55,8 @@
         </ul>
       </div>
       <!-- 业务申请 -->
-      <template v-if="selectType == 'apply'">
-        <div class="right-type el-card box-card is-always-shadow">
+      <template>
+        <div v-show="selectType == 'apply'" class="right-type el-card box-card is-always-shadow">
           <div class="right-title">登记类型</div>
           <ul class="type-content">
             <li :class="item.selected ? 'cactive' : ''" @dblclick="item.sffqlc == 1 && dblclick(djlxList, index, item)"
@@ -71,7 +71,7 @@
             </li>
           </ul>
         </div>
-        <div class="right-situation el-card box-card is-always-shadow">
+        <div v-show="selectType == 'apply'" class="right-situation el-card box-card is-always-shadow">
           <div class="right-title">登记情形</div>
           <ul>
             <li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"

@@ -71,7 +71,7 @@ module.exports = {
             filename: `static/js/[name].[hash].js`,
             chunkFilename: `static/js/[name].[hash].js`,
         },
-        devtool: process.env.NODE_ENV === 'development' ? '#eval-source-map' : false
+        devtool: "source map"
     },
     // chainWebpack通过链式编程的形式，来修改默认的webpack配置
     chainWebpack (config) {