From 6c9cbdf482ce1330704dc635c510ec51a1115a9f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 16:52:29 +0800
Subject: [PATCH] #
---
pages/basics/orderSelect.vue | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/pages/basics/orderSelect.vue b/pages/basics/orderSelect.vue
index 399cd81..9914ff8 100644
--- a/pages/basics/orderSelect.vue
+++ b/pages/basics/orderSelect.vue
@@ -11,13 +11,14 @@
</view>
<checkbox-group @change="checkbox">
<label v-for="(item,index) in tag" :key="index" class="demo-list bg-false"
- @click="showTag(item.id)">
+ @click="showTag(item.orderNo)">
<view class="demo-list-right">
<view class="tag">
<view class="cu-tag bg-blue ">璁㈠崟</view>
</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.color}}</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>
@@ -47,6 +49,7 @@
condition:null,
tag: [],
data: [],
+ orderNo: ''
}
},
onLoad() {
@@ -108,26 +111,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)
}
@@ -149,26 +149,24 @@
let that = this
uni.showLoading();
uni.request({
- url: that.commonUrl + '/orderDetl/list/auth',
- header: {
- 'token':uni.getStorageSync('token'),
- },
- data: {
- curr: 1,
- limit: 100000,
- order_id: parentId
+ url: that.commonUrl + '/mobile/order/search/orderNo/auth',
+ header: {
+ 'token':uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded',
},
- header: {
- 'token':uni.getStorageSync('token'),
- },
+ data: {
+ orderNo: parentId
+ },
+ 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.data = res.data.records
+ if (res.data != null && res.data[0].combMats.length > 0) {
+ that.data = res.data[0].combMats
+ that.orderNo = res.data[0].orderNo
} else {
that.showMat(parentId)
}
@@ -231,7 +229,11 @@
},
findBySelect(item) {
console.log(item);
- this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: item});
+ let newItem = {
+ orderNo: this.orderNo,
+ item: item
+ }
+ this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: newItem});
uni.vibrateShort();
uni.navigateBack({
@@ -326,7 +328,7 @@
}
.demo-list {
border-bottom: 1px solid #d8d8d8;
- height: 220rpx;
+ height: 240rpx;
margin: 15rpx;
border-radius: 20rpx;
}
@@ -355,7 +357,7 @@
/* background-color: #3b3b3b; */
}
.order-ditel {
- margin-top: 30rpx;
+ padding: 10rpx;
height: 60rpx;
width: 600rpx;
line-height: 60rpx;
--
Gitblit v1.9.1