Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-20 17:31:14
+ * @LastEditTime: 2024-01-18 11:23:08
 -->
 <template>
   <div class="tableBox">
@@ -74,7 +74,7 @@
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
                 @click="handleSelectYwh(row, row[item.prop])"
                 type="primary">{{ row[item.prop] }}</el-link>
-              <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span>
+              <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop],row) }}</span>
             </p>
 
             <el-tooltip
@@ -139,7 +139,7 @@
       };
     },
     methods: {
-      getLable (prop, label) {
+      getLable (prop, label, row) {
         const ztObj = {
           0: '否',
           1: '是'
@@ -158,9 +158,18 @@
           },
           default: (label) => label
         };
-
         const strategy = strategies[prop] || strategies.default;
-        return strategy(label);
+        if (prop == 'bdbzzqse') {
+          let title = strategy(label)
+          if (row.jedw == 2) {
+            title = title + '万元'
+          } else if (row.jedw == 1) {
+            title = title + '元'
+          }
+          return title
+        } else {
+          return strategy(label);
+        }
       },
       openPrint () {
         this.render = true;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 11:04:37
+ * @LastEditTime: 2024-01-18 11:25:39
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -14,7 +14,7 @@
       </el-tabs>
     </div>
     <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
-    <div style="max-height:89vh;">
+    <div style="max-height:89vh;overflow-y:auto">
       <div v-show="this.bdcqz.bdcqzlx==1">
         <el-tabs v-model="activeTitle">
           <el-tab-pane label="第一页" name="title1"></el-tab-pane>