From e4f7e87cd3d8a1e33d433636a189a905fa776f35 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 16:32:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop
---
pages/AGV/StartInTask.vue | 79 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/pages/AGV/StartInTask.vue b/pages/AGV/StartInTask.vue
index 3214c5b..d43db9e 100644
--- a/pages/AGV/StartInTask.vue
+++ b/pages/AGV/StartInTask.vue
@@ -5,7 +5,14 @@
<view class="title">鎺ラ┏绔�</view>
<input placeholder="璇锋壂鎻忔帴椹崇珯鏉＄爜" v-model="barcode" ></input>
<text class='cuIcon-search text-blue' @click="search"></text>
- </view>
+ </view>
+ <view class="cu-form-group">
+ <view class="title">鐩爣搴撳尯</view>
+ <view style="width: 75%;">
+ <uni-data-select style="min-width: 50%; max-width: 100%;" v-model="whAreaId" :localdata="range"
+ placement="bottom" @change="selChange"></uni-data-select>
+ </view>
+ </view>
</form>
<view class="flex solid-bottom padding-sm justify-between">
<view class="text-blue">瀹瑰櫒鐮�:{{container}}</view>
@@ -38,19 +45,9 @@
<text class="text-grey ">{{item.asnCode}}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
- <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- </view>
- <view class="action">
- <text class="text-grey">{{item.splrBatch}}</text>
- </view>
- </view>
-
- <view class="cu-item">
- <view class="content">
- <text class="text-black">搴撳瓨鎵规:</text>
+ <text class="text-black">鎵规:</text>
</view>
<view class="action">
<text class="text-grey ">{{item.batch}}</text>
@@ -73,30 +70,10 @@
<view class="cu-bar btn-group foot">
<button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm">瑙ｇ粦</button>
+ <button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm">鍚姩</button>
</view>
- <uni-popup ref="popup" class="cu-popup">
- <view class="popup-content">
- <view class="head">
- <text>鎺ㄨ崘</text>
- <text class='cuIcon-close text-red close' @click="close"></text>
- </view>
-
- <div class="body">
- <view class="cu-list grid col-3 no-border">
- <view class="item" v-for="el in range">
- <view class="cu-btn round sm" :class="[el===curCode?'bg-blue':'line-blue']"
- @click="itemChange(el)">{{el}}</view>
- </view>
- </view>
- </div>
-
- <view class="cu-bar btn-group ">
- <button class="cu-btn bg-blue shadow-blur" @click="popupSubmit">鎻愪氦</button>
- </view>
- </view>
- </uni-popup>
+
</view>
</template>
@@ -120,14 +97,20 @@
container: '',
list: [],
range: [],
- curCode: ''
+ curCode: '',
+ whAreaId:'',
+ repeatClick: false,
+
}
},
computed: {
...mapState('user', ['dynamicFields']),
},
mounted() {},
- methods: {
+ methods: {
+ selChange(val) {
+ uni.setStorageSync('whAreaId', val)
+ },
async search() {
let that = this
const {
@@ -141,7 +124,12 @@
if(data.list.length >0){
that.container = data.barcode
that.list = data.list
- }
+ }
+ that.range = data.warehouseAreasList.map(item => ({
+ value: item.id,
+ text: item.name
+ }));
+ that.whAreaId = data.area
} else {
uni.showToast({
title: msg,
@@ -183,17 +171,26 @@
})
return ;
}
+ if(this.whAreaId === '' || this.whAreaId ===null){
+ uni.showToast({
+ title: "鐩爣搴撳尯涓嶈兘涓虹┖",
+ icon: "none",
+ })
+ return ;
+ }
+ this.repeatClick = true
const {
code,
data,
msg
- } = await request('/AGV/staUnBind',{
- sta: this.barcode
+ } = await request('/AGV/task/start',{
+ sta: this.barcode,
+ area: this.whAreaId
}
)
if (code === 200) {
uni.showToast({
- title: '瑙ｇ粦鎴愬姛'
+ title: '鍚姩鎴愬姛'
})
this.clear()
} else {
@@ -202,7 +199,7 @@
icon: "none",
})
}
-
+ this.repeatClick = false
},
--
Gitblit v1.9.1