From 16b692b3ea44779cd15f730b5376ef12b39a9e13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 15:06:44 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/phyz/checkLocDetl/locDetl.vue | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
index d5d2dd6..9dbab99 100644
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ b/pages/phyz/checkLocDetl/locDetl.vue
@@ -53,7 +53,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" type="primary" @click="changeSts('warn')">鏇存敼搴撲綅鐘舵��</button>
- <button size="mini" type="primary" @click="agvStart('warn')">绾犳搴撲綅</button>
+ <button size="mini" type="primary" @click="changeStart('warn')">绾犳搴撲綅</button>
</view>
</view>
</template>
@@ -79,7 +79,7 @@
data: []
},
dataList: [],
- locDetlShow: false,
+ locDetlShow: true,
isOpen: false,
locSts: '',
locSts2: '',
@@ -120,35 +120,40 @@
res = res.data
console.log(res);
if (res.code === 200) {
- _this.dataList = res.data.containerCode
- if (res.data.containerCode[0].locNo) {
- _this.containerDetl.locNo = res.data.containerCode[0].locNo
- _this.containerDetl.barcode = res.data.containerCode[0].suppCode
- _this.containerDetl.count = res.data.containerCode.length
- _this.containerDetl.data = res.data.containerCode
+ if (res.data.containerCode.length > 0) {
+ _this.dataList = res.data.containerCode
+ if (res.data.containerCode[0].locNo) {
+ _this.containerDetl.locNo = res.data.containerCode[0].locNo
+ _this.containerDetl.barcode = res.data.containerCode[0].suppCode
+ _this.containerDetl.count = res.data.containerCode.length
+ _this.containerDetl.data = res.data.containerCode
+ }
}
+
if (res.data.locNo.length > 0) {
- if (res.data.containerCode[0].locNo == res.data.locNo[0].locNo
- && res.data.containerCode[0].suppCode == res.data.locNo[0].suppCode) {
- _this.locDetlShow = false
- } else {
- _this.locDetlShow = true
- _this.locDetl.locNo = res.data.locNo[0].locNo
- _this.locDetl.barcode = res.data.locNo[0].suppCode
- _this.locDetl.count = res.data.locNo.length
- _this.locDetl.data = res.data.locNo
- }
-
+ _this.locDetl.locNo = res.data.locNo[0].locNo
+ _this.locDetl.barcode = res.data.locNo[0].suppCode
+ _this.locDetl.count = res.data.locNo.length
+ _this.locDetl.data = res.data.locNo
}
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
}
})
},
goToLocDetl(item) {
let _this = this
+ if (item.data.length <= 0) {
+ uni.showToast({ title: '娌℃湁搴撳瓨', icon: "error", position: 'top' })
+ return
+ }
uni.navigateTo({
url: "./locDetlList",
success: function(res) {
@@ -178,6 +183,19 @@
changeCount() {
let _this = this
_this.sourceLoc.locSts = this.locSts2
+ let barcode = _this.barcode
+ if (this.locSts2 == 'O') {
+ barcode = ''
+ }
+ let param = {
+ locNo: _this.sourceLoc.locNo,
+ locSts: _this.sourceLoc.locSts,
+ barcode: _this.barcode,
+ row1: _this.sourceLoc.row1,
+ bay1: _this.sourceLoc.bay1,
+ lev1: _this.sourceLoc.lev1,
+ floor: _this.sourceLoc.floor
+ }
Object.keys(_this.sourceLoc).forEach(function(key){
if (_this.sourceLoc[key] == null) {
_this.sourceLoc[key] = ''
@@ -189,10 +207,43 @@
'token': uni.getStorageSync('token'),
'content-type': 'application/x-www-form-urlencoded'
},
- data: _this.sourceLoc,
+ data: param,
method: 'POST',
success(res) {
res = res.data
+ if (res.code === 200) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ _this.$refs.chageDetl.close()
+ setTimeout(()=> {
+ uni.navigateBack()
+ },1000)
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
+ },
+ changeStart() {
+ let _this = this
+ let param = {locNo:_this.locNo,containerCode: _this.barcode}
+ uni.request({
+ url: `${_this.baseUrl}/agvMobile/update/detl/v1`,
+ data: param,
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res);
+ if (res.code === 200) {
+
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
}
})
}
--
Gitblit v1.9.1