From 13b2f5bba08f898db67dd13d94ae8e558ed06244 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 05 二月 2025 11:18:42 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/confirmProcessed.vue | 29 ++++++++++++++
pages/phyz/order/preview.vue | 2
pages/phyz/orderOut/orderCheck.vue | 23 +++++++++--
pages/phyz/comOrder/checkOut.vue | 23 +++++++++--
pages/phyz/processOrder/orderCheck.vue | 23 +++++++++--
5 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/pages/phyz/comOrder/checkOut.vue b/pages/phyz/comOrder/checkOut.vue
index 467262d..50f8a52 100644
--- a/pages/phyz/comOrder/checkOut.vue
+++ b/pages/phyz/comOrder/checkOut.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <view class="list shop-car" v-for="item in dataList">
+ <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
<view class="list-left">
<view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
<view>搴撲綅锛歿{item.locNo}}</view>
@@ -18,13 +18,14 @@
</view>
<view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">鍑哄簱绔欙細
- <view class="dropdown" @click="toggleDropdown(item)">
+ <!-- @click="toggleDropdown(item)" -->
+ <view class="dropdown" >
<!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
+ <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
+ <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
<view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view>
+ </scroll-view> -->
</view>
</view>
<button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
@@ -115,6 +116,17 @@
selected(option,item) {
item.agvStaNo = option
},
+ staInput(item,items,index) {
+ var flag = false
+ for (let k of items) {
+ if (k == item) flag = true
+ }
+ if(!flag) {
+ setTimeout(() => {
+ this.dataList[index].agvStaNo = ''
+ }, 100);
+ }
+ },
// 璁㈠崟鏄庣粏
getPakoutList(ids,locNo) {
let _this = this
@@ -130,6 +142,7 @@
if (k.locNo != null) {
k['isOpen'] = false
k['count'] = k.anfme
+ k.agvStaNo = ''
k.anfme = 0
if (_this.orderType == 'bcp') {
if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
diff --git a/pages/phyz/order/preview.vue b/pages/phyz/order/preview.vue
index 8dd7c69..49163a9 100644
--- a/pages/phyz/order/preview.vue
+++ b/pages/phyz/order/preview.vue
@@ -22,7 +22,7 @@
<view class="card-id">{{i + 1}}</view>
<view>璐т綅锛歿{item.locNo}}</view>
<view style="display: flex;">鍑哄簱绔欙細
- <view class="dropdown" @click="toggleDropdown(item)">
+ <view class="dropdown" >
<input type="text" style="width: 270rpx;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�">
<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
<scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
diff --git a/pages/phyz/orderOut/orderCheck.vue b/pages/phyz/orderOut/orderCheck.vue
index 8322a53..bc572f4 100644
--- a/pages/phyz/orderOut/orderCheck.vue
+++ b/pages/phyz/orderOut/orderCheck.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <view class="list shop-car" v-for="item in dataList">
+ <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
<view class="list-left">
<view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
<view>搴撲綅锛歿{item.locNo}}</view>
@@ -18,13 +18,14 @@
</view>
<view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">鍑哄簱绔欙細
- <view class="dropdown" @click="toggleDropdown(item)">
+ <!-- @click="toggleDropdown(item)" -->
+ <view class="dropdown" >
<!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
+ <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
+ <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
<view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view>
+ </scroll-view> -->
</view>
</view>
<button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
@@ -120,6 +121,17 @@
selected(option,item) {
item.agvStaNo = option
},
+ staInput(item,items,index) {
+ var flag = false
+ for (let k of items) {
+ if (k == item) flag = true
+ }
+ if(!flag) {
+ setTimeout(() => {
+ this.dataList[index].agvStaNo = ''
+ }, 100);
+ }
+ },
// 璁㈠崟鏄庣粏
getPakoutList(ids,bcp) {
let _this = this
@@ -135,6 +147,7 @@
if (k.locNo != null) {
k['isOpen'] = false
k['count'] = k.anfme
+ k.agvStaNo = ''
k.anfme = 0
if (_this.orderType == 'bcp') {
if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
diff --git a/pages/phyz/processOrder/orderCheck.vue b/pages/phyz/processOrder/orderCheck.vue
index aa79992..02c7f8e 100644
--- a/pages/phyz/processOrder/orderCheck.vue
+++ b/pages/phyz/processOrder/orderCheck.vue
@@ -1,6 +1,6 @@
<template>
<view>
- <view class="list shop-car" v-for="item in dataList">
+ <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
<view class="list-left">
<view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
<view>搴撲綅锛歿{item.locNo}}</view>
@@ -18,13 +18,14 @@
</view>
<view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">鍑哄簱绔欙細
- <view class="dropdown" @click="toggleDropdown(item)">
+ <!-- @click="toggleDropdown(item)" -->
+ <view class="dropdown" >
<!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
+ <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
+ <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
<view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view>
+ </scroll-view> -->
</view>
</view>
<button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
@@ -115,6 +116,17 @@
selected(option,item) {
item.agvStaNo = option
},
+ staInput(item,items,index) {
+ var flag = false
+ for (let k of items) {
+ if (k == item) flag = true
+ }
+ if(!flag) {
+ setTimeout(() => {
+ this.dataList[index].agvStaNo = ''
+ }, 100);
+ }
+ },
// 璁㈠崟鏄庣粏
getPakoutList(ids,locNo) {
let _this = this
@@ -130,6 +142,7 @@
if (k.locNo != null) {
k['isOpen'] = false
k['count'] = k.anfme
+ k.agvStaNo = ''
k.anfme = 0
if (_this.orderType == 'bcp') {
if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
diff --git a/pages/phyz/stationManage/confirmProcessed.vue b/pages/phyz/stationManage/confirmProcessed.vue
index a855721..54aca57 100644
--- a/pages/phyz/stationManage/confirmProcessed.vue
+++ b/pages/phyz/stationManage/confirmProcessed.vue
@@ -77,6 +77,12 @@
<view class="popup-item-left">绔欑偣鍙�:</view>
<view class="popup-item-right"><input type="text" v-model="devNo"></view>
</view>
+ <view class="popup-item">
+ <view class="popup-item-left">鐩爣妤煎眰:</view>
+ <view class="popup-item-right" style="border: none;">
+ <uni-combox style="height: 50rpx;" :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor">
+ </uni-combox></view>
+ </view>
<view class="btn">
<button class="btn-left" @click="processedClose">鍙栨秷</button>
<button class="btn-right" @click="processedConfirm()" :disabled="processedDis">鍔犲伐瀹屾垚</button>
@@ -99,6 +105,8 @@
baseUrl: '',
token: '',
dataList: [],
+ floorList:['浜屽巶','涓夊巶'],
+ floor: '',
count: 0,
containerType: '',
isOpen: true,
@@ -146,6 +154,15 @@
if (res.code === 200) {
for (let k of res.data.records) {
k['maxCount'] = k.anfme
+ if (k.threeCode) {
+ if (k.threeCode.includes("B")) {
+ _this.floor = '浜屽巶'
+ } else if (k.threeCode.includes("G")) {
+ _this.floor = '涓夊巶'
+ } else {
+ _this.floor = ''
+ }
+ }
}
_this.dataList = res.data.records
} else if (res.code == 403) {
@@ -164,12 +181,22 @@
this.$refs.process.close()
},
processedConfirm() {
+ let factor = ''
+ if (!this.floor) {
+ uni.showToast({ title: '璇烽�夋嫨妤煎眰', icon: "error", position: 'top' })
+ return
+ }
+ if (this.floor == '浜屽巶') {
+ factor = 'B'
+ } else if (this.floor == '涓夊巶') {
+ factor = 'G'
+ }
this.processedDis = true
let that = this
uni.request({
url: that.baseUrl + '/agvMobile/hand/control/processed',
header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList},
+ data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList,factory: factor},
method: 'POST',
success(result) {
that.processedDis = false
--
Gitblit v1.9.1