From 3bda842f5c97bfc552537210fe69ca78f8932fdf Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 16 Nov 2023 10:48:33 +0800
Subject: [PATCH] 1

---
 pages/index/orderDetail.vue | 132 +++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 68 deletions(-)

diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index 664050e..88c9466 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="container">
-		<uni-card :title="sales.userName == null ?'暂无':sales.userName" thumbnail="/static/images/dingdan/dd0.png">
-			<view class="uni-body" v-if="sales.province != null">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
+		<uni-card :title="sales.userName" thumbnail="/static/images/dingdan/dd0.png">
+			<view class="uni-body">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
 		</uni-card>
 
 		<view class="tui-order-item boxbg">
 			<u-collapse>
 				<u-collapse-item :open="isReturn" v-for="(item,index) in list" :key="index" :title="item.productName"
 					:name="item.saleId"
-					:value="'单价：'+ (item.wholesalePrice == null ?'暂无':item.wholesalePrice) + ' 折扣： ' + (item.discount == null ?'暂无':item.discount + '折')">
-					<view class="u-collapse-content" v-if="item.stockLogList1 != ''" v-for="(val, index2) in item.stockLogList1" :key="index2">
+					:value="'单价：'+ item.wholesalePrice + ' 折扣： ' + sales.discount + '折'">
+					<view class="u-collapse-content" v-for="(val, index2) in item.stockLogList1" :key="index2">
 						<!-- <u-icon name="checkmark-circle" color="#5fd9ee" size="20" v-if="isReturn"></u-icon>
 						<u-icon name="checkmark-circle" color="#999" size="20" v-if="isReturn"></u-icon> -->
 						{{ val.attributeList.substr(1).substring(0,val.attributeList.substr(1).length-1).replace(/\"/g, "")  }}
@@ -22,58 +22,57 @@
 			<view class="tui-goods-info">
 				<view class="tui-price-flex tui-size32 tui-pbtm20">
 					<view class="tui-flex-shrink">总金额</view>
-					<view class="tui-goods-price">
+					<view class="tui-goods-price tui-primary-color">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.totalAmount == null ?'暂无':sales.totalAmount }}</view>
+						<view class="tui-price-large">{{ sales.totalAmount }}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32">
 					<view class="tui-flex-shrink">实收金额</view>
-					<view class="tui-goods-price">
+					<view class="tui-goods-price tui-primary-color">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.realAmount == null ?'暂无':sales.realAmount }}</view>
+						<view class="tui-price-large">{{ sales.realAmount }}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32">
 					<view class="tui-flex-shrink">已收金额</view>
-					<view class="tui-goods-price">
+					<view class="tui-goods-price tui-primary-color">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.alreadyEarn == null ?'暂无':sales.alreadyEarn }}</view>
+						<view class="tui-price-large">{{ sales.alreadyEarn }}</view>
 					</view>
 				</view>
-				
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">欠款</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.noEarn}}</view>
+					</view>
+				</view>
 				<view class="tui-price-flex tui-size32">
 					<view class="tui-flex-shrink">其他费用</view>
 					<view class="tui-goods-price">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.otherExpense == null ?'暂无':sales.otherExpense}}</view>
+						<view class="tui-price-large">{{ sales.otherExpense}}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32">
 					<view class="tui-flex-shrink">备注</view>
 					<view class="tui-goods-price">
-						<view class="tui-price-large">{{ sales.remark == null ?'暂无':sales.remark}}</view>
-					</view>
-				</view>
-				<view class="tui-price-flex tui-size32">
-					<view class="tui-flex-shrink">欠款</view>
-					<view class="tui-goods-price tui-primary-color">
-						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.noEarn == null ?'暂无':sales.noEarn}}</view>
+						<view class="tui-price-large">{{ sales.remark}}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
 					<view class="tui-flex-shrink">已选金额</view>
 					<view class="tui-goods-price">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ changeAmount}}</view>
+						<view class="tui-price-large">{{ changeAmount }}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
 					<view class="tui-flex-shrink">退货金额</view>
 					<view class="tui-goods-price">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ returnAmount}}</view>
+						<view class="tui-price-large">{{ returnAmount }}</view>
 					</view>
 				</view>
 				<view class="tui-price-flex tui-size32" v-if="editNoPrice">
@@ -86,7 +85,7 @@
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
 					<view class="tui-flex-shrink">平台取货</view>
 					<view class="tui-goods-price">
-						<uni-data-checkbox v-model="radio1" :localdata="sex"
+						<uni-data-checkbox v-model="radio1" :localdata="transportType"
 							@change="checkBoxChange"></uni-data-checkbox>
 					</view>
 				</view>
@@ -122,7 +121,7 @@
 		</view>
 		<view class="tui-order-info boxbg" v-if="isgys">
 			<view class="tui-order-title">
-				物流信息
+				订单信息
 			</view>
 			<view class="tui-order-content">
 				<view class="tui-order-flex">
@@ -145,24 +144,6 @@
 					<view class="tui-item-content">
 						{{ sales.transportType == 0 ?  '物流' : sales.transportType == 1 ?  '快递' : sales.transportType == 2 ?  '自送' : sales.transportType == 3 ?  '拼包':'发车'   }}
 					</view>
-				</view>
-				<view class="tui-order-flex">
-					<view class="tui-item-title">配送公司:</view>
-					<view class="tui-item-content">
-						{{ sales.transportType}}
-					</view>
-				</view>
-				<view class="tui-order-flex">
-					<view class="tui-item-title">配送人员:</view>
-					<view class="tui-item-content">
-						{{ sales.transportType}}
-					</view>
-				</view>
-				<view class="tui-order-flex">
-					<view class="tui-item-title">配送状态:</view>
-					<view class="tui-item-content">
-						{{ sales.status == 0 ?'待抢单' :sales.status == 1 ?'待取货' :sales.status == 3 ?'待送达' :sales.status == 4 ?'已完成' :sales.status == 5 ?'下游客户待退货' :sales.status == 00 ?'退货待抢单' :sales.status == 01 ?'退货待取货' :sales.status == 03 ?'退货待送达' :sales.status == 04 ?'待确认退货' :sales.status == 6 ?'待配货' :'挂单'}}
-					</view>
 				</view>
 			</view>
 		</view>
@@ -172,11 +153,28 @@
 		</u-popup>
 		<view class="tui-tabbar">
 			<view class="tui-btn-mr">
-				<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
+				<view class="btn-wrap">
+					<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
+				</view>
+			</view>
+			<view class="tui-btn-mr">
+				<u-button type="error" :plain="true" shape="circle" @click="cancelOrder">取消订单</u-button>
+			</view>
+			<view class="tui-btn-mr" v-if="sales.status == 4">
+				<u-button type="error" :plain="true" shape="circle"
+					@click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</u-button>
+			</view>
+			<view class="tui-btn-mr">
+				<u-button type="error" :plain="true" shape="circle" @tap="inputDialogToggle()"
+					v-if="!editNoPrice">回款</u-button>
+				<!-- 				<u-button type="error" :plain="true" shape="circle" @click="sureNpPay" v-else>确认</u-button> -->
+			</view>
+			<view class="tui-btn-mr">
+				<u-button type="error" :plain="true" shape="circle" @tap="dealingsRecordList()"
+					v-if="!editNoPrice">回款记录</u-button>
+				<!-- 				<u-button type="error" :plain="true" shape="circle" @click="sureNpPay" v-else>确认</u-button> -->
 			</view>
-			<view class="tui-btn-mr" @click="cancelOrder">取消订单</view>
-			<view class="tui-btn-mr" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</view>
-			<view class="tui-btn-mr" @tap="inputDialogToggle()" v-if="!editNoPrice">回款</view>
+
 		</view>
 		<!-- 回款金额输入框 -->
 		<uni-popup ref="inputDialog" type="dialog">
@@ -194,12 +192,12 @@
 		data() {
 			return {
 				radio1: 1,
-				sex: [{
+				transportType: [{
 					text: '是',
 					value: 0
 				}, {
 					text: '否',
-					value: 1
+					value: 2
 				}],
 				orderByWorkerCandidates: [],
 				orderByWorker: '',
@@ -309,22 +307,22 @@
 				strCmd += blesdk.addCPCLText('40', '30', '24', '0', 0, '沧州明珠商贸城--快衣店')
 				strCmd += blesdk.addCPCLSETMAG(3, 3)
 				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + this.sales.userName)
+				strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + this.order.name)
 				strCmd += blesdk.addCPCLSETMAG(1, 1)
-				strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, "15257485325")
+				strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, this.order.phone)
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
 				blesdk.addCPCLSETBOLD('bold')
-				strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.sales.province + '/' + this.sales.city + '/' +
-					this.sales.area)
+				strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.order.province + '/' + this.order.city + '/' +
+					this.order.area)
 				strCmd += blesdk.addCPCLSETMAG(1, 1)
-				strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.sales.receiveAddress)
+				strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.order.address)
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
 				blesdk.addCPCLSETBOLD('bold')
 				strCmd += blesdk.addCPCLText('0', '490', '24', '0', 0, '——————————————————————————————')
-				strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：'+ this.sales.companyName)
+				strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：虚拟物流')
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
 				strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
-				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：'+this.sales.shopName)
+				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：张三的店')
 				strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, '13521030702')
 				strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：早市10059')
 				// strCmd += blesdk.addCPCLText(200,0,'24','5',0,'收件联');// 文字
@@ -361,12 +359,11 @@
 						uni.navigateBack();
 					}).catch(res => {});
 				}else{
-					this.sales.alreadyEarn = (this.sales.alreadyEarn * 1) + (this.newEarn * 1);
-					this.tui.request('/app/sale/edit','post', {
-						sale: this.sales,
-						customer: this.order,
-						saleDetailDTOList: this.list
-					},false,false).then(res => {
+					// this.sales.alreadyEarn = (this.sales.alreadyEarn * 1) + (this.newEarn * 1);
+					this.tui.request('/app/sale/editPayPrice','post', {
+						id:this.sales.id,
+						price:e
+					},false,true).then(res => {
 						uni.showToast({
 							title: res.message,
 							icon: 'none'
@@ -378,6 +375,10 @@
 			//回款金额输入框
 			inputDialogToggle() {
 				this.$refs.inputDialog.open()
+			},
+			// 记录
+			dealingsRecordList(){
+				
 			},
 			//回款按钮  this.type==gys时，是上游客户欠款接口。否则为销售单欠款接口
 			editnoEarn() {
@@ -420,6 +421,8 @@
 				}).catch((res) => {})
 			},
 			checkBoxChange() {
+				// 赋值物流方式
+				this.sales.transportType = this.radio1;
 				if (this.radio1 == 0 && this.orderByWorkerList.length == 0) {
 					this.transCompanyInput()
 				}
@@ -768,13 +771,6 @@
 	}
 
 	.tui-btn-mr {
-		width:130rpx;
-		height: 60rpx;
-		background: #088FEB;
-		color: #fff;
-		border-radius: 10px;
-		line-height: 60rpx;
-		text-align: center;
 		margin-right: 30rpx;
 	}