1

pages/subPack/offerSheetDetail.vue

@@ -14,14 +14,14 @@
 					<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
 					<view class="stateBox" v-if="orderData.billsheet.SheetType == 1">
 						<!-- 0待施工（已保存）1施工中（已派工）2已完工 3已质检 4 已作废 -->
-						<view class="SheetState" v-if="orderData.billsheet.SheetState == 0">待施工</view>
-						<view class="SheetState" v-if="orderData.billsheet.SheetState == 1">施工中</view>
+						<view class="SheetState" v-if="orderData.billsheet.SheetState == 0">未转工单</view>
+						<view class="SheetState" v-if="orderData.billsheet.SheetState == 1">已转工单</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 2">已完工</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 3">已质检</view>
 						<view class="SheetState" v-if="orderData.billsheet.SheetState == 4">已作废</view>
 						<!-- 结算状态 -->
-						<view class="SheetState" v-if="orderData.billsheet.PayState == 0">/未结算</view>
-						<view class="SheetState" v-if="orderData.billsheet.PayState == 2">/已结算</view>
+						<!-- <view class="SheetState" v-if="orderData.billsheet.PayState == 0">/未结算</view>
+						<view class="SheetState" v-if="orderData.billsheet.PayState == 2">/已结算</view> -->
 
 					</view>
 					<view class="stateBox" v-if="orderData.billsheet.SheetType == 2">
@@ -53,25 +53,25 @@
             	</view>
 				
 				<view class="CarModel" v-if="orderData.billsheet.CarModel">{{orderData.billsheet.CarModel}}</view>
-				<view class="goodscostLine" >
+				<view class="goodscostLine jindianlc" >
 					<view class="informationTxt">进店里程</view>
 					<view class="goodsCostNum3 " style="font-size: 28rpx;" v-if="orderData.billsheet.CurrentMileage>0">
 						{{orderData.billsheet.CurrentMileage}}公里
 					</view>
 				</view>
-				<view class="goodscostLine" >
+				<!-- <view class="goodscostLine" >
 					<view class="informationTxt">建议下次保养里程</view>
 					<view class="goodsCostNum3 " style="font-size: 28rpx;color: #FDC752;" v-if="orderData.billsheet.NextCareMilage">
 						{{orderData.billsheet.NextCareMilage}}公里
 					</view>
-				</view>
+				</view> -->
 				<!-- <view class="goodscostLine" style="font-size: 28rpx;color: #FDC752;" v-if="orderData.billsheet.SheetType==1">
 					<view class="informationTxt">建议下次保养时间</view>
 					<view class="goodsCostNum3 " v-if="orderData.billsheet.NextCareDate">
 						{{orderData.billsheet.NextCareDate.slice(0,10)}}
 					</view>
 				</view> -->
-				<view class="baoyangtis">建议下次保养，里程或日期，先到为准</view>
+				<!-- <view class="baoyangtis">建议下次保养，里程或日期，先到为准</view> -->
 			
             </view>
 			<!-- 店铺信息 -->
@@ -113,14 +113,14 @@
 					<view class="informationTxt">服务顾问</view>
 					<view class="informationNum" v-if="orderData.billsheet.PickName">{{orderData.billsheet.PickName}}</view>
 				</view>
-				<view class="informationLine">
+				<!-- <view class="informationLine">
 					<view class="informationTxt">技师</view>
 					<view class="informationNum" v-if="orderData.billsheet.workNames">
 						<span v-if="orderData.billsheet.workNames==null||orderData.billsheet.workNames=='null'"></span>
 						<span v-else>{{orderData.billsheet.workNames}}</span>
 					  
 					</view>
-				</view>
+				</view> -->
 				<!-- <view class="informationLine">
 					<view class="informationTxt">手机号：</view>
 					<view class="informationNum">{{orderData.billsheet.MobilePhone}}</view>
@@ -246,7 +246,22 @@
 					</view>
 				</view>
 			</view>
-
+			<!-- 附加费 -->
+            <view class="detailedBox itemBox" v-if="orderData.listSurcharges.length!=0">
+				<view class="detailedTitle">附加费</view>
+				<view class="detailedLineBox">
+					<view class="detailedLine" v-for="(item,index) in orderData.listSurcharges">
+						<view class="goodTop">
+							<view class="detailedName">{{item.surchargesName}}</view>
+							<view class="price" >
+								<span>￥</span>
+								{{item.surchargesMoeny?item.surchargesMoeny:0}}
+							</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
 			<!-- 费用明细 -->
 			<view class="goodscost"
 				v-if="AmountMoney || TotalDiscountMoney || CardMoneyT || CardMoneyC || ReceiptsMoney">
@@ -282,13 +297,13 @@
 					<view class="goodsCostNum3">￥{{orderData.billsheet.CardMoneyCWriteOff?orderData.billsheet.CardMoneyCWriteOff:0}}</view>
 				</view>
 				<view class="goodscostLine" v-if="ReceiptsMoney">
-					<view class="goodscostTxt">支付金额</view>
+					<view class="goodscostTxt">实际应收</view>
 					<view class="goodsCostNum"><span style="font-size: 28rpx;">￥</span>{{orderData.billsheet.money?orderData.billsheet.money:0}}</view>
 				</view>
-				<view class="goodscostLine" >
+				<!-- <view class="goodscostLine" >
 					<view class="goodscostTxt">结算方式</view>
 					<view class="goodsCostNumJsfs" style="color: #333333;">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
-				</view>
+				</view> -->
 			</view>
 
 			<!-- 手机号授权 -->
@@ -372,7 +387,7 @@
 		onLoad(opt) {
             this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
-			this.id="18618D1A-B7EF-4C1B-B4EE-587A26F56769"
+			//this.id="7DF3D27B-A80C-4D76-9354-5B9AFD788CFC"
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.userInfo = this.$store.state.userInfo;
 			this.ext = this.$common.getExtStoreId();
@@ -847,11 +862,12 @@
 		margin-left: 28rpx;
 	}
     .shopBox2{
-		padding: 30rpx 0rpx;
+		padding: 25rpx 0rpx;
 		margin: 0rpx 24rpx;
 		margin-top: -60rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
+		padding-bottom: 0rpx;
 	}
 	.shopBox2 .informationTxt {
 		width: 350rpx;
@@ -1511,4 +1527,11 @@
 		color: #666;
 		font-weight: 400;
 	}
+	.shopBox2 .jindianlc{
+	   padding: 25rpx 20rpx;	
+	}
+	
+	.newboxTop{
+		padding-bottom: 25rpx;
+	}
 </style>

pages/user/historySpend.vue

@@ -11,6 +11,9 @@
 			</picker>
 		</view>
 		<view style="height: 90rpx;"></view>
+		 <!-- <view @click="goBj('7DF3D27B-A80C-4D76-9354-5B9AFD788CFC')">白玉静测试数据1</view>
+		<view @click="goBj('EF16F1B6-E1FB-46EC-A626-94A7B1FB4B1C')">白玉静测试数据2</view> 
+		<view @click="goBj('76D923FE-F360-477D-8B0D-45DF13E67AFA')">白玉静测试数据3</view> -->
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
 			<view class="topBox">
 				<view class="dan">{{item.code}}</view>
@@ -102,6 +105,7 @@
 				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
+		
 		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail2(item)">
 			<view class="topBox">
 				<view class="dan">{{item.Code}}</view>
@@ -303,6 +307,11 @@
 					url: '../subPack/offerSheetDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				}) */
 
+			},
+			goBj(id){
+			 uni.navigateTo({
+				url: '../subPack/offerSheetDetail?id=' +id // + '&lastDay=' + item.lastDay
+			}) 
 			},
 			goDetail2(item){
 				uni.navigateTo({