From 7cd5d552d48389b70328ab2804fcb5ef3f023ec9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 11 七月 2023 13:16:00 +0800
Subject: [PATCH] #
---
pages/AGV/AGVPakinOn.vue | 10 ++++-
pages/AGV/AGVStart.vue | 21 +++++++++-
pages/AGV/AGVPakinBing.vue | 24 ++++++------
pages/AGV/AGVPakin.vue | 26 +++++++++----
4 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/pages/AGV/AGVPakin.vue b/pages/AGV/AGVPakin.vue
index ba29273..7ba522e 100644
--- a/pages/AGV/AGVPakin.vue
+++ b/pages/AGV/AGVPakin.vue
@@ -27,7 +27,7 @@
<view class="left-item">{{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
+ <view class="desc">鏂欏彿锛�</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
@@ -46,12 +46,12 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
@@ -76,20 +76,20 @@
<!-- 鏍囬 -->
<view class="title">淇敼</view>
<view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-left">鏂欏彿:</view>
<view class="popup-item-right">
<input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <!-- <view class="popup-item">
+ <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="popup-item">
+ </view>
+ <!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -207,6 +207,13 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ // 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
+ if (that.dataList.length >= 1) {
+ this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+ this.messageToggle('warn')
+ that.matnr = ''
+ return
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
@@ -451,6 +458,9 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+ .list:first-child {
+ margin-top: 360rpx;
+ }
.code {
width: 100%;
position: fixed;
diff --git a/pages/AGV/AGVPakinBing.vue b/pages/AGV/AGVPakinBing.vue
index 0f20eed..88b9c10 100644
--- a/pages/AGV/AGVPakinBing.vue
+++ b/pages/AGV/AGVPakinBing.vue
@@ -27,7 +27,7 @@
<view class="left-item">{{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
+ <view class="desc">鏂欏彿锛�</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
@@ -46,12 +46,12 @@
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
- <view class="list-left-item">
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
@@ -66,7 +66,7 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">涓婃灦</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">缁戝畾</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -76,20 +76,20 @@
<!-- 鏍囬 -->
<view class="title">淇敼</view>
<view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
+ <view class="popup-item-left">鏂欏彿:</view>
<view class="popup-item-right">
<input type="text" v-model="matnr" disabled="true"
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <!-- <view class="popup-item">
+ <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="popup-item">
+ </view>
+ <!-- <view class="popup-item">
<view class="popup-item-left">閲嶉噺:</view>
<view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view>
+ </view> -->
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -117,7 +117,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭涓婃灦 -->
+ <!-- 纭缁戝畾 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -363,7 +363,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪涓婃灦!'
+ this.content = '鏄惁鐜板湪缁戝畾!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -391,7 +391,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "涓婃灦鎴愬姛"
+ that.messageText = "缁戝畾鎴愬姛"
that.messageToggle('success')
// const innerAudioContext = uni.createInnerAudioContext();
// innerAudioContext.src = '/static/music/pakinOk.mp3';
diff --git a/pages/AGV/AGVPakinOn.vue b/pages/AGV/AGVPakinOn.vue
index 9232328..ebbd3db 100644
--- a/pages/AGV/AGVPakinOn.vue
+++ b/pages/AGV/AGVPakinOn.vue
@@ -147,7 +147,7 @@
token: '',
barcode: '',
stationCode: '',
- dataList: [{}],
+ dataList: [],
count: 0,
rowNum: '',
matnr: '',
@@ -217,6 +217,12 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
+ if (that.dataList.length >= 1) {
+ this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+ this.messageToggle('warn')
+ that.matnr = ''
+ return
+ }
uni.request({
url: that.baseUrl + '/mat/auth',
data: {
@@ -402,7 +408,7 @@
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- stationCode: that.stationCode,
+ locno: that.stationCode,
combMats: that.dataList
}),
method: 'POST',
diff --git a/pages/AGV/AGVStart.vue b/pages/AGV/AGVStart.vue
index 1c9eae7..94f076a 100644
--- a/pages/AGV/AGVStart.vue
+++ b/pages/AGV/AGVStart.vue
@@ -26,7 +26,7 @@
<view style="width: 200rpx;"><button size="mini" type="primary" @click="getChecked">鎻愬彇</button></view>
</view>
<scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
+ <view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
<view class="aside">
<checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
</view>
@@ -135,6 +135,7 @@
removeNum: 0,
floorList: [1,3],
floor: "",
+ devNo: []
}
},
onLoad() {
@@ -170,9 +171,14 @@
},
method: 'POST',
success(res) {
- console.log(res);
res = res.data
+ for(var i = 0; i < res.data.length; i++) {
+ if (res.data[i].locSts === 'F') {
+ res.data[i]["color"] = "red"
+ }
+ }
that.dataList = res.data
+ console.log(that.dataList);
}
});
},
@@ -384,6 +390,9 @@
comb() {
uni.vibrateShort();
let that = this;
+ for (var i = 0; i < that.dataList.length; i++) {
+ that.devNo.push(that.dataList[i].devNo)
+ }
uni.request({
url: that.baseUrl + '/agvMobile/pakin/auth',
data: JSON.stringify({
@@ -450,6 +459,14 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+ .bg-red {
+ background-color: #e54d42;
+ color: #ffffff;
+ }
+ .bg-white {
+ background-color: #ffffff;
+ color: #666666;
+ }
.list:first-child {
margin-top: 260rpx;
}
--
Gitblit v1.9.1