From a27f35ea06c7b6bd9a6dc310c86c366e8052897b Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 12月 2024 10:43:09 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 198 ++++++++++++++-
LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue | 238 +++++++++++++++--
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue | 191 +++++++++++++
LA24030_LuLiPackageLine_Web/src/views/home/index.vue | 139 +++++++---
4 files changed, 660 insertions(+), 106 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index bef7f0e..4252ef1 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
@@ -20,8 +20,8 @@
prop="packageCode"
required
class="uFormItem"
- >
<u-input
+ >
v-model.trim="warehouse.packageCode"
@confirm="getContainerData(1)"
placeholder="璇峰綍鍏ユ垨鎵爜"
@@ -43,7 +43,7 @@
ref="materialRef"
placeholder="璇锋壂鐮佸綍鍏�"
@focus="warehouse.upi = ''"
- :focus="curFoucus"
+ :focus="curFoucus"
@confirm="getContainerData"
style="font-weight: bolder; margin-left: 15rpx"
class="width padding_left25rpx"
@@ -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> -->
@@ -95,33 +94,69 @@
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
閮ㄤ欢鍚嶇О锛� {{ item.detailName }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 浣嶇疆锛歿{ item.location }} </text>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉愭枡锛歿{ item.info18 }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </u-row>
+
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉夸欢鐘舵�侊細{{ getEnumName(item.upiStatus) }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </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">
+ <text class="color_80"> 鐢熶骇鍗曞彿锛歿{ item.info5 }} </text>
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80">
+ 鍖呰缂栧彿锛歿{ item.packageCode }}</text
+ >
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 鎵规鍙凤細{{ item.planNo }}</text>
+ </text>
</u-col>
</u-row>
</view>
@@ -130,6 +165,129 @@
</u-swipe-action>
</view>
<modal-code :rescode="rescode" :resmessage="resmessage" ref="resmodal" />
+
+ <u-popup
+ v-model="detailshow"
+ border-radius="14"
+ @close="detailshow = false"
+ mode="bottom"
+ >
+ <h2 class="text_align_center padding_bottom18 padding15">淇℃伅</h2>
+ <div style="height: 400px; overflow-y: auto; padding: 0 15rpx">
+ <view class="line flex justify-between">
+ <text class="text-gray">璁㈠崟鍙�</text>
+ <text>{{ materlist.orderId }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">闀�</text>
+ <text>{{ materlist.length }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹�</text>
+ <text>{{ materlist.width }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍘�</text>
+ <text>{{ materlist.thk }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">琛屽彿</text>
+ <text>{{ materlist.lineNumber }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢绾圭悊</text>
+ <text>{{ materlist.Matgrid }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">鎵撳瓟璁惧缂栧彿</text>
+ <text>{{ materlist.DRNum }}</text>
+ </view> -->
+
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閿垏鍥惧彿</text>
+ <text>{{ materlist.materialIndex }}</text>
+ </view> -->
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰X鍧愭爣</text>
+ <text>{{ materlist.machineXCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Y鍧愭爣</text>
+ <text>{{ materlist.machineYCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Z鍧愭爣</text>
+ <text>{{ materlist.machineZCenter }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">杞悜瑙掑害</text>
+ <text>{{ materlist.rotation }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">灞傛暟</text>
+ <text>{{ materlist.sequence }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">閿�鍞悎鍚屽崟鍙�</text>
+ <text>{{ materlist.info4 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鐢熶骇鍗曞彿</text>
+ <text>{{ materlist.info5 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">绗嚑鍖�</text>
+ <text>{{ materlist.info6 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">缁忛攢搴楀悕绉�</text>
+ <text>{{ materlist.info7 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">浜у搧鍚嶇О</text>
+ <text>{{ materlist.info8 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰缂栫爜</text>
+ <text>{{ materlist.info9 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹㈡埛鍚嶇О</text>
+ <text>{{ materlist.info10 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鑷彁鎴栧彂璐�</text>
+ <text>{{ materlist.info11 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰閮ㄤ欢鎬绘暟閲�</text>
+ <text>{{ materlist.info12 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰闈㈢Н</text>
+ <text>{{ materlist.info13 }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鍚嶇О</text>
+ <text>{{ materlist.info14 }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鏁伴噺</text>
+ <text>{{ materlist.info15 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢灏哄</text>
+ <text>{{ materlist.info16 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰鏈烘鎵嬫棆杞�</text>
+ <text>{{ materlist.info17 }}</text>
+ </view>
+ </div>
+ </u-popup>
<button-modal
:subShow="true"
@@ -160,7 +318,7 @@
resmessage: "",
options: [
{
- text: "鎵撳嵃",
+ text: "璇︽儏",
style: {
backgroundColor: "#fc9f35",
},
@@ -177,6 +335,7 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -189,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;
@@ -198,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 : "";
},
// 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
@@ -242,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 4d8b7aa..343dd8a 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
@@ -94,33 +94,69 @@
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
閮ㄤ欢鍚嶇О锛� {{ item.detailName }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 浣嶇疆锛歿{ item.location }} </text>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉愭枡锛歿{ item.info18 }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </u-row>
+
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉夸欢鐘舵�侊細{{ getEnumName(item.upiStatus) }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </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">
+ <text class="color_80"> 鐢熶骇鍗曞彿锛歿{ item.info5 }} </text>
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80">
+ 鍖呰缂栧彿锛歿{ item.packageCode }}</text
+ >
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 鎵规鍙凤細{{ item.planNo }}</text>
+ </text>
</u-col>
</u-row>
</view>
@@ -129,7 +165,128 @@
</u-swipe-action>
</view>
<modal-code :rescode="rescode" :resmessage="resmessage" ref="resmodal" />
-
+ <u-popup
+ v-model="detailshow"
+ border-radius="14"
+ @close="detailshow = false"
+ mode="bottom"
+ >
+ <h2 class="text_align_center padding_bottom18 padding15">淇℃伅</h2>
+ <div style="height: 400px; overflow-y: auto; padding: 0 15rpx">
+ <view class="line flex justify-between">
+ <text class="text-gray">璁㈠崟鍙�</text>
+ <text>{{ materlist.orderId }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">闀�</text>
+ <text>{{ materlist.length }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹�</text>
+ <text>{{ materlist.width }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍘�</text>
+ <text>{{ materlist.thk }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">琛屽彿</text>
+ <text>{{ materlist.lineNumber }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢绾圭悊</text>
+ <text>{{ materlist.Matgrid }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">鎵撳瓟璁惧缂栧彿</text>
+ <text>{{ materlist.DRNum }}</text>
+ </view> -->
+
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閿垏鍥惧彿</text>
+ <text>{{ materlist.materialIndex }}</text>
+ </view> -->
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰X鍧愭爣</text>
+ <text>{{ materlist.machineXCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Y鍧愭爣</text>
+ <text>{{ materlist.machineYCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Z鍧愭爣</text>
+ <text>{{ materlist.machineZCenter }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">杞悜瑙掑害</text>
+ <text>{{ materlist.rotation }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">灞傛暟</text>
+ <text>{{ materlist.sequence }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">閿�鍞悎鍚屽崟鍙�</text>
+ <text>{{ materlist.info4 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鐢熶骇鍗曞彿</text>
+ <text>{{ materlist.info5 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">绗嚑鍖�</text>
+ <text>{{ materlist.info6 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">缁忛攢搴楀悕绉�</text>
+ <text>{{ materlist.info7 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">浜у搧鍚嶇О</text>
+ <text>{{ materlist.info8 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰缂栫爜</text>
+ <text>{{ materlist.info9 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹㈡埛鍚嶇О</text>
+ <text>{{ materlist.info10 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鑷彁鎴栧彂璐�</text>
+ <text>{{ materlist.info11 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰閮ㄤ欢鎬绘暟閲�</text>
+ <text>{{ materlist.info12 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰闈㈢Н</text>
+ <text>{{ materlist.info13 }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鍚嶇О</text>
+ <text>{{ materlist.info14 }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鏁伴噺</text>
+ <text>{{ materlist.info15 }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢灏哄</text>
+ <text>{{ materlist.info16 }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰鏈烘鎵嬫棆杞�</text>
+ <text>{{ materlist.info17 }}</text>
+ </view>
+ </div>
+ </u-popup>
<button-modal
:issueShow="true"
issueTitle="閲嶇疆"
@@ -165,7 +322,7 @@
resmessage: "",
options: [
{
- text: "鎵撳嵃",
+ text: "璇︽儏",
style: {
backgroundColor: "#fc9f35",
},
@@ -182,6 +339,7 @@
gridable: true,
kwbhAllowed: false,
enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -194,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;
@@ -202,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 : "";
},
//鑾峰彇鐨勪俊鎭�
@@ -222,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 a9e7d82..2f92f0e 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue
@@ -6,7 +6,7 @@
</cu-custom>
<u-form
labelPosition="left"
- label-width="180rpx"
+ label-width="250rpx"
:model="warehouse"
ref="warehouseRef"
>
@@ -16,14 +16,14 @@
>
<u-col span="12">
<u-form-item
- label="鍖呰鍙�:"
- prop="packageCode"
+ label="鍖呰鍙�/閮ㄤ欢鏉＄爜:"
+ prop="upi"
required
class="uFormItem"
>
<u-input
- v-model.trim="warehouse.packageCode"
- @focus="warehouse.packageCode = ''"
+ v-model.trim="warehouse.upi"
+ @focus="warehouse.upi = ''"
@confirm="getContainerData(1)"
placeholder="璇峰綍鍏ユ垨鎵爜"
class="width"
@@ -33,12 +33,12 @@
</u-form-item>
</u-col>
</u-row>
- <u-row
+ <!-- <u-row
class="border_bottom margin_top10rpx padding_left25rpx"
style="background-color: #fff"
>
<u-col span="12">
- <u-form-item label="閮ㄤ欢鏉＄爜:" class="uFormItem">
+ <u-form-item label=":" class="uFormItem">
<u-input
v-model="warehouse.upi"
ref="materialRef"
@@ -51,8 +51,9 @@
</u-input>
</u-form-item>
</u-col>
- </u-row>
+ </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> -->
@@ -95,33 +95,69 @@
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
閮ㄤ欢鍚嶇О锛� {{ item.detailName }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 浣嶇疆锛歿{ item.location }} </text>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ 浣嶇疆锛歿{ getAreaCodeEnumName(item.areaCode) }}
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉愭枡锛歿{ item.info18 }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </u-row>
+
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 灏哄锛歿{ item.info16 }} </text>
+ </text>
</u-col>
</u-row>
<u-row>
- <u-col span="8">
+ <u-col span="12">
<text class="color_80 padding_left25rpx">
鏉夸欢鐘舵�侊細{{ getEnumName(item.upiStatus) }}
</text>
</u-col>
- <u-col span="4">
- <text class="color_80"> 娆″簭锛歿{ item.shelf }} </text>
+ </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">
+ <text class="color_80"> 鐢熶骇鍗曞彿锛歿{ item.info5 }} </text>
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80">
+ 鍖呰缂栧彿锛歿{ item.packageCode }}</text
+ >
+ </text>
+ </u-col>
+ </u-row>
+ <u-row>
+ <u-col span="12">
+ <text class="color_80 padding_left25rpx">
+ <text class="color_80"> 鎵规鍙凤細{{ item.planNo }}</text>
+ </text>
</u-col>
</u-row>
</view>
@@ -130,7 +166,128 @@
</u-swipe-action>
</view>
<modal-code :rescode="rescode" :resmessage="resmessage" ref="resmodal" />
-
+ <u-popup
+ v-model="detailshow"
+ border-radius="14"
+ @close="detailshow = false"
+ mode="bottom"
+ >
+ <h2 class="text_align_center padding_bottom18 padding15">淇℃伅</h2>
+ <div style="height: 400px; overflow-y: auto; padding: 0 15rpx">
+ <view class="line flex justify-between">
+ <text class="text-gray">璁㈠崟鍙�</text>
+ <text>{{ materlist.orderId }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">闀�</text>
+ <text>{{ materlist.length }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹�</text>
+ <text>{{ materlist.width }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍘�</text>
+ <text>{{ materlist.thk }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">琛屽彿</text>
+ <text>{{ materlist.lineNumber }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢绾圭悊</text>
+ <text>{{ materlist.Matgrid }}</text>
+ </view> -->
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">鎵撳瓟璁惧缂栧彿</text>
+ <text>{{ materlist.DRNum }}</text>
+ </view> -->
+
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閿垏鍥惧彿</text>
+ <text>{{ materlist.materialIndex }}</text>
+ </view> -->
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰X鍧愭爣</text>
+ <text>{{ materlist.machineXCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Y鍧愭爣</text>
+ <text>{{ materlist.machineYCenter }}</text>
+ </view>
+
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰Z鍧愭爣</text>
+ <text>{{ materlist.machineZCenter }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">杞悜瑙掑害</text>
+ <text>{{ materlist.rotation }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">灞傛暟</text>
+ <text>{{ materlist.sequence }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">閿�鍞悎鍚屽崟鍙�</text>
+ <text>{{ materlist.info4 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鐢熶骇鍗曞彿</text>
+ <text>{{ materlist.info5 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">绗嚑鍖�</text>
+ <text>{{ materlist.info6 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">缁忛攢搴楀悕绉�</text>
+ <text>{{ materlist.info7 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">浜у搧鍚嶇О</text>
+ <text>{{ materlist.info8 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰缂栫爜</text>
+ <text>{{ materlist.info9 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">瀹㈡埛鍚嶇О</text>
+ <text>{{ materlist.info10 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鑷彁鎴栧彂璐�</text>
+ <text>{{ materlist.info11 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰閮ㄤ欢鎬绘暟閲�</text>
+ <text>{{ materlist.info12 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰闈㈢Н</text>
+ <text>{{ materlist.info13 }}</text>
+ </view>
+ <!-- <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鍚嶇О</text>
+ <text>{{ materlist.info14 }}</text>
+ </view> -->
+ <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢鏁伴噺</text>
+ <text>{{ materlist.info15 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">閮ㄤ欢灏哄</text>
+ <text>{{ materlist.info16 }}</text>
+ </view>
+ <view class="line flex justify-between">
+ <text class="text-gray">鍖呰鏈烘鎵嬫棆杞�</text>
+ <text>{{ materlist.info17 }}</text>
+ </view>
+ </div>
+ </u-popup>
<button-modal
:subShow="true"
garmenTitle="閲嶇疆"
@@ -156,7 +313,7 @@
return {
operator: "",
warehouse: {
- packageCode: "",
+ upi: "",
materialCode: "",
dutyCycle: "",
gridNumber: 1,
@@ -171,7 +328,7 @@
resmessage: "",
options: [
{
- text: "鎵撳嵃",
+ text: "璇︽儏",
style: {
backgroundColor: "#fc9f35",
},
@@ -187,7 +344,8 @@
gridFocus: false,
gridable: true,
kwbhAllowed: false,
- enumList: [],
+ enumList: [],
+ areaCodeEnum: [],
};
},
components: {
@@ -195,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) {
@@ -230,20 +397,17 @@
this.materlist = this.singlist[index];
this.detailshow = true;
},
-
+
rest() {
this.warehouse.upi = "";
- this.warehouse.packageCode = "";
+ this.warehouse.upi = "";
this.singlist = [];
},
//妫�鏌ュ鍣ㄦ爡鏍兼暟
checkGrid() {},
//鑾峰彇瀹瑰櫒鐨勪俊鎭�
getContainerData(param) {
- if (param == 1) {
- this.warehouse.upi = "";
- }
- if (!this.warehouse.packageCode) {
+ if (!this.warehouse.upi) {
uni.showToast({
title: "璇锋壂鍖呰鍙�",
icon: "none",
@@ -252,7 +416,6 @@
return;
}
getBhbMaterialList({
- packageCode: this.warehouse.packageCode,
upi: this.warehouse.upi,
}).then((res) => {
const result = res.result;
@@ -260,7 +423,7 @@
uni.showToast({
title: "娌℃湁鏌ュ埌鏁版嵁",
icon: "none",
- duration: 2000,
+ duration: 5000,
});
this.singlist = [];
return;
@@ -274,10 +437,9 @@
this.ordersId = 0;
this.singlist = [];
this.$refs.warehouseRef.resetFields();
- this.warehouse.packageCode = "";
+ this.warehouse.upi = "";
},
},
-
};
</script>
<style lang="scss">
diff --git a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
index 0571968..fc304d0 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
@@ -86,15 +86,38 @@
import { wmsStockPassMap, wmsHomePageQuery, wmsHomePlaceQuery, wmsTransitionDiagramQuery } from '/@/api/main/inventoryWarning/inventoryWarning';
import type { TabsPaneContext } from 'element-plus';
import { useRoute, useRouter } from 'vue-router';
+import { getStorageView } from '/@/api/main/ReportCenter/storageView';
const router = useRouter();
// 鎺ュ彛鏁版嵁
const loadingwms = ref(false);
const pieChartRef = ref(null);
let myChart = null;
+let countList = ref([
+ {
+ type: 0,
+ name: '鎬诲簱浣�',
+ value: 0,
+ },
+ {
+ type: 1,
+ name: '鏈夎揣搴撲綅',
+ value: 0,
+ },
+ {
+ type: 2,
+ name: '鏃犺揣搴撲綅',
+ value: 0,
+ },
+ {
+ type: 3,
+ name: '閿佸畾搴撲綅',
+ value: 0,
+ },
+]);
const optionPie = {
title: {
- text: '缂撳瓨宀涚粺璁�',
- left: 'center',
+ text: '缂撳瓨宀涘簱瀛�',
+ // left: 'center',
textStyle: {
color: '#333',
},
@@ -104,19 +127,20 @@
},
legend: {
orient: 'vertical',
- left: 'left',
+ left: 'right',
},
series: [
{
name: '搴撲綅鐘舵��',
type: 'pie',
- radius: ['50%', '70%'],
- data: [
- { name: '鎬诲簱浣�360', value: 120 },
- { name: '鏈夎揣搴撲綅', value: 90 },
- { name: '鏃犺揣搴撲綅', value: 60 },
- { name: '閿佸畾搴撲綅', value: 30 },
- ],
+ radius: ['35%', '55%'],
+ data: [],
+ // data: [
+ // { name: '鎬诲簱浣�360', value: 120 },
+ // { name: '鏈夎揣搴撲綅', value: 90 },
+ // { name: '鏃犺揣搴撲綅', value: 60 },
+ // { name: '閿佸畾搴撲綅', value: 30 },
+ // ],
emphasis: {
itemStyle: {
shadowBlur: 10,
@@ -125,22 +149,53 @@
},
},
label: {
- formatter: '{b}: {c} ({d}%)',
+ // formatter: '{b}: {c} ({d}%)',
+ formatter: '{b}: {c}',
},
},
],
};
onMounted(() => {
- nextTick(() => {
+ nextTick(async () => {
+
+
+ var res = await getStorageView();
+ debugger
+ if (res.data.code == 200) {
+ const { data } = res;
+ const result = data.result;
+ // 缁熻
+ var hasMaterialCount = result.filter((item: any) => item.stockStatus == 1).length || 0;
+ var noMaterialCount = result.length - hasMaterialCount;
+ countList.value = [
+ {
+ type: '',
+ name: '鎬诲簱浣�',
+ value: result.length || 0,
+ },
+ {
+ type: 1,
+ name: '鏈夎揣搴撲綅',
+ value: hasMaterialCount || 0,
+ },
+ {
+ type: 18,
+ name: '鏃犺揣搴撲綅',
+ value: noMaterialCount || 0,
+ },
+ {
+ type: 2,
+ name: '閿佸畾搴撲綅',
+ value: result.filter((item: any) => item.stockStatus == 2).length || 0,
+ },
+ ];
+ optionPie.series[0].data = countList.value;
myChart = echarts.init(document.getElementById('homePieChart') as HTMLDivElement);
- const data = [
- { name: '鎬诲簱浣�360', value: 120 },
- { name: '鏈夎揣搴撲綅', value: 90 },
- { name: '鏃犺揣搴撲綅', value: 60 },
- { name: '閿佸畾搴撲綅', value: 30 },
- ];
myChart.setOption(optionPie);
+
+
+ }
});
});
@@ -678,30 +733,30 @@
initEchartsResizeFun();
}
);
-// 鐩戝惉 pinia 涓槸鍚﹀紑鍚繁鑹蹭富棰�
-watch(
- () => themeConfig.value.isIsDark,
- (isIsDark) => {
- nextTick(() => {
- state.charts.theme = isIsDark ? 'dark' : '';
- state.charts.bgColor = isIsDark ? 'transparent' : '';
- state.charts.color = isIsDark ? '#dadada' : '#303133';
- setTimeout(() => {
- initLineChart(null, null, null);
- }, 500);
- setTimeout(() => {
- initPieChart(null);
- }, 700);
- // setTimeout(() => {
- // initBarChart(null,null,null,null);
- // }, 1000);
- });
- },
- {
- deep: true,
- immediate: true,
- }
-);
+// // 鐩戝惉 pinia 涓槸鍚﹀紑鍚繁鑹蹭富棰�
+// watch(
+// () => themeConfig.value.isIsDark,
+// (isIsDark) => {
+// nextTick(() => {
+// state.charts.theme = isIsDark ? 'dark' : '';
+// state.charts.bgColor = isIsDark ? 'transparent' : '';
+// state.charts.color = isIsDark ? '#dadada' : '#303133';
+// setTimeout(() => {
+// initLineChart(null, null, null);
+// }, 500);
+// setTimeout(() => {
+// initPieChart(null);
+// }, 700);
+// // setTimeout(() => {
+// // initBarChart(null,null,null,null);
+// // }, 1000);
+// });
+// },
+// {
+// deep: true,
+// immediate: true,
+// }
+// );
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3