achao hace 2 años
padre
commit
07c51fa2f1
Se han modificado 1 ficheros con 8 adiciones y 6 borrados
  1. 8 6
      pages/fuelfilling/the_fuel_filling.vue

+ 8 - 6
pages/fuelfilling/the_fuel_filling.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<mescroll-body ref="mescrollRef" :down="downOption" @down="downCallback" @up="upCallback" @init="mescrollInit">
-			<view v-for="(item,index) in fuelFilling" :key="index" @click.stop="getInfo(item)">
+			<view v-for="(item,index) in fuelFilling" :key="index">
 				<view class="good-list">
 					<view style="padding: 0 35rpx 20rpx 35rpx;position: relative;">
 						<view class="flex top">
@@ -32,7 +32,7 @@
 							<view class="row">
 								油耗
 								<view class="text">
-									{{item.fillingDetailInfo.oilConsumption}}L
+									{{item.fillingDetailInfo?item.fillingDetailInfo.oilConsumption:''}}L
 								</view>
 							</view>
 							<!-- 			<view class="row">
@@ -44,22 +44,24 @@
 							<view class="row">
 								申请费用
 								<view class="text">
-									{{item.fillingDetailInfo.currentConsumption}}元
+									{{item.fillingDetailInfo?item.fillingDetailInfo.currentConsumption:''}}元
 								</view>
 							</view>
 						</view>
 						<view class="see">
 							<view class="btn" @click.stop="seeInfo(item.id)"
-								v-if="item.approveStatus=='待加油审批'||item.status=='已通过'">
+								v-if="item.approveStatus=='待加油审批'||item.status=='已通过'||item.status=='已驳回'">
 								查看
 							</view>
 							<view class="btn" @click.stop="backInfo(item)" v-if="item.approveStatus=='待加油审批'">
 								撤回
 							</view>
-							<view class="btn" @click.stop="editInfo(item.id)" v-if="item.approveStatus=='发起人撤回'">
+							<view class="btn" @click.stop="editInfo(item.id)"
+								v-if="item.approveStatus=='发起人撤回'||item.status=='已驳回'">
 								编辑
 							</view>
-							<view class="btn" @click.stop="delInfo(item.id)" v-if="item.approveStatus=='发起人撤回'">
+							<view class="btn" @click.stop="delInfo(item.id)"
+								v-if="item.approveStatus=='发起人撤回'||item.status=='已驳回'">
 								删除
 							</view>
 						</view>