ce7b497e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 275b77af b684b3be
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-20 17:31:14 4 * @LastEditTime: 2024-01-18 11:23:08
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 <el-link v-if="['zxywh', 'ywh'].includes(item.prop)" 74 <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
75 @click="handleSelectYwh(row, row[item.prop])" 75 @click="handleSelectYwh(row, row[item.prop])"
76 type="primary">{{ row[item.prop] }}</el-link> 76 type="primary">{{ row[item.prop] }}</el-link>
77 <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span> 77 <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop],row) }}</span>
78 </p> 78 </p>
79 79
80 <el-tooltip 80 <el-tooltip
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 }; 139 };
140 }, 140 },
141 methods: { 141 methods: {
142 getLable (prop, label) { 142 getLable (prop, label, row) {
143 const ztObj = { 143 const ztObj = {
144 0: '否', 144 0: '否',
145 1: '是' 145 1: '是'
...@@ -158,9 +158,18 @@ ...@@ -158,9 +158,18 @@
158 }, 158 },
159 default: (label) => label 159 default: (label) => label
160 }; 160 };
161
162 const strategy = strategies[prop] || strategies.default; 161 const strategy = strategies[prop] || strategies.default;
162 if (prop == 'bdbzzqse') {
163 let title = strategy(label)
164 if (row.jedw == 2) {
165 title = title + '万元'
166 } else if (row.jedw == 1) {
167 title = title + '元'
168 }
169 return title
170 } else {
163 return strategy(label); 171 return strategy(label);
172 }
164 }, 173 },
165 openPrint () { 174 openPrint () {
166 this.render = true; 175 this.render = true;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-18 11:04:37 4 * @LastEditTime: 2024-01-18 11:25:39
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </el-tabs> 14 </el-tabs>
15 </div> 15 </div>
16 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> 16 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
17 <div style="max-height:89vh;"> 17 <div style="max-height:89vh;overflow-y:auto">
18 <div v-show="this.bdcqz.bdcqzlx==1"> 18 <div v-show="this.bdcqz.bdcqzlx==1">
19 <el-tabs v-model="activeTitle"> 19 <el-tabs v-model="activeTitle">
20 <el-tab-pane label="第一页" name="title1"></el-tab-pane> 20 <el-tab-pane label="第一页" name="title1"></el-tab-pane>
......