开单

pages/index/addHangOrder.vue

@@ -616,7 +616,8 @@
 					saleDetailQueryDTO:[],
 					supplierName:'',
 					wholesalePrice:0,
-					remark:item.remark
+					remark:item.remark,
+					saleId:''
 				},
 				dataList = []
 				for (let i=0;i<item.saleDetailDTOList.length;i++) {
@@ -628,7 +629,8 @@
 					obj.productName = item.saleDetailDTOList[i].productName
 					obj.producticture = item.saleDetailDTOList[i].productPicture
 					obj.productSn = item.saleDetailDTOList[i].productSn
-					obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
+					obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice,
+					obj.saleId = item.saleDetailDTOList[i].saleId
 					dataList.push(obj)
 				}
 				uni.setStorageSync('carList1',dataList)

pages/index/orderDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<uni-card :title="order.name + ',' + order.phone" thumbnail="/static/images/logo.png">
+		<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>
 
@@ -21,16 +21,21 @@
 			</u-collapse>
 			<view class="tui-goods-info">
 				<view class="tui-price-flex tui-size32 tui-pbtm20">
-					<view class="tui-flex-shrink">合计</view>
+					<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"> <text>{{ sales.realAmount }}</text> <text
-								v-if="sales.totalAmount > sales.realAmount"
-								class="lineText">￥{{ sales.totalAmount }}</text> </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 tui-primary-color">
+						<view class="tui-size-24">￥</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-flex-shrink">已收金额</view>
 					<view class="tui-goods-price tui-primary-color">
 						<view class="tui-size-24">￥</view>
 						<view class="tui-price-large">{{ sales.alreadyEarn }}</view>
@@ -40,8 +45,21 @@
 					<view class="tui-flex-shrink">欠款</view>
 					<view class="tui-goods-price">
 						<view class="tui-size-24">￥</view>
-						<view class="tui-price-large">{{ sales.newNoEarn >= 0 ? sales.newNoEarn : sales.noEarn }}</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}}</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}}</view>
+					</view>
 				</view>
 				<view class="tui-price-flex tui-size32" v-if="isReturn">
 					<view class="tui-flex-shrink">已选金额</view>
@@ -114,7 +132,7 @@
 					<view class="tui-item-title">物流单:</view>
 					<!-- <view class="tui-item-content">{{ order.kdOrderId }}</view> -->
 					<image show-menu-by-longpress
-						src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg"
+						:src="orderXd.orderPicture"
 						@tap="showImage"></image>
 				</view>
 				<view class="tui-order-flex">
@@ -124,7 +142,7 @@
 				<view class="tui-order-flex">
 					<view class="tui-item-title">配送方式:</view>
 					<view class="tui-item-content">
-						{{ sales.transportType == 1 ?  '物流' : sales.transportType == 2 ?  '自提' : sales.transportType == 3 ?  '快递' : '拼单'   }}
+						{{ sales.transportType == 0 ?  '物流' : sales.transportType == 1 ?  '快递' : sales.transportType == 2 ?  '自送' : sales.transportType == 3 ?  '拼包':'发车'   }}
 					</view>
 				</view>
 			</view>
@@ -193,7 +211,8 @@
 				qrcodeData: '',
 				isgys: true,
 				isReturnPrice: 1,
-				type: ''
+				type: '',
+				orderXd:[]
 			}
 		},
 		components: {
@@ -237,11 +256,12 @@
 					this.type = option.type;
 					this.tui.request("/app/purchase/getPurchaseAllData", "post", {
 						id: option.id
-					}, false, false).then((res) => {
+					}, false, true).then((res) => {
 						if (res.code == 200) {
 							this.isgys = false
 							this.sales = res.result.purchase
-							this.list = res.result.purchaseDetails
+							this.list = res.result.purchaseDetails
+							
 						} else {
 							this.tui.toast(res.message)
 						}
@@ -251,7 +271,8 @@
 						if (res.code == 200 && res.result != null && res.result != undefined) {
 							this.sales = res.result.sale
 							this.list = res.result.saleDetailDTOList
-							this.order = res.result.customer
+							this.order = res.result.customer
+							this.orderXd = res.result.orderXd
 						} else {
 							this.tui.toast(res.message)
 						}
@@ -316,8 +337,8 @@
 			//点击图片放大
 			showImage() {
 				uni.previewImage({
-					urls: ["https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg"],
-					current: "https://jewel-shop.oss-cn-beijing.aliyuncs.com/f02827ca8a7b4decadca812cb2f83110.jpg"
+					urls: [this.orderXd.orderPicture],
+					current: this.orderXd.orderPicture
 				})
 			},
 			sureNpPay(e) {

pages/inventory/goodsList1.vue

@@ -328,7 +328,8 @@
 				remark:'',
 				pbAddress:'',
 				carList1:[],
-				radioType1:''
+				radioType1:'',
+				saleId:''
 			}
 		},
 		onShow() {
@@ -341,6 +342,7 @@
 			if(uni.getStorageSync('carList1')){
 				this.carList1 = uni.getStorageSync('carList1')
 				this.remark = this.carList1[0].remark 
+				this.saleId = this.carList1[0].saleId
 			}else{
 				this.carList1 = this.carList1
 			}
@@ -573,7 +575,9 @@
 				console.log(this.khName)
 				console.log(this.lbgName)
 				console.log(this.wlName)
-				let obj = {
+				let obj = {
+					orderByWorker: this.lbgName.workerId,
+					saleId:this.saleId,
 					sale: {
 						// relPrice:, 
 						alreadyEarn: this.priceOk, //已付金额
@@ -595,8 +599,7 @@
 						otherExpense:this.otherExpense, //其他费用
 						shareAddress:this.pbAddress,
 						transCompany: this.wlName.id,
-						companyName:this.wlName.companyName,
-						orderByWorker: this.lbgName.workerId,
+						companyName:this.wlName.companyName,
 					},
 					saleDetailList: []
 				}

pages/inventory/inventory.vue

@@ -60,8 +60,8 @@
 						<view class="box-right-name">{{item.productName}}</view>
 						<view class="box-right-num">{{item.productSn}}</view>
 						<!-- 1上架  0下架 -->
-						<view class="up-down" v-if="item.delFlag ==1" @tap.stop="upDown('0',item)">去下架</view>
-						<view class="up-down" v-if="item.delFlag ==0" @tap.stop="upDown('1',item)">去上架</view>
+						<view class="up-down" v-if="item.delFlag ==1" @tap.stop="upDown('0',item)">下架</view>
+						<view class="up-down" v-if="item.delFlag ==0" @tap.stop="upDown('1',item)">上架</view>
 						<view class="box-right-price">
 							<view class="price-box">
 								<text v-if="item.purchasePrice==null" style="color: red;">未入库</text>
@@ -213,25 +213,26 @@
 						if (type == 0) { //下架
 							that.tui.request("/app/product/down", "POST", {
 								id: data.id
-							}, false, false).then((res) => {
+							}, false, true).then((res) => {
 								if (res.code == 200) {
 									that.tui.toast("下架成功")
 								} else {
 									that.tui.toast(res.message)
-								}
+								}
+								that.getShareList(data.categoryId)
 							}).catch((res) => {})
 						} else { //上架
 							that.tui.request("/app/product/up", "POST", {
-								id: id
-							}, false, false).then((res) => {
+								id: data.id
+							}, false, true).then((res) => {
 								if (res.code == 200) {
 									that.tui.toast("上架成功")
 								} else {
 									that.tui.toast(res.message)
-								}
+								}
+								that.getShareList(data.categoryId)
 							}).catch((res) => {})
-						}
-						that.getShareList(data.categoryId)
+						}
 					}
 				})
 			},