From d9e1e4bb971a219d0c7475508520866cb96f0935 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 三月 2024 16:41:06 +0800
Subject: [PATCH] #

---
 pages/basics/orderQuery.vue  |    6 +++---
 pages/basics/orderSelect.vue |   29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pages/basics/orderQuery.vue b/pages/basics/orderQuery.vue
index e712154..dc25006 100644
--- a/pages/basics/orderQuery.vue
+++ b/pages/basics/orderQuery.vue
@@ -15,11 +15,11 @@
 					<view class="text-title">{{matData.specs}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鍚堝悓鍙�</text></view>
-					<view class="text-title">{{matData.model}}</view>
+					<view class="text-title"><text>瀹㈡埛鍚堝悓鍙�</text></view>
+					<view class="text-title">{{matData.supp}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>绠卞彿</text></view>
+					<view class="text-title"><text>璐у彿</text></view>
 					<view class="text-title">{{matData.xh}}</view>
 				</view>
 				<view class="text-box">
diff --git a/pages/basics/orderSelect.vue b/pages/basics/orderSelect.vue
index 399cd81..7a6366b 100644
--- a/pages/basics/orderSelect.vue
+++ b/pages/basics/orderSelect.vue
@@ -18,6 +18,7 @@
 						</view>
 						
 						<view class="order-ditel"><text class="orderNo">{{item.orderNo}}</text></view>
+						<view class="order-ditel"><text class="orderNo">{{item.combMats[0].supp}}</text></view>
 					</view>
 				</label>
 				
@@ -29,9 +30,10 @@
 						<view class="tag">
 							<view class="cu-tag bg-cyan ">璁㈠崟鏄庣粏</view>
 						</view>
-						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;">{{item.matnr}}</text></view>
-						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;">{{item.maktx}}</text></view>
-						<view class="matnr" style="font-size: 16px;"><text style="min-width: 400rpx;font-size: 12px;">{{item.specs}}</text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 500rpx;font-size: 12px;">{{item.supp}}</text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 500rpx;font-size: 12px;">{{item.maktx}}</text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 500rpx;font-size: 12px;">{{item.specs}}</text></view>
+						<view class="matnr" style="font-size: 16px;"><text style="min-width: 500rpx;font-size: 12px;">{{item.xh}}</text></view>
 					</view>
 				</label>
 			</checkbox-group>
@@ -108,26 +110,23 @@
 				let that = this
 				uni.showLoading();
 				uni.request({
-				    url: that.commonUrl + '/order/head/page/auth',
+				    url: that.commonUrl + '/mobile/order/search/orderNo/auth',
 					header: {
 						'token':uni.getStorageSync('token'),
+						'content-type': 'application/x-www-form-urlencoded',
 					},
-				    data: {
-						curr: 1,
-						limit: 100000,
-						// parentId: parentId
-				    },
-					header: {
-						'token':uni.getStorageSync('token'),
+					data: {
+						orderNo: ''
 					},
+					method: 'POST',
 					success(result) {
 						console.log(result)
 						that.tag = null
 						that.data = null
 						var res = result.data
 						if (res.code === 200) {
-							if (res.data != null && res.data.records.length > 0) {
-								that.tag = res.data.records
+							if (res.data != null && res.data.length > 0) {
+								that.tag = res.data
 							} else {
 								that.showMat(parentId)
 							}
@@ -326,7 +325,7 @@
 	}
 	.demo-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 220rpx;
+		height: 240rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}
@@ -355,7 +354,7 @@
 		/* background-color: #3b3b3b; */
 	}
 	.order-ditel {
-		margin-top: 30rpx;
+		padding: 10rpx;
 		height: 60rpx;
 		width: 600rpx;
 		line-height: 60rpx;

--
Gitblit v1.9.1