From 1a8376ff4b28c575c1dcb09fa279b04f40b92c38 Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Tue, 7 Nov 2023 21:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue          |  4 ++++
 pages/index/order.vue          |  6 +++---
 pages/inventory/goodsList1.vue | 27 +++++++++++++++------------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 14daffc..b5cf2dc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -107,6 +107,10 @@
 							<u-cell icon="integral-fill" url="/pages/index/downstream" title="下游客户欠款" clickable isLink
 								arrow-direction="left"></u-cell>
 							<u-cell icon="integral-fill" url="/pages/index/returnList" title="待退货" clickable isLink
+								arrow-direction="left"></u-cell>
+							<u-cell icon="integral-fill" url="/pages/index/order?type=ruku" title="入库单详情" clickable isLink
+								arrow-direction="left"></u-cell>
+							<u-cell icon="integral-fill" url="/pages/index/order?type=dingdan" title="订单详情" clickable isLink
 								arrow-direction="left"></u-cell>
 						</u-cell-group>
 					</view>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index de319d2..73a915d 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -33,7 +33,7 @@
 		data() {
 			return {
 				keyword: '',
-				userId: '',
+				type: '',
 				inventoryList: [],
 				status: 'loadmore',
 				page: 1,
@@ -42,8 +42,8 @@
 			};
 		},
 		onLoad(options) {
-			console.log(options, 'options');
-			this.userId = options.userId;
+			console.log('options', options);
+			this.type = options.type;
 			this.getOrderInfoList()
 		},
 		onReachBottom() {
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index d3af544..bde31f6 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -135,7 +135,7 @@
 					<view class="content-list">
 						<view class="list-name">欠款</view>
 						<view class="list-val">
-							<input type="number" :value="priceNo" disabled>
+							<input type="number" :value="noPay" disabled>
 						</view>
 					</view>
 					<view class="content-list">
@@ -247,12 +247,13 @@
 			return {
 				lsprice:0,//临时零售价
 				wholesalePrice:0, // 临时显示批发价
-				price: '0', //总金额
-				relPrice: '0', //已付金额
-				otherExpense: '0', // 其他费用
-				priceNo: '0', //未付金额
+				price: 0, //总金额
+				relPrice: 0, //实收金额
+				otherExpense: 0, // 其他费用
+				noPay: 0, //欠款
 				discountNum:10, //整体折扣
-				priceCurrent:'',
+				priceCurrent:'',
+				priceOk:'', //已收金额
 				value: '',
 				priceItems:[{
 						value: '0',
@@ -315,7 +316,8 @@
 		},
 		onShow() {
 			let that = this;
-			this.khName = JSON.parse(JSON.stringify(this.khName)) || ''
+			this.khName = JSON.parse(JSON.stringify(this.khName)) || ''
+			console.log(this.khName)
 			this.gysName = JSON.parse(JSON.stringify(this.gysName)) || ''
 			this.wlName = JSON.parse(JSON.stringify(this.wlName)) || ''
 			this.kdyName = JSON.parse(JSON.stringify(this.kdyName)) || ''
@@ -526,16 +528,17 @@
 				let obj = {
 					orderByWorker: this.lbgName.workerId,
 					transCompany: this.wlName.id,
-					sale: {
-						alreadyEarn: 100, //已付金额
-						realAmount: 100, //实际金额
-						noEarn: 0, //欠款
+					sale: {
+						relPrice:this.relPrice, //实收金额
+						alreadyEarn: this.priceOk, //已付金额
+						realAmount: this.shouldPay, //总金额
+						noEarn: this.noPay, //欠款
 						totalAmount: this.totalAmount, //总数量
 						area: this.khName.area,
 						city: this.khName.city,
 						province: this.khName.province,
 						payStatus: 1,
-						receiveAddress: this.khName.receiveAddress,
+						receiveAddress: this.khName.address,
 						transportType: this.radioType, //this.radioType
 						discount: this.discountNum,
 						createBy: this.xsyId,