From 8e9c41fa816530bf97ce3c9ac0088e73b72f34c6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:03:45 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 20 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 9b93080..a4d6060 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -23,6 +23,7 @@
<view style="flex:3;text-align: right;">{{wrkMast.ioTitle}}</view>
</view>
<view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
+ <view>宸ヤ綔鐘舵��: {{wrkMast.wrkSts$}}</view>
<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
<view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
</view>
@@ -35,7 +36,7 @@
<view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
<view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
<view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
- <view>鏁伴噺:{{wrkDetl.anfme}}</view>
+ <view>鍑哄簱鏁伴噺:{{wrkDetl.anfme}}</view>
</view>
</view>
@@ -87,7 +88,25 @@
</view>
<view class="btn">
<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
- <view class="btn-right" @click="containerMoveOut()">鍏ュ簱</view>
+ <view class="btn-right" @click="containerMoveOut()">纭鍑哄簱</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="doContainerMoveOut2" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
+ <view class="popup-item">
+ <view class="popup-item-left">璐ф灦鐮�:</view>
+ <view class="popup-item-right"><input type="text" v-model="barcode"></view>
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
+ <view class="btn-right" @click="containerMoveOut2()">纭绂诲満</view>
</view>
</view>
</uni-popup>
@@ -141,9 +160,10 @@
<view class="buttom">
<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
- <!-- <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'out'">纭鍑哄簱</button> -->
- <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button><button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">璐ф灦绂诲満</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
+ <button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷ｆ枡</button>
<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
</view>
</view>
@@ -231,7 +251,7 @@
uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -256,7 +276,7 @@
_this.reloadStation()
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -295,7 +315,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -320,7 +340,7 @@
method: 'POST',
header: { 'token': uni.getStorageSync('token') },
success(res) {
- var res = result.data
+ var res = res.data
if (res.code === 200) {
setTimeout(()=> {
_this.containerType = ''
@@ -329,7 +349,7 @@
uni.showToast({ title: '鍛煎彨鎴愬姛', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -349,7 +369,7 @@
_this.selects = res.data
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -411,7 +431,7 @@
}
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -436,7 +456,7 @@
_this.wrkDetls = res.data.records
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -462,7 +482,7 @@
_this.btnType = 'start'
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -494,9 +514,61 @@
uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
+ },
+
+ // 鍏ㄦ澘鍑哄簱 瀹瑰櫒绂诲満
+ doContainerMoveOut2() {
+ this.$refs.doContainerMoveOut2.open()
+ },
+ containerMoveOutClose() {
+ this.$refs.doContainerMoveOut2.close()
+ },
+ containerMoveOut2() {
+ let _this = this
+ let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
+ uni.request({
+ url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut2`,
+ data: JSON.stringify(devNo),
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.$refs.doContainerMoveOut2.close()
+ setTimeout(()=> {
+ _this.barcode = ''
+ _this.reloadStation()
+ },1000)
+ uni.showToast({ title: '绂诲満瀹屾垚', icon: "success", position: 'top' })
+ } 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' })
+ }
+ }
+ })
+ },
+ // 鍐嶆鎷ｆ枡
+ doPickIn2() {
+ let _this = this
+ let item = this.wrkMast
+ uni.navigateTo({
+ url: './pickAgain',
+ success(res) {
+ res.eventChannel.emit('item', {
+ item: item,
+ wrkDetls: _this.wrkDetls,
+ })
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ _this.reloadStation()
}
}
})
@@ -522,7 +594,7 @@
_this.reloadStation()
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -550,7 +622,7 @@
uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
}
@@ -565,13 +637,13 @@
@import url('../../../static/css/common/order.css');
.station {
- font-size: 18px;
- padding: 24rpx;
+ font-size: 15px;
+ padding: 18rpx;
}
.station-title {
- font-size: 32px;
+ font-size: 28px;
font-weight: bold;
- padding: 24rpx 0;
+ padding: 18rpx 0;
}
.station-barcode {
font-size: 24px;
--
Gitblit v1.9.1