From e376c99d80df50257b80a0da99865e80cf6b55c5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 13 十二月 2025 11:09:54 +0800
Subject: [PATCH] no message
---
pages/outbound/wavePickItem.vue | 16 ++---
pages/listing/matnrPalletising.vue | 25 ++++++-
pages/outbound/PickItemDetl.vue | 106 +++++++++++++++++++++++++++--------
checkOrder.vue | 1
common/request.js | 3
5 files changed, 108 insertions(+), 43 deletions(-)
diff --git a/checkOrder.vue b/checkOrder.vue
index 512783e..b3c71d4 100644
--- a/checkOrder.vue
+++ b/checkOrder.vue
@@ -14,7 +14,6 @@
<view class="cu-list det menu sm-border padding">
<block v-for="(item, index) in list" :key="index">
<view class="cu-list det menu " @click="clickTaskItem(index)">
-
<view class="cu-bar bg-white solid-bottom margin-top-sm">
<view class="action">
diff --git a/common/request.js b/common/request.js
index d0bc13c..b3842e2 100644
--- a/common/request.js
+++ b/common/request.js
@@ -14,8 +14,7 @@
}
return new Promise((resolve, reject) => {
const token = uni.getStorageSync('token');
- // const URL = 'http://47.76.147.249:8080/rsf-server/pda' + url;
- // const URL = 'http://test.zoneyung.net:8080/rsf-server/pda' + url;
+ // const URL = 'http://192.168.4.34:8085/rsf-server/pda' + url;
const URL = 'http://127.0.0.1:8085/rsf-server/pda' + url;
uni.request({
url: URL,
diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index 1460548..10ecc4e 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -15,6 +15,8 @@
<view class="cu-form-group">
<view class="title">绁ㄥ彿</view>
<input placeholder="璇锋壂鎻忕幇鍝佺エ鍙�" v-model="fieldsIndex" @input="search()" focus></input>
+ <text class='cuIcon-close text-gray margin-right-xs' v-show="fieldsIndex!==''"
+ @click="clearCode"></text>
<!-- <text class='cuIcon-search text-blue' @click="search"></text> -->
</view>
<view class="cu-form-group">
@@ -169,11 +171,20 @@
}
that.getDetl(param);
},
-
+ clearCode() {
+ this.fieldsIndex = ''
+ },
async getDetl(req) {
let that = this;
-
- const { code, data, msg } = await request('/asnOrderItem/trackCode', {
+ uni.showLoading({
+ title: "鍔犺浇涓�...",
+ mask: true
+ })
+ const {
+ code,
+ data,
+ msg
+ } = await request('/asnOrderItem/trackCode', {
matnrCode: that.matnrCode,
asnCode: that.asnCode,
code: that.asnCode,
@@ -195,7 +206,7 @@
position: 'top'
})
}
- // uni.hideLoading();
+ uni.hideLoading();
},
async getList() {
@@ -312,7 +323,11 @@
};
});
- const { code, data, msg } = await request('/waitPakin/merge', {
+ const {
+ code,
+ data,
+ msg
+ } = await request('/waitPakin/merge', {
items: newArr,
isHalf: this.isHalf,
barcode: this.container,
diff --git a/pages/outbound/PickItemDetl.vue b/pages/outbound/PickItemDetl.vue
index 462bdc5..4862b8f 100644
--- a/pages/outbound/PickItemDetl.vue
+++ b/pages/outbound/PickItemDetl.vue
@@ -15,12 +15,13 @@
<view class="cu-form-group" v-show="!isconfirm">
<view class="title">绁ㄥ彿锛�</view>
<input placeholder="璇锋壂鎻忕エ鍙�" v-model="fieldsIndex" focus @input="search()"></input>
- <text class='cuIcon-close text-gray margin-right-xs' v-show="fieldsIndex!==''" @click="clearCode"></text>
+ <text class='cuIcon-close text-gray margin-right-xs' v-show="fieldsIndex!==''"
+ @click="clearCode"></text>
</view>
</form>
</view>
<view class="cu-list det menu sm-border">
- <view class="cu-list det menu noMargin cyan" v-for="(item2,index2) in list" >
+ <view class="cu-list det menu noMargin cyan" v-for="(item2,index2) in list">
<view class="cu-item">
<view class="content">
<text class="text-gray">{{index2+1}}.</text>
@@ -45,7 +46,7 @@
</view>
</view>
</view>
- <view class="cu-item" v-show="item2.anfme !== item2.qty">
+ <view class="cu-item">
<view class="content">
<view class="cu-form-group padding-lr-0">
<view class="title text-blue"><text class="text-red text-xl vertical-middle">*</text>鎷ｏ細
@@ -60,6 +61,13 @@
<view class="cu-bar btn-group foot" v-show="!isconfirm">
<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
<button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="complete">鎷ｈ揣瀹屾垚</button>
+ </view>
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="alertDialog" type="dialog">
+ <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" title="璀﹀憡" :content="dialogMsg"
+ @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
+ </uni-popup>
</view>
</view>
</template>
@@ -81,6 +89,8 @@
list: [],
isconfirm: false,
fieldsIndex: '',
+ dialogMsg: '',
+ msgType: 'warn',
max: 99999999,
orderDetl: {},
repeatClick: false,
@@ -106,6 +116,62 @@
})
},
methods: {
+ dialogConfirm() {
+ let that = this
+ if (that.barcode === '' || that.barcode === null) {
+ uni.showToast({
+ title: "瀹瑰櫒鍙蜂负绌�",
+ icon: "error",
+ })
+ return;
+ }
+ if (that.list === [] || that.list.length === 0) {
+ uni.showToast({
+ title: "鎷ｈ揣鏄庣粏涓虹┖",
+ icon: "error",
+ })
+ return;
+ }
+ this.commpletePick()
+ },
+
+ async commpletePick() {
+ let that = this
+ uni.showLoading({
+ title: "鎷ｈ揣涓�...",
+ mask: true
+ })
+ this.repeatClick = true
+ const {
+ code,
+ data,
+ msg
+ } = await request('/wave/pick/item', {
+ barcode: that.orderDetl.barcode,
+ orderId: that.orderDetl.orderId,
+ taskItems: that.list
+ })
+ if (code === 200) {
+ uni.showToast({
+ title: msg,
+ icon: "none",
+ })
+ uni.navigateBack()
+ that.clear()
+ uni.hideLoading();
+ } else {
+ uni.showToast({
+ title: msg,
+ icon: "none",
+ })
+ uni.hideLoading();
+ }
+ this.repeatClick = false
+ },
+
+ dialogClose() {
+ console.log('鐐瑰嚮鍏抽棴')
+ },
clear() {
this.fieldsIndex = ''
this.list = []
@@ -115,10 +181,14 @@
},
async search() {
let that = this;
- // if(this.fieldsIndex === '' || this.fieldsIndex.length < 30){
+ // if(this.fieldsIndex === '' || this.fieldsIndex.length < 29){
// return ;
// }
- const { code, data, msg } = await request('/wave/order/items', {
+ const {
+ code,
+ data,
+ msg
+ } = await request('/wave/order/items', {
barcode: this.orderDetl.barcode,
orderId: that.orderDetl.orderId,
fieldsIndex: that.fieldsIndex
@@ -147,9 +217,8 @@
position: 'top'
})
}
-
},
- async complete() {
+ complete() {
let that = this
if (that.barcode === '' || that.barcode === null) {
uni.showToast({
@@ -165,25 +234,12 @@
})
return;
}
- this.repeatClick = true
- const { code, data, msg } = await request('/wave/pick/item', {
- barcode: that.orderDetl.barcode,
- orderId: that.orderDetl.orderId,
- taskItems: that.list
- })
- if (code === 200) {
- uni.showToast({
- title: msg,
- icon: "none",
- })
- that.clear()
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- })
+ if (that.orderDetl.qty >= that.orderDetl.anfme) {
+ this.dialogMsg = "鍗曟嵁锛�" + that.orderDetl.orderCode + "锛屽凡瓒呭嚭鍗曟嵁闇�姹傦紝鏄惁纭瓒呭嚭鎷ｆ枡锛侊紒"
+ this.$refs.alertDialog.open()
+ return;
}
- this.repeatClick = false
+ this.commpletePick()
},
}
}
diff --git a/pages/outbound/wavePickItem.vue b/pages/outbound/wavePickItem.vue
index be72aea..4134459 100644
--- a/pages/outbound/wavePickItem.vue
+++ b/pages/outbound/wavePickItem.vue
@@ -97,6 +97,9 @@
})
},
+ onShow() {
+ this.search()
+ },
methods: {
//鐐瑰嚮浜嬩欢
clickTaskItem(index) {
@@ -125,9 +128,9 @@
async search() {
let that = this;
this.list = []
- // if(this.barcode === '' || this.barcode ===null){
- // return ;
- // }
+ if (that.barcode == null || that.barcode.length < 1 ) {
+ return;
+ }
const {
code,
data,
@@ -165,13 +168,6 @@
},
async complete() {
let that = this
- if (that.barcode === '' || that.barcode === null) {
- uni.showToast({
- title: "瀹瑰櫒鍙蜂负绌�",
- icon: "error",
- })
- return;
- }
if (that.list === [] || that.list.length === 0) {
uni.showToast({
title: "鎷ｈ揣鏄庣粏涓虹┖",
--
Gitblit v1.9.1