From ad1e4e950a4e961a41344e5847d47f91dabd0c29 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:22 +0800
Subject: [PATCH] Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswms-app
---
pages/AGV/CallEmptyCar.vue | 21 +++++++++++++++------
pages/AGV/CollectionInCall.vue | 28 ++++++++++++++++++++++------
pages.json | 6 +++---
3 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/pages.json b/pages.json
index 0033ea3..1897c62 100644
--- a/pages.json
+++ b/pages.json
@@ -39,13 +39,13 @@
{
"path": "pages/AGV/CollectionPakin",
"style": {
- "navigationBarTitleText": "闆嗚揣鍖虹粍鎵�"
+ "navigationBarTitleText": "SO/EO鍖虹粍鎵�"
}
},
{
"path": "pages/AGV/CollectionInCall",
"style": {
- "navigationBarTitleText": "闆嗚揣鍖哄叆搴�"
+ "navigationBarTitleText": "SO/EO鍖哄叆搴�"
}
},
{
@@ -75,7 +75,7 @@
{
"path": "pages/AGV/CallEmptyCar",
"style": {
- "navigationBarTitleText": "鍏ュ簱鍖哄懠鍙┖杞�"
+ "navigationBarTitleText": "SO/EO鍖哄懠鍙┖杞�"
}
},
{
diff --git a/pages/AGV/CallEmptyCar.vue b/pages/AGV/CallEmptyCar.vue
index 72ad6b3..d8292fc 100644
--- a/pages/AGV/CallEmptyCar.vue
+++ b/pages/AGV/CallEmptyCar.vue
@@ -2,7 +2,11 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">鍏ュ簱鍖�:</view>
+ <view class="code-decs">璧峰鍖�:</view>
+ <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="orgSite"></uni-combox>
+ </view>
+ <view class="item">
+ <view class="code-decs">缁堢偣绔�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="tarSite" :focus="barcodeFocus">
</view>
@@ -70,7 +74,7 @@
locNo: "",
orgSite: '',
tarSite: '',
- staList: ["e"],
+ staList: ["SO", "EO"],
}
},
onLoad() {
@@ -88,7 +92,7 @@
this.token = uni.getStorageSync('token');
},
mounted() {
- this.tarSite = uni.getStorageSync('tarSite')
+ // this.tarSite = uni.getStorageSync('tarSite')
},
methods: {
messageToggle(type) {
@@ -284,11 +288,16 @@
this.$refs.combConfirm.close()
},
comb() {
- uni.setStorageSync('tarSite', this.tarSite);
+ // uni.setStorageSync('tarSite', this.tarSite);
uni.vibrateShort();
let that = this;
+ if (that.orgSite === '') {
+ this.messageText = "璧峰鍖轰负绌�"
+ this.messageToggle('error')
+ return;
+ }
if (that.tarSite === '') {
- this.messageText = "鍏ュ簱鍖轰负绌�"
+ this.messageText = "缁堢偣绔欎负绌�"
this.messageToggle('error')
return;
}
@@ -343,7 +352,7 @@
resst() {
this.orgSite = ''
this.dataList = []
-
+ this.tarSite = ''
},
}
diff --git a/pages/AGV/CollectionInCall.vue b/pages/AGV/CollectionInCall.vue
index 9bc264f..695e5dd 100644
--- a/pages/AGV/CollectionInCall.vue
+++ b/pages/AGV/CollectionInCall.vue
@@ -9,6 +9,10 @@
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode">
</view>
+ <view class="item">
+ <view class="code-decs">鐩爣鍖�:</view>
+ <uni-combox :candidates="staList" placeholder="璇烽�夋嫨绔欑偣" v-model="tarSite"></uni-combox>
+ </view>
</view>
<view class="mat-list-title">
</view>
@@ -79,13 +83,13 @@
locNo: "",
orgSite: '',
tarSite: '',
- staList: [],
+ staList: ["EO", "SO"],
}
},
onLoad() {
let that = this
const eventChannel = this.getOpenerEventChannel();
- that.getSites()
+ // that.getSites()
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -260,11 +264,21 @@
this.$refs.combConfirm.close()
},
comb() {
- uni.setStorageSync('tarSite', this.tarSite);
+ // uni.setStorageSync('tarSite', this.tarSite);
uni.vibrateShort();
let that = this;
if (that.orgSite === '') {
- this.messageText = "浜х嚎绔欎负绌�"
+ this.messageText = "璧峰绔欎负绌�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.barcode === '') {
+ this.messageText = "鎵樼洏鐮佷负绌�"
+ this.messageToggle('error')
+ return;
+ }
+ if (that.tarSite === '') {
+ this.messageText = "鐩爣鍖轰负绌�"
this.messageToggle('error')
return;
}
@@ -272,7 +286,8 @@
url: that.baseUrl + '/mobile/collection/agv/call',
data: JSON.stringify({
orgSite: that.orgSite,
- barcode: that.barcode
+ barcode: that.barcode,
+ tarSite: that.tarSite
}),
method: 'POST',
header: {
@@ -319,7 +334,8 @@
resst() {
this.orgSite = ''
this.dataList = []
-
+ this.tarSite = ''
+ this.barcode = ''
},
}
--
Gitblit v1.9.1