Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/wallet/wallet-recharge-apply/index.vue

@@ -40,7 +40,6 @@
 					>
 						删除
 					</el-button>
-
 					<div class="flex justify-between items-center">
 						<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
 							<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
@@ -175,7 +174,16 @@
 						>
 							删除
 						</el-button>
-						<el-button icon="printer" text type="primary" @click="previewInvoice(row)">打印发票</el-button>
+						<el-button
+							v-auth="'wallet_walletRechargeApply_print'"
+							v-if="['1'].includes(row.processStatus)"
+							icon="printer"
+							text
+							type="primary"
+							@click="previewInvoice(row)"
+						>
+							打印发票
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>

src/views/wallet/wallet-recharge-apply/preview-excel.vue

@@ -9,7 +9,7 @@
 			</el-row>
 			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle"
 				show-summary :summary-method="getSummaries">
-				<el-table-column type="index" label="#" align="center" />
+				<el-table-column type="index" label="#" width="250" align="center" />
 				<el-table-column prop="username" label="用户" align="center" />
 				<el-table-column prop="userMobile" label="手机号" align="center" />
 				<el-table-column prop="bizType" label="充值类型" align="center">
@@ -24,39 +24,6 @@
 						<div v-if="row.afterBalance < 0" class="color-danger">(余额不足记账扣款)</div>
 					</template>
 				</el-table-column>
-				<!-- <slot>
-					<el-table-column v-if="data.tableList && data.tableList.length" :prop="v"
-						v-for="(v, i) in data.tableList" :key="i" align="center" min-width="250">
-						<template #header>
-							<div>
-								{{ data.tableListStr[i] }}
-							</div>
-						</template>
-						<template #default="{ row }">
-							<div class="change">
-								<div v-if="row[`${v}_price`] >= 0" class="change_price">{{
-									displayPrice(row[`${v}_price`]) }}</div>
-								<div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div class="change_text">
-									<div v-if="row[`${v}_transaction_price`]">
-										<span>对比上月</span>
-										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']"
-											style="margin-left: 5px">
-											{{ displayPrice(row[`${v}_transaction_price`]) }}
-										</span>
-									</div>
-									<div v-if="row[`${v}_transaction_percent`]">
-										<span>对比上月</span>
-										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']"
-											style="margin-left: 5px">
-											{{ row[`${v}_transaction_percent`] }}%
-										</span>
-									</div>
-								</div>
-							</div>
-						</template>
-					</el-table-column>
-				</slot> -->
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
 				v-bind="state.pagination" />