From b9e0cd2967f91865ae987707b34fba88dfbc5095 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 14:48:26 +0800
Subject: [PATCH] #
---
pages/order/orderPakin2.vue | 83 +++++++++++++--------------
pages.json | 8 ++
pages/order/orderDetls.vue | 69 +++++++++++++++++++++++
3 files changed, 118 insertions(+), 42 deletions(-)
diff --git a/pages.json b/pages.json
index 371681d..3b1ad52 100644
--- a/pages.json
+++ b/pages.json
@@ -216,6 +216,14 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/order/orderDetls",
+ "style" :
+ {
+ "navigationBarTitleText" : "璁㈠崟鏄庣粏",
+ "enablePullDownRefresh" : false
+ }
}
],
"globalStyle": {
diff --git a/pages/order/orderDetls.vue b/pages/order/orderDetls.vue
new file mode 100644
index 0000000..89315b7
--- /dev/null
+++ b/pages/order/orderDetls.vue
@@ -0,0 +1,69 @@
+<template>
+ <view>
+ <view class="data-list" v-for="item in dataList">
+ <view class="data-item">
+ <view><text>缂栫爜:</text><text>{{item.matnr}}</text></view>
+ <view><text>鍝佸悕:</text><text>{{item.maktx}}</text></view>
+ <view><text>浣嶇疆:</text><text>{{item.position}}</text></view>
+ <view><text>閲嶉噺:</text><text>{{item.weight}}</text></view>
+ <view><text>鎵瑰彿:</text><text>{{item.batch}}</text></view>
+ </view>
+ <view class="data-options">
+ <uni-icons type="right" color="#FFF" size="50rpx" @click="back(item)"></uni-icons>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dataList:[]
+ }
+ },
+ onLoad(option) {
+ let _this = this
+ // #ifdef APP-NVUE
+ const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ // #endif
+ // #ifndef APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+ // #endif
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('orderDetls', function(data) {
+ _this.dataList = data.data
+ })
+ },
+ methods: {
+ back(item) {
+ this.getOpenerEventChannel().emit('detl', {data: item});
+ uni.navigateBack({
+
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ .data-list {
+ margin: 16rpx;
+ background-color: antiquewhite;
+ display: flex;
+ background-color: #888;
+ color: #fff;
+ border-radius: 16rpx;
+ }
+ .data-item {
+ flex: 1;
+ padding: 16rpx 24rpx;
+ }
+ .data-options {
+ width: 15%;
+ border-left: 1px solid #ddd;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+</style>
diff --git a/pages/order/orderPakin2.vue b/pages/order/orderPakin2.vue
index 64badd7..347b6a2 100644
--- a/pages/order/orderPakin2.vue
+++ b/pages/order/orderPakin2.vue
@@ -20,7 +20,9 @@
<view class="mat-list-title">
<view class="title-item"></view>
<view class="title-item">鍟嗗搧鍒楄〃</view>
- <view class="title-item"><button size="mini" type="primary" @click="addMat()">娣诲姞</button></view>
+ <view class="title-item">
+ <!-- <button size="mini" type="primary" @click="addMat()">娣诲姞</button> -->
+ </view>
</view>
<u-empty v-show="dataList.length == 0" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png" style="position:fixed;top: 60%;left: 50%;transform: translate(-50%, -50%);">
@@ -139,11 +141,11 @@
<!-- 寮圭獥閫夋嫨 -->
<uni-popup ref="inputDialog" type="dialog">
<view class="pop">
- <view class="pop-btn" @click="select('1')">
- 1鍙风爜鍨涗綅
+ <view class="pop-btn" @click="select('118')">
+ 118鍙风爜鍨涗綅
</view>
- <view class="pop-btn" @click="select('2')">
- 2鍙风爜鍨涗綅
+ <view class="pop-btn" @click="select('119')">
+ 119鍙风爜鍨涗綅
</view>
</view>
</uni-popup>
@@ -195,14 +197,35 @@
findOrder() {
let _this = this
uni.request({
- url: `${_this.baseUrl}/order/search/orderNo/auth/v2`,
- header: { 'token': uni.getStorageSync('token') },
- data: { orderNo: _this.orderNo },
+ url: `${_this.baseUrl}/mobile/order/search/orderNo/auth/v2`,
+ header: {
+ 'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {orderNo: _this.orderNo},
method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200 && res.data) {
- _this.dataList = res.data
+ success(result) {
+ result = result.data
+ if (result.code === 200 && result.data) {
+ // for(let k of result.data[0].combMats) {
+ // _this.dataList.push(k)
+ // }
+ uni.navigateTo({
+ url: "../order/orderDetls",
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ success: function(res) {
+ res.eventChannel.emit('orderDetls', {
+ data: result.data[0].combMats
+ })
+ },
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ events: {
+ detl: function(data) {
+ _this.dataList.push(data.data)
+ },
+ },
+ });
+
} else {
uni.showToast({ title: res.msg, icon: "none", position: 'top' })
}
@@ -442,15 +465,16 @@
},
comb() {
let that = this;
- that.combCheck(that.palletizingNo,that.boxType,that.createTime);
+ that.combCheck(that.palletizingNo2,that.boxType,that.createTime);
if (that.checkFlag) {
return
}
uni.request({
- url: that.baseUrl + '/mobile/truss/auth',
+ url: that.baseUrl + '/mobile/truss/order/auth',
data: JSON.stringify({
+ orderNo: that.orderNo,
barcode: that.barcode,
- combMats: that.dataList
+ matList: that.dataList
}),
method: 'POST',
header: {
@@ -462,9 +486,6 @@
that.resst();
that.messageText = "閫�搴撴垚鍔�"
that.messageToggle('success')
- const innerAudioContext = uni.createInnerAudioContext();
- innerAudioContext.src = '/static/music/pakinOk.mp3';
- innerAudioContext.play()
} else if (res.code == 403) {
that.messageText = res.msg
that.messageToggle('error')
@@ -481,8 +502,8 @@
});
},
// 鎻愪氦鏍￠獙
- combCheck(palletizingNo,boxType,createTime) {
- if (palletizingNo === '') {
+ combCheck(palletizingNo2,boxType,createTime) {
+ if (palletizingNo2 === '') {
this.messageText = "璇锋坊鍔犵爜鍨涗綅"
this.messageToggle('error')
this.checkFlag = true;
@@ -494,33 +515,11 @@
this.checkFlag = true;
return
}
- if (createTime === '') {
- this.messageText = "璇锋坊鍔犲垱寤烘椂闂�"
- this.messageToggle('error')
- this.checkFlag = true;
- return
- }
if (this.dataList.length === 0) {
this.messageText = "璇锋坊鍔犻��搴撳晢鍝�"
this.messageToggle('error')
this.checkFlag = true;
return
- }
- for (let i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].anfme == 0 || this.dataList[i].anfme == '') {
- this.messageText = this.dataList[i].matnr + '閫�搴撴暟閲忎笉鑳戒负0'
- this.messageToggle('error')
- this.checkFlag = true;
- return
- }
- }
- for (let i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].anfme == 0 || this.dataList[i].anfme == '') {
- this.messageText = this.dataList[i].matnr + '閫�搴撴暟閲忎笉鑳戒负0'
- this.messageToggle('error')
- this.checkFlag = true;
- return
- }
}
this.checkFlag = false;
},
--
Gitblit v1.9.1