From 30f51a9b64a7db841f1659b8a06666c38d81331a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 12 一月 2026 12:48:30 +0800
Subject: [PATCH] #
---
pages/listing/matnrPalletising.vue | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/pages/listing/matnrPalletising.vue b/pages/listing/matnrPalletising.vue
index a054a93..215aaea 100644
--- a/pages/listing/matnrPalletising.vue
+++ b/pages/listing/matnrPalletising.vue
@@ -150,7 +150,7 @@
</view>
</view>
<view class="modal-footer">
- <button class="modal-btn modal-btn-cancel" @click="closeAgvInputModal">鍙栨秷</button>
+ <button class="modal-btn modal-btn-cancel" @click="handleAgvNo">涓嶉渶瑕�</button>
<button class="modal-btn modal-btn-confirm" @click="confirmAgvStation">纭畾</button>
</view>
</view>
@@ -383,7 +383,7 @@
return ;
}
// 鏄剧ずAGV纭寮圭獥
- this.showAgvModal = true;
+ this.showAgvInputModal = true;
},
confirm2() {
if(this.container === '' || this.container === null){
@@ -402,45 +402,8 @@
})
return ;
}
- this.submitConfirm2();
- },
- // 鎻愪氦缁勬墭璇锋眰
- async submitConfirm2() {
- this.repeatClick = true
- const newArr = this.list.map(item => {
-
- return {
- ...item,
- anfme: item.anfme === null ? 0 : +item.anfme,
- };
- });
-
- const requestData = {
- items: newArr,
- barcode: this.container,
- };
- const {
- code,
- data,
- msg
- } = await request('/waitPakin/merge', requestData)
- if (code === 200) {
- uni.showToast({
- title: '缁勭洏鎴愬姛'
- })
- this.list = []
- this.barcode = ''
- this.container = ''
- this.isconfirm = false
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- position: 'top'
- })
- }
- this.repeatClick = false
- },
+ this.submitConfirm('');
+ },
// 鍏抽棴AGV纭寮圭獥
closeAgvModal() {
this.showAgvModal = false;
@@ -492,14 +455,17 @@
// 濡傛灉鏈堿GV绔欑偣锛屾坊鍔犲埌璇锋眰鍙傛暟涓�
if (agvStation) {
- requestData.agvStation = agvStation;
+ requestData.staNo = agvStation;
+ requestData.agvSign = 1;
+ }else{
+ requestData.agvSign = 0;
}
const {
code,
data,
msg
- } = await request('/waitPakin/merge/v2', requestData)
+ } = await request('/waitPakin/merge', requestData)
if (code === 200) {
uni.showToast({
title: '缁勭洏鎴愬姛'
--
Gitblit v1.9.1