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/checkLocDetl.vue | 134 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 2 deletions(-)
diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
index a33c5b2..3dc4f02 100644
--- a/pages/phyz/checkLocDetl/checkLocDetl.vue
+++ b/pages/phyz/checkLocDetl/checkLocDetl.vue
@@ -32,6 +32,24 @@
</view>
</view>
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="check" 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="checkClose">鍙栨秷</view>
+ <view class="btn-right" @click="checkConfirm()">纭</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+
</view>
</template>
@@ -41,14 +59,16 @@
return {
baseUrl: '',
token: '',
+ barcode: '',
locNo: '123123',
row1: '',
bay1: '',
lev1: '',
- dataList: []
+ dataList: [],
+ item: ''
}
},
- onLoad() {
+ onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.getLocMastList()
@@ -109,14 +129,58 @@
k['color'] = 'locSts-X'
} else if (k.locSts == 'Q') {
k['color'] = 'locSts-Q'
+ } else if (k.locSts == 'P') {
+ k['color'] = 'locSts-P'
} else if (k.locSts == 'X') {
k['color'] = 'locSts-X'
}
}
_this.dataList = res.data.records
+ } 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(e) {
+ this.locNo = e.locNo
+ this.item = e
+ if (e.locSts == 'S' || e.locSts == 'R') {
+ uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
+ return
+ }
+ this.$refs.check.open()
+ },
+ checkClose() {
+ this.$refs.check.close()
+ },
+ checkConfirm() {
+ let _this = this
+ let param = {
+ barcode : _this.barcode,
+ locNo : _this.locNo,
+ item: _this.item
+ }
+ uni.navigateTo({
+ url: "./locDetl",
+ success: function(res) {
+ _this.$refs.check.close()
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('item', {
+ item: param
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ _this.$refs.check.close()
+ _this.getLocMastList()
+ }
+ },
+ });
}
}
@@ -165,4 +229,70 @@
.locSts-X {
background-color: #767676;
}
+
+ .popup {
+ width: 80vw;
+ min-height: 100rpx;
+ background-color: #FFF;
+ border-radius: 25rpx;
+ position: relative;
+ }
+ .title {
+ height: 100rpx;
+ line-height: 100rpx;
+ width: 100%;
+ color: #606266;
+ text-align: center;
+ font-size: 16px;
+ }
+ .popup-item {
+ position: relative;
+ height: 80rpx;
+ line-height: 80rpx;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ }
+ .popup-item-left {
+ width: 16vw;
+ padding-right: 20rpx;
+ text-align: right;
+ color: #606266;
+ }
+ .popup-item-right {
+ display: flex;
+ align-items: center;
+ width: 50vw;
+ height: 50rpx;
+ padding: 2px 5px;
+ border: 1px solid #E4E7ED;
+ border-radius: 5rpx;
+ }
+ .popup-item-right input{
+ color: #606266;
+ }
+ .btn {
+ display: flex;
+ height: 90rpx;
+ margin-top: 20rpx;
+ border-top: 1px solid #DCDFE6;
+ justify-content: center;
+ align-items: center;
+ }
+ .btn-left {
+ display: flex;
+ flex: 1;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ color: #606266;
+ border-right: 1px solid #DCDFE6;
+ }
+ .btn-right {
+ display: flex;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ color: #409EFF;
+ }
</style>
--
Gitblit v1.9.1