From 9d1e44b4d1458822a8bc20a71efc231ead070cbc Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 11 12月 2024 10:36:07 +0800
Subject: [PATCH] pda
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 17 +++++++-
LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue | 37 +++++++++++-------
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue | 14 ++++++-
3 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index 2105c59..4252ef1 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> -->
@@ -104,7 +103,7 @@
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
- 浣嶇疆锛歿{ item.areacode }}
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
</text>
</u-col>
</u-row>
@@ -336,6 +335,7 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -348,6 +348,11 @@
}).then((res) => {
this.enumList = res.result || [];
});
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -357,6 +362,10 @@
methods: {
getEnumName(value) {
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 : "";
},
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
@@ -401,10 +410,12 @@
uni.showToast({
title: "鏁版嵁涓嶅瓨鍦�",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
+ this.singlist = [];
return;
}
+
this.singlist = res.result;
});
},
diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
index dfd8031..343dd8a 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
@@ -103,7 +103,7 @@
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
- 浣嶇疆锛歿{ item.areacode }}
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
</text>
</u-col>
</u-row>
@@ -339,6 +339,7 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -351,6 +352,11 @@
}).then((res) => {
this.enumList = res.result || [];
});
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -359,6 +365,10 @@
methods: {
getEnumName(value) {
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 : "";
},
//鑾峰彇鐨勪俊鎭�
@@ -379,7 +389,7 @@
uni.showToast({
title: "鏁版嵁涓嶅瓨鍦�",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
this.singlist = [];
return;
diff --git a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
index 72465ae..2f92f0e 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
@@ -23,7 +23,7 @@
>
<u-input
v-model.trim="warehouse.upi"
- @focus="warehouse.upi = ''"
+ @focus="warehouse.upi = ''"
@confirm="getContainerData(1)"
placeholder="璇峰綍鍏ユ垨鎵爜"
class="width"
@@ -53,6 +53,7 @@
</u-col>
</u-row> -->
</u-form>
+
<!-- 鍒楄〃 -->
<view class="margin_top10rpx">
<u-swipe-action
@@ -73,7 +74,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> -->
@@ -104,7 +104,7 @@
<u-row>
<u-col span="12">
<text class="color_80 padding_left25rpx">
- 浣嶇疆锛歿{ item.areacode }}
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
</text>
</u-col>
</u-row>
@@ -344,7 +344,8 @@
gridFocus: false,
gridable: true,
kwbhAllowed: false,
- enumList: [],
+ enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -352,23 +353,32 @@
ModalCode,
},
created() {
- getenumDataList({
+ getenumDataList({
EnumName: "UpiStatusEnum",
}).then((res) => {
this.enumList = res.result || [];
});
+
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
+
},
onLoad() {
this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
},
- mounted() {
-
- },
+ mounted() {},
methods: {
- getEnumName(value) {
+ getEnumName(value) {
const name = this.enumList.find((item) => item.value === value);
- return name? name.name : "";
+ return name ? name.name : "";
+ },
+ getAreaCodeEnumName(value) {
+ const name = this.areaCodeEnum.find((item) => item.value === value);
+ return name ? name.name : "";
},
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
open(index) {
@@ -387,7 +397,7 @@
this.materlist = this.singlist[index];
this.detailshow = true;
},
-
+
rest() {
this.warehouse.upi = "";
this.warehouse.upi = "";
@@ -406,14 +416,14 @@
return;
}
getBhbMaterialList({
- upi: this.warehouse.upi
+ upi: this.warehouse.upi,
}).then((res) => {
const result = res.result;
if (Array.isArray(result) && result.length == 0) {
uni.showToast({
title: "娌℃湁鏌ュ埌鏁版嵁",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
this.singlist = [];
return;
@@ -430,7 +440,6 @@
this.warehouse.upi = "";
},
},
-
};
</script>
<style lang="scss">
--
Gitblit v1.9.3