From 7a0dfa5e0695ec8c42574b54a8f88143159e4afa Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 21 Nov 2023 20:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/order.vue          |  2 +-
 pages/index/orderDetail.vue    | 37 ++++++++++++++++++++++++++++++----
 pages/index/waitStorage.vue    | 14 +++++++++----
 pages/inventory/goodsList1.vue | 10 ++++-----
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/pages/index/order.vue b/pages/index/order.vue
index 3d3c034..bc81037 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="search">
-			<u-search placeholder="输入订单号/收货人/手机号查询" v-model="keyword" @search="searchList" bg-color="#fff"
+			<u-search placeholder="输入收货人/货号/商品名称/供应商查询" v-model="keyword" @search="searchList" bg-color="#fff"
 				:show-action="false" border-color="#afd9ee"></u-search>
 		</view>
 		<view class="ulList" v-if="inventoryList.length > 0">
diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index abb5144..1b93eca 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -121,7 +121,7 @@
 		</view>
 		<view class="tui-order-info boxbg" v-if="isgys">
 			<view class="tui-order-title">
-				退款历史信息
+				退款历史
 			</view>
 			<view class="tui-order-content">
 				<u-collapse :value="[shopList[0].saleId]">
@@ -138,6 +138,25 @@
 					</u-collapse-item>
 				</u-collapse>
 			</view>
+		</view>
+		<view class="tui-order-info boxbg">
+			<view class="tui-order-title">
+				回款历史
+			</view>
+			<view class="tui-order-content" v-for="(item,index) in collection">	
+				<view class="tui-order-flex">
+					<view class="tui-item-title">回款金额:</view>
+					<view class="tui-item-content">{{ item.amount }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">操作人:</view>
+					<view class="tui-item-content">{{ item.createByName }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">操作时间:</view>
+					<view class="tui-item-content">{{ item.createTime }}</view>
+				</view>
+			</view>
 		</view>
 		<view class="tui-order-info boxbg" v-if="isgys">
 			<view class="tui-order-title">
@@ -238,7 +257,8 @@
 				isgys: true,
 				isReturnPrice: 1,
 				type: '',
-				orderXd:[]
+				orderXd:[],
+				collection:[]
 			}
 		},
 		components: {
@@ -326,11 +346,20 @@
 					// 	if (res.code == 200 && res.result != null && res.result != undefined) {
 					// 	}
 					// }).catch((res) => {})
-					this.getReturnOrder(option.id)
+					this.getReturnOrder(option.id)
+					this.collectionList(option.id)
 				}
 			}
 		},
-		methods: {
+		methods: {
+			//回款历史
+			collectionList(id){
+				this.tui.request('/app/dealingRecord/getDealingsRecordList','post', {
+					orderId:id
+				},false,true).then(res => {
+					this.collection = res.result
+				}).catch(res => {});
+			},
 			onPrint(opt) {
 				let strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 1);
 				strCmd += blesdk.addCPCLSETMAG(2, 2)
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index afd7642..db69c5b 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -7,7 +7,7 @@
 		<u-alert description="点击可跳转至入库单" type="primary"></u-alert>
 		<view class="ulList" v-if="list.length > 0">
 			<ul>
-				<li v-for="item in list" @tap="returnPrice(item)">
+				<li v-for="(item,index) in list" @tap="returnPrice(item)" :key="index">
 					<uni-card :title="'供应商：'+(item.supplierName == null ?'暂无':item.supplierName)"
 						:sub-title="item.createTime == null ?'暂无':item.createTime"
 						:extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
@@ -86,9 +86,15 @@
 			},
 			//搜索
 			searchList() {
-				this.page = 1;
-				// this.inventoryList = [];
-				// this.getOrderInfoList()
+				this.tui.request("/app/purchase/getPurchaseList", "POST", {
+					searchStr:this.keyword
+				}, false, false).then((res) => {
+					if (res.code == 200) {
+						this.list = res.result
+					} else {
+						this.tui.toast(res.message)
+					}
+				})
 			},
 			returnPrice(item) {
 				uni.navigateTo({
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 8da2543..1e1e111 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -129,13 +129,13 @@
 					<view class="content-list">
 						<view class="list-name">实收金额</view>
 						<view class="list-val">
-							<input type="number" :value="relPrice" @blur="changessPrice($event)">
+							<input type="number" placeholder="请输入实收金额" :value="relPrice" @blur="changessPrice($event)">
 						</view>
 					</view>
 					<view class="content-list">
 						<view class="list-name">已收金额</view>
 						<view class="list-val">
-							<input type="number" :value="priceOk"  @blur="changePrice($event)">
+							<input type="number" placeholder="请输入已收金额" :value="priceOk"  @blur="changePrice($event)">
 						</view>
 					</view>
 					<view class="content-list">
@@ -147,7 +147,7 @@
 					<view class="content-list">
 						<view class="list-name">其他费用</view>
 						<view class="list-val">
-							<input type="number" :value="otherExpense">
+							<input type="number" placeholder="如无其他费用可忽略" :value="otherExpense">
 						</view>
 					</view>
 					<view class="content-list">
@@ -308,8 +308,8 @@
 				lsprice:0,//临时零售价
 				wholesalePrice:0, // 临时显示批发价
 				price: 0, //总金额
-				relPrice: 0, //实收金额
-				otherExpense: 0, // 其他费用
+				relPrice: "", //实收金额
+				otherExpense: "", // 其他费用
 				noPay: 0, //欠款
 				discountNum:10, //整体折扣
 				priceCurrent:'',