From ed82ad3a75afb740911cd9128fbada56566a571f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 09:15:33 +0800
Subject: [PATCH] 040310 许工说这个工位机器人达不到，强行锁定 【Editby shaocx,2024-12-23】
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index 2105c59..3c526fe 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
@@ -73,7 +73,6 @@
:class="item.checked ? 'bg_item' : ''"
class="fontSize32rpx width margin_auto background_fff padding10 relative box_sizing transition"
>
- <!-- 閮ㄤ欢鍚嶇О upi銆佹潗鏂欍�佸昂瀵革紝浣嶇疆銆佹澘浠剁姸鎬� -->
<u-row>
<u-col span="12" class="flex align-center">
<!-- <u-checkbox v-model="item.checked" size="50rpx"></u-checkbox> -->
@@ -94,6 +93,13 @@
</text>
</u-col>
</u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -104,7 +110,7 @@
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
- 浣嶇疆锛歿{ item.areacode }}
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
</text>
</u-col>
</u-row>
@@ -130,13 +136,13 @@
</text>
</u-col>
</u-row>
- <u-row>
- <u-col span="12">
- <text class="color_80 padding_left25rpx">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
- </text>
- </u-col>
- </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 鏍囪锛歿{ getUpiFlagEnumName(item.upiFlag) }}
+ </text>
+ </u-col>
+ </u-row>
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
@@ -302,7 +308,7 @@
import ButtonModal from "../../components/buttonModal.vue";
import ModalCode from "../../components/ModalCode.vue";
import {
- getBhbMaterialList,
+ querySingleUpiByUpi,
getenumDataList,
} from "../../api/putIn/artificial.js";
export default {
@@ -336,6 +342,8 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
+ upiFlagEnum: [],
};
},
components: {
@@ -348,6 +356,16 @@
}).then((res) => {
this.enumList = res.result || [];
});
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
+ getenumDataList({
+ EnumName: "UpiFlagEnum",
+ }).then((res) => {
+ this.upiFlagEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -359,6 +377,14 @@
const name = this.enumList.find((item) => item.value === value);
return name ? name.name : "";
},
+ getAreaCodeEnumName(value) {
+ const name = this.areaCodeEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
+ getUpiFlagEnumName(value) {
+ const name = this.upiFlagEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
open(index) {
// 鍏堝皢姝ｅ湪琚搷浣滅殑swipeAction鏍囪涓烘墦寮�鐘舵�侊紝鍚﹀垯鐢变簬props鐨勭壒鎬ч檺鍒讹紝
@@ -382,7 +408,7 @@
this.singlist = [];
},
- //鑾峰彇瀹瑰櫒鐨勪俊鎭�
+ //鑾峰彇
getContainerData(param) {
if (!this.warehouse.upi) {
uni.showToast({
@@ -392,7 +418,7 @@
});
return;
}
- getBhbMaterialList({
+ querySingleUpiByUpi({
packageCode: this.warehouse.packageCode,
upi: this.warehouse.upi,
}).then((res) => {
@@ -401,10 +427,12 @@
uni.showToast({
title: "鏁版嵁涓嶅瓨鍦�",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
+ this.singlist = [];
return;
}
+
this.singlist = res.result;
});
},
--
Gitblit v1.9.3