From 2631b4fc784f5a88b6eb37b2b74b8ecbc11e790d Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sat, 31 Aug 2024 23:10:06 +0800
Subject: [PATCH] uu

---
 pages/bill/detail.vue      | 24 ++++++++++++-------
 pages/bill/list.vue        |  2 +-
 pages/warehousing/list.vue | 49 ++++----------------------------------
 3 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue
index c7c713a..ee2dfaa 100644
--- a/pages/bill/detail.vue
+++ b/pages/bill/detail.vue
@@ -28,11 +28,11 @@
 						</view>
 						<view class="dt-item">
 							<view class="lb1">应付金额</view>
-							<view class="lb2">{{info.recMoney}}</view>
+							<view class="lb2 clr-prm">￥{{info.recMoney}}</view>
 						</view>
 						<view class="dt-item">
 							<view class="lb1">已付金额</view>
-							<view class="lb2">{{info.recedMoney}}</view>
+							<view class="lb2 clr-prm">￥{{info.recedMoney}}</view>
 						</view>
 						<view class="dt-item">
 							<view class="lb1">开票状态</view>
@@ -42,7 +42,10 @@
 								<tetx v-if="info.openBillStatus == 2">部分开票</tetx>
 							</view>
 						</view>
-						
+						<view v-if="info.paymentStatus==1" class="dt-item">
+							<view class="lb1">支付状态</view>
+							<view class="lb2 clr-prm font-weight">已支付</view>
+						</view>
 						<!-- <view class="dt-item mt-30">
 							<view class="lb1">收款账户</view>
 							<view class="lb2">
@@ -60,7 +63,7 @@
 							<view class="lb1">支付金额</view>
 							<view class="zhfxin">
 								<view style="text-align: center;width: 300rpx;">
-									<u-image height="300" width="300" radius="10"></u-image>
+									<u-image :src="payQrImageUrl" height="300" width="300" radius="10"></u-image>
 									<view class="mt-10" style="display: inline-block;">
 										<u-text :text="`￥${info.thisPayMoney}`" size="32" :bold="true" color="#B12D29" align="center"></u-text>
 									</view>
@@ -74,13 +77,13 @@
 					<view class="dt-body">
 						<u-text :text="'运单列表'" size="30" :bold="true"></u-text>
 						<u-line margin="20rpx 0 20rpx"></u-line>
-						<view v-for="(item) in ydList" class="yditem">
+						<view v-for="(item) in info.subBillList" class="yditem">
 							<view class="ydi-lab">
 								<view>
 									<u-text :text="'运单号'" size="26" color="#999"></u-text>
 								</view>
 								<view>
-									<u-text :text="'T81823778123'" size="28" :bold="true" align="right"></u-text>
+									<u-text :text="item.billCode" size="28" :bold="true" align="right"></u-text>
 								</view>
 							</view>
 							<view class="ydi-lab mt-10">
@@ -88,10 +91,11 @@
 									<u-text :text="'应付金额'" size="26" color="#999"></u-text>
 								</view>
 								<view>
-									<u-text :text="'￥30.00'" size="28" :bold="true" color="#B12D29" align="right"></u-text>
+									<u-text :text="`￥${item.billFee}`" size="28" :bold="true" color="#B12D29" align="right"></u-text>
 								</view>
 							</view>
 						</view>
+						<tpx-empty v-if="!(info.subBillList && info.subBillList.length > 0)" size="sm"></tpx-empty>
 					</view>
 				</view>
 			</template>
@@ -133,6 +137,7 @@
 					blNo: ''
 				},
 				info: {},
+				payQrImageUrl: '',
 				pageLoading: true,
 			}
 		},
@@ -147,7 +152,9 @@
 			getSendSiteList: apiService.getSendSiteList,
 			async initData() {
 				await this.getDetailData()
-				await this.getPayQrcode()
+				if(this.info.paymentStatus != 1) {
+					await this.getPayQrcode()	
+				}
 				this.pageLoading = false
 			},
 			async getDetailData(){
@@ -156,6 +163,7 @@
 			},
 			async getPayQrcode(){
 				let res = await apiService.getWxPayQrCode({settleBillNo: this.queryOption.blNo, _loading: true })
+				this.payQrImageUrl = res.data
 			},
 			async handleCallPay(){
 				let res = await apiService.sumbitWxPay({settleBillNo: this.queryOption.blNo, _loading: true })
diff --git a/pages/bill/list.vue b/pages/bill/list.vue
index d7810d3..a5a8112 100644
--- a/pages/bill/list.vue
+++ b/pages/bill/list.vue
@@ -10,7 +10,7 @@
 					
 					<view class="com-jianju" style="padding-top: 30rpx;">
 						<u-row justify="between" align="top">
-							<u-col span="9">
+							<u-col span="12">
 								<!-- 订单状态 -->
 								<tpx-tabs :list="dicData.emis_settlebill_status_tab" v-model:value="searchParam.params.queryType"
 									v-slot="curOrdTab"
diff --git a/pages/warehousing/list.vue b/pages/warehousing/list.vue
index 81c4617..c512161 100644
--- a/pages/warehousing/list.vue
+++ b/pages/warehousing/list.vue
@@ -10,15 +10,15 @@
 					
 					<view class="com-jianju" style="padding-top: 30rpx;">
 						<u-row justify="between" align="top">
-							<u-col span="9">
-								<tpx-tabs :list="dicData.emis_oms_order_tab" v-model:value="searchParam.params.queryStatusType"
+							<u-col span="12">
+								<tpx-tabs :list="dicData.emis_wsin_tab" v-model:value="searchParam.params.queryStatusType"
 									v-slot="curOrdTab"
 								>
 									<text slot>
 									</text>
 								</tpx-tabs>
 							</u-col>
-							<u-col span="2">
+							<u-col v-if="false" span="2">
 								<!-- 更多查询条件 -->
 								<u-button @click="handleDialogClick(moreSearchModel)" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
 									<u-row justify="center">
@@ -40,16 +40,6 @@
 							<view class="smp-content">
 								<view class="pos-abt-all" style="overflow-y: auto;">
 									<view style="padding: 0 0 30rpx 0">
-										<view>
-											<u-text text="快递状态" size="28" :bold="true" margin="0 0 20rpx 0"></u-text>
-											<tpx-tags :list="dicData.emis_order_status" v-model:value="moreSearchModel.data.params.orderStatType" ></tpx-tags>
-										</view>
-										
-										<view>
-											<u-text text="付款方式" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>	
-											<tpx-tags :list="dicData.emis_payment_type" v-model:value="moreSearchModel.data.params.paymentType" ></tpx-tags>
-										</view>
-										
 										<view>
 											<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
 											<tpx-date-input v-model:value="moreSearchModel.data._date" placeholder="请选择时间"></tpx-date-input>
@@ -112,13 +102,6 @@
 			</template>
 		</tpx-layout>
 	
-		<tpx-com-dialog v-model:show="cancelModal.show" ref="cancelRef" title="确认取消">
-			<template v-slot:body>
-				<u-textarea v-model="cancelModal.data.orderRemark" border="surround" height="120" placeholder="请输入"
-					maxlength="300" count></u-textarea>
-			</template>
-		</tpx-com-dialog>
-		
 	</tpx-page>
 </template>
 <script>
@@ -137,8 +120,6 @@
 				let hasExt = false
 				if(
 					this.searchParam._date.length > 0
-					|| this.searchParam.params.paymentType
-					|| this.searchParam.params.orderStatType
 				) {
 					hasExt = true
 				}
@@ -164,9 +145,7 @@
 					searchValue: '',
 					_date: [],
 					params: {
-						queryStatusType: dicData.emis_oms_order_tab?.[0]?.val,
-						orderStatType: '',
-						paymentType: '',
+						queryStatusType: dicData.emis_wsin_tab?.[0]?.val,
 					}
 				},
 				queryOption: {
@@ -208,24 +187,6 @@
 					case 1: // 运单详情
 						this.goto(`post/detail${itemQuery}`)
 						break;
-					case 2: // 再来一单
-						this.goto(`post/post?copyBillCode=${item.billCode}`)
-						break;
-					case 3: // 取消
-						let canBl = await this.$refs.cancelRef.getConfirmResult()
-						if(canBl) {
-							await apiService.cancelOrder({ orderSn: item.orderSn, ...this.cancelModal.data })
-							this.triggerListReload()
-						}
-						this.cancelModal.data = { }
-						this.cancelModal.show = false
-						break;
-					case 4: // 进仓确认
-						this.goto(`warehousing/detail${itemQuery}`)
-						break;
-					case 5: // 付款
-						this.goto(`bill/detail${itemQuery}`) 
-						break;
 					default:
 						break;
 				}
@@ -245,8 +206,6 @@
 			handleResetTempSearch(){
 				let data = this.moreSearchModel.data
 				data._date = []
-				data.params.orderStatType = ''
-				data.params.paymentType = ''
 			},
 			handleConfirmTempSearch(){
 				deepAssign(this.searchParam, this.moreSearchModel.data)