From 6a5799976fe6f85ef93000db76875a036f208406 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 16 四月 2024 17:06:23 +0800 Subject: [PATCH] # --- pages/phyz/stationManage/stationDetl.vue | 52 ++++++++++++++++++++++++++ pages/phyz/orderOut/orderCheck.vue | 2 pages/home/orderManage.vue | 32 ++++++++-------- 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue index a9074ad..94aa288 100644 --- a/pages/home/orderManage.vue +++ b/pages/home/orderManage.vue @@ -27,28 +27,28 @@ elements2: [ { title: '閲囪喘鍏ュ簱鍗�', - name: 'outOrder', + name: 'outPakin', color: 'blue', // cuIcon: 'pullup', url: `/phyz/order/pakinOrderSelect` }, + // { + // title: '鍑哄簱鍗�', + // name: 'outOrder', + // color: 'blue', + // // cuIcon: 'pullup', + // url: `/phyz/order/outOrder` + // }, + // { + // title: '鍏ュ簱鍗曟祴璇曠敤', + // name: 'pakin', + // color: 'blue', + // // cuIcon: 'pullup', + // url: `/phyz/order/purchaseOrder` + // }, { - title: '鍑哄簱鍗�', + title: '璁㈠崟鍑哄簱', name: 'outOrder', - color: 'blue', - // cuIcon: 'pullup', - url: `/phyz/order/outOrder` - }, - { - title: '鍏ュ簱鍗曟祴璇曠敤', - name: 'pakin', - color: 'blue', - // cuIcon: 'pullup', - url: `/phyz/order/purchaseOrder` - }, - { - title: '鍑哄簱鍗曟祴璇曠敤', - name: 'pakin', color: 'blue', // cuIcon: 'pullup', url: `/phyz/orderOut/orderOutSelect` diff --git a/pages/phyz/orderOut/orderCheck.vue b/pages/phyz/orderOut/orderCheck.vue index 7d706cb..45bb9af 100644 --- a/pages/phyz/orderOut/orderCheck.vue +++ b/pages/phyz/orderOut/orderCheck.vue @@ -63,7 +63,7 @@ count: 0 } }, - onLoad() { + onShow() { let _this = this this.baseUrl = uni.getStorageSync('baseUrl'); this.token = uni.getStorageSync('token'); diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue index 82c3684..3321b55 100644 --- a/pages/phyz/stationManage/stationDetl.vue +++ b/pages/phyz/stationManage/stationDetl.vue @@ -95,6 +95,24 @@ <!-- 寮圭獥 --> <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="containerMoveOut()">鍏ュ簱</view> + </view> + </view> + </uni-popup> + </view> + + <!-- 寮圭獥 --> + <view> <uni-popup ref="doPickIn" type="dialog"> <view class="popup"> <!-- 鏍囬 --> @@ -141,6 +159,7 @@ <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="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="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button> @@ -500,6 +519,39 @@ } }) }, + + // 鍏ㄦ澘鍑哄簱 瀹瑰櫒绂诲満 + doContainerMoveOut2() { + this.$refs.doContainerMoveOut2.open() + }, + containerMoveOutClose() { + this.$refs.doContainerMoveOut2.close() + }, + containerMoveOut() { + 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.doContainerMoveOut.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' }) + } + } + }) + }, // 鎷f枡鍑哄簱 纭鍚庡洖搴� doPickIn() { this.$refs.doPickIn.open() -- Gitblit v1.9.1