From 23cde0fb91fa8466001f64bc160d4a698b85f041 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 三月 2024 13:31:15 +0800
Subject: [PATCH] #
---
pages/project/jmAGV/home.vue | 134 +++++++++++++++++++++++++++++++++-----------
1 files changed, 99 insertions(+), 35 deletions(-)
diff --git a/pages/project/jmAGV/home.vue b/pages/project/jmAGV/home.vue
index 45bfd9d..8e39df4 100644
--- a/pages/project/jmAGV/home.vue
+++ b/pages/project/jmAGV/home.vue
@@ -16,7 +16,7 @@
<view>
<uni-popup ref="revise" type="dialog">
<view class="popup">
- <view>{{text}}</view>
+ <view class="popup3-input-title">{{text}}</view>
<view class="button-nk" @click="upTray()">{{btnTitle1}}</view>
<view class="button-nk" @click="downTray()">{{btnTitle2}}</view>
<view v-show="outType" class="button-nk" @click="downTray1()">{{btnTitle3}}</view>
@@ -27,7 +27,7 @@
<view>
<uni-popup ref="numberPopup" type="dialog">
<view class="popup2">
- <view>涓婃灦鏁伴噺</view>
+ <view class="popup3-input-title">{{tipsTitle}}</view>
<view class="button-nk" @click="goUp(2)">2涓�</view>
<view class="button-nk" @click="goUp(4)">4涓�</view>
</view>
@@ -35,11 +35,22 @@
</view>
<view>
- <uni-popup ref="numberPopup" type="dialog">
- <view class="popup2">
- <view>涓婃灦鏁伴噺</view>
- <view class="button-nk" @click="goUp(2)">2涓�</view>
- <view class="button-nk" @click="goUp(4)">4涓�</view>
+ <uni-popup ref="inputPopup" type="dialog">
+ <view class="popup3">
+ <view class="popup3-input-title">{{tipsTitle}}</view>
+ <view class="popup3-input-box">
+ <text>{{desc}}:</text>
+ <view style="margin-left: 3rpx;">
+ <input type="text" v-model="code"/>
+ </view>
+ </view>
+ <view class="popup3-input-box" v-if="meterShow">
+ <text>绫虫暟:</text>
+ <view style="margin-left: 3rpx;">
+ <input type="text" v-model="meter"/>
+ </view>
+ </view>
+ <view class="button-nk" @click="confirm(2)">纭畾</view>
</view>
</uni-popup>
</view>
@@ -48,6 +59,7 @@
</template>
<script>
+import code from '../../../uni_modules/uview-ui/libs/config/props/code';
export default {
data() {
return {
@@ -87,6 +99,11 @@
type: '' ,
originLocal: '',
targetLocal: '',
+ code: '',
+ meter: '',
+ meterShow: '',
+ desc: '',
+ tipsTitle: ''
}
},
onShow() {
@@ -116,6 +133,7 @@
this.type = 'load', // 涓婃灦
this.originLocal = this.item.code,
this.targetLocal = this.item.traget
+ this.tipsTitle = '涓婃灦鏁伴噺'
this.numberPopup()
} else {
this.type = 'in' // 鍏ュ簱
@@ -129,48 +147,41 @@
this.type = 'unload', // 涓嬫灦
this.originLocal = this.item.traget,
this.targetLocal = this.item.code
+ this.tipsTitle = '涓嬫灦鏁伴噺'
this.numberPopup()
} else {
this.type = 'out1' // 鍑哄簱
this.originLocal = 'KW-C'
this.targetLocal = this.item.code
+ this.inputPopup()
}
},
downTray1() {
- let _this = this
- let type = '',originLocal = '',targetLocal = '';
if (this.item.type == 'foolr') {
- type = 'unload', // 涓嬫灦
- originLocal = this.item.traget,
- targetLocal = this.item.code
+ this.type = 'unload', // 涓嬫灦
+ this.originLocal = this.item.traget,
+ this.targetLocal = this.item.code
} else {
- type = 'out2' // 鍑哄簱
- originLocal = 'KW-C'
- targetLocal = this.item.code
+ this.type = 'out2' // 鍑哄簱
+ this.originLocal = 'KW-C'
+ this.targetLocal = this.item.code
+ this.inputPopup()
}
- // this.text = originLocal + targetLocal
- uni.request({
- url: `${_this.baseUrl}/agv/requestTask`,
- data: {
- originLocal: originLocal,
- targetLocal: targetLocal,
- type: type
- },
- header: { 'token': uni.getStorageSync('token') },
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- this.$refs.revise.close()
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "none", position: 'top' })
- } else {
- uni.showToast({ title: res.msg, icon: "none", position: 'top' })
- }
- }
- })
},
numberPopup() {
this.$refs.numberPopup.open('center')
+ },
+ inputPopup() {
+ if (this.type == 'out1') {
+ this.tipsTitle = '绌烘墭鐩樺嚭搴�'
+ this.desc = '鐗╂枡鐮�'
+ this.meterShow = false
+ } else {
+ this.tipsTitle = '婊℃墭鐩樺嚭搴�'
+ this.desc = '璁㈠崟鍙�'
+ this.meterShow = true
+ }
+ this.$refs.inputPopup.open('center')
},
// 涓� / 涓� 鏋舵暟閲�
goUp(num) {
@@ -194,6 +205,35 @@
type: this.type,
}
this.webServer(data)
+ setTimeout(()=>{
+ this.$refs.numberPopup.close()
+ },300)
+ },
+ confirm() {
+ let data = {}
+ if (this.type == 'out1') {
+ data = {
+ originLocal: this.originLocal,
+ targetLocal: this.targetLocal,
+ type: this.type,
+ matnr: this.code,
+ anfme: 4
+ }
+ } else {
+ data = {
+ originLocal: this.originLocal,
+ targetLocal: this.targetLocal,
+ type: this.type,
+ orderNo: this.code,
+ meter: this.meter
+ }
+ }
+ this.webServer(data)
+ setTimeout(()=>{
+ this.$refs.inputPopup.close()
+ this.code = ''
+ this.meter = ''
+ },300)
},
// 鎵�鏈夋湇鍔�
webServer(data) {
@@ -286,5 +326,29 @@
display: flex;
flex-direction: column;
justify-content: space-around;
+ border-radius: 10rpx;
+ }
+ .popup3 {
+ background-color: #eee;
+ width: 50vw;
+ padding: 0 10vw;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ border-radius: 10rpx;
+ color: #565656;
+ }
+ .popup3-input-title {
+ text-align: center;
+ margin: 10rpx;
+ font-size: 18px;
+ font-weight: bold;
+ }
+ .popup3-input-box {
+ display: flex;
+ border: 1px solid #cecece;
+ border-radius: 5rpx;
+ padding: 2rpx 10rpx;
+ margin: 20rpx;
}
</style>
--
Gitblit v1.9.1