From e75fa50737064b718ca0155731c54de8d6ca3c59 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Tue, 25 Mar 2025 08:53:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E8=AF=B7=E6=B1=82=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.增加权限
---
 .../shelfLocationCallSendBack.vue             | 46 ++++++++++++++++---
 .../dist/dev/app-plus/app-service.js          | 39 ++++++++++++----
 货架标准上位机/Models/AuthEnum.cs             |  2 +
 3 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/PDA/PDA/pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue b/PDA/PDA/pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue
index 22c0d44..9917c3e 100644
--- a/PDA/PDA/pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue
+++ b/PDA/PDA/pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue
@@ -1,5 +1,10 @@
 <template>
 	<view class="bg-image">
+		<!-- 屏蔽层 -->
+		<view v-if="isLoading" class="mask" :style="{ display: isLoading ? 'flex' : 'none' }">
+			<view class="loading-text">请求中...</view>
+		</view>
+
 		<view class="diy-flex-row">
 			<view style="flex: 3">
 				<!-- 占位 -->
@@ -123,6 +128,8 @@
 				sendBackEmptyButtons: null,
 
 				userName: '', //当前登录的用户名
+
+				isLoading: false, //是否正在请求中那个状态
 			}
 		},
 		onShow: function() {
@@ -295,6 +302,8 @@
 
 				this.userName = getConfig('userName', '');
 				var serverIPAndPort = getServerIPAndPort();
+
+				this.isLoading = true;
 				uni.request({
 					url: 'http://' + serverIPAndPort + '/pdaMatBind/bindSendBackShelf', // 请求的接口地址
 					method: 'POST', // 设置请求方式为 POST
@@ -348,8 +357,7 @@
 						});
 					},
 					complete: (event) => {
-						// 请求完成的回调函数（无论成功或失败都会调用）
-						console.log('请求完成', event);
+						this.isLoading = false;
 					}
 				});
 			},
@@ -364,8 +372,7 @@
 					});
 					return;
 				}
-				if(this.shelfId != null && this.shelfId != 0)
-				{
+				if (this.shelfId != null && this.shelfId != 0) {
 					uni.showToast({
 						title: '当前工位已有货架!请货架送走后再次扫工位码进行操作！',
 						icon: 'none',
@@ -373,7 +380,7 @@
 					});
 					return;
 				}
-				
+
 				if (this.selectedShelfTypeIndex == 0) {
 					uni.showToast({
 						title: '请选择需要呼叫的货架类型!',
@@ -386,6 +393,8 @@
 				saveConfig("bindSelectedShelfTypeIndex", this.selectedShelfTypeIndex);
 				this.userName = getConfig('userName', '');
 				var serverIPAndPort = getServerIPAndPort();
+
+				this.isLoading = true;
 				uni.request({
 					url: 'http://' + serverIPAndPort + '/pdaMatBind/callEmptyShelf', // 请求的接口地址
 					method: 'POST', // 设置请求方式为 POST
@@ -394,8 +403,8 @@
 						"locationCode": this.currentLocationCode,
 						'needShelfTypeId': this.shelfTypeOptions[this.selectedShelfTypeIndex].id,
 						'needShelfTypeName': this.shelfTypeOptions[this.selectedShelfTypeIndex].shelfTypeName,
-						'needLocationAreaId':item.id,
-						'needLocationAreaName':item.locationAreaName,
+						'needLocationAreaId': item.id,
+						'needLocationAreaName': item.locationAreaName,
 						"userName": this.userName,
 						"deviceType": "PDA"
 					},
@@ -440,6 +449,7 @@
 					complete: (event) => {
 						// 请求完成的回调函数（无论成功或失败都会调用）
 						console.log('请求完成', event);
+						this.isLoading = false;
 					}
 				});
 
@@ -449,6 +459,28 @@
 </script>
 
 <style>
+	/* 屏蔽层样式 */
+	.mask {
+	  position: fixed;
+	  top: 0;
+	  left: 0;
+	  right: 0;
+	  bottom: 0;
+	  background-color: rgba(0, 0, 0, 0.5);
+	  z-index: 999;
+	  justify-content: center;
+	  align-items: center;
+	}
+	 
+	/* 加载文字样式 */
+	.loading-text {
+	  color: white;
+	  font-size: 16px;
+	  padding: 10px 20px;
+	  border-radius: 4px;
+	  background-color: rgba(0, 0, 0, 0.7);
+	}
+	
 	.uni-input {
 		height: 30px;
 		line-height: 30px;
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index 18ed453..bccc353 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -6801,8 +6801,10 @@ if (uni.restoreGlobal) {
         selectedShelfTypeIndex: 0,
         //选择的货架类型索引
         sendBackEmptyButtons: null,
-        userName: ""
+        userName: "",
         //当前登录的用户名
+        isLoading: false
+        //是否正在请求中那个状态
       };
     },
     onShow: function() {
@@ -6811,16 +6813,16 @@ if (uni.restoreGlobal) {
       recive(function(res) {
         self.analysisScanCode(res.data, true);
       }, function(err) {
-        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:136", "Error:", JSON.stringify(err));
+        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:143", "Error:", JSON.stringify(err));
       });
     },
     methods: {
       handleFocus() {
-        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:141", "foucus");
+        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:148", "foucus");
         this.isMatConditionFoucused = true;
       },
       handleBlur() {
-        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:145", "bulur");
+        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:152", "bulur");
         this.isMatConditionFoucused = false;
       },
       //选择货架类型
@@ -6834,13 +6836,13 @@ if (uni.restoreGlobal) {
             this.analysisScanCode(res.result);
           },
           fail: (err) => {
-            formatAppLog("error", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:159", "扫码失败:", err);
+            formatAppLog("error", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:166", "扫码失败:", err);
           }
         });
       },
       //扫码枪扫码
       analysisScanCode: function(encodedString) {
-        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:165", this.isMatConditionFoucused);
+        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:172", this.isMatConditionFoucused);
         if (this.isMatConditionFoucused) {
           return;
         }
@@ -6927,7 +6929,7 @@ if (uni.restoreGlobal) {
             }
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:264", "请求完成", event);
+            formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:271", "请求完成", event);
           }
         });
       },
@@ -6938,7 +6940,7 @@ if (uni.restoreGlobal) {
       },
       //货架送回库区
       sendBack: function(item) {
-        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:276", item);
+        formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:283", item);
         if (this.shelfId == null || this.shelfId == 0) {
           uni.showToast({
             title: "当前工位无货架！无法送货架!",
@@ -6956,6 +6958,7 @@ if (uni.restoreGlobal) {
         }
         this.userName = getConfig("userName", "");
         var serverIPAndPort = getServerIPAndPort();
+        this.isLoading = true;
         uni.request({
           url: "http://" + serverIPAndPort + "/pdaMatBind/bindSendBackShelf",
           // 请求的接口地址
@@ -7007,7 +7010,7 @@ if (uni.restoreGlobal) {
             });
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:352", "请求完成", event);
+            this.isLoading = false;
           }
         });
       },
@@ -7040,6 +7043,7 @@ if (uni.restoreGlobal) {
         saveConfig("bindSelectedShelfTypeIndex", this.selectedShelfTypeIndex);
         this.userName = getConfig("userName", "");
         var serverIPAndPort = getServerIPAndPort();
+        this.isLoading = true;
         uni.request({
           url: "http://" + serverIPAndPort + "/pdaMatBind/callEmptyShelf",
           // 请求的接口地址
@@ -7091,7 +7095,8 @@ if (uni.restoreGlobal) {
             });
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:442", "请求完成", event);
+            formatAppLog("log", "at pages/shelfLocationCallSendBack/shelfLocationCallSendBack.vue:451", "请求完成", event);
+            this.isLoading = false;
           }
         });
       }
@@ -7099,6 +7104,20 @@ if (uni.restoreGlobal) {
   };
   function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "bg-image" }, [
+      vue.createCommentVNode(" 屏蔽层 "),
+      $data.isLoading ? (vue.openBlock(), vue.createElementBlock(
+        "view",
+        {
+          key: 0,
+          class: "mask",
+          style: vue.normalizeStyle({ display: $data.isLoading ? "flex" : "none" })
+        },
+        [
+          vue.createElementVNode("view", { class: "loading-text" }, "请求中...")
+        ],
+        4
+        /* STYLE */
+      )) : vue.createCommentVNode("v-if", true),
       vue.createElementVNode("view", { class: "diy-flex-row" }, [
         vue.createElementVNode("view", { style: { "flex": "3" } }, [
           vue.createCommentVNode(" 占位 ")
diff --git a/货架标准上位机/Models/AuthEnum.cs b/货架标准上位机/Models/AuthEnum.cs
index 07f544c..e51c426 100644
--- a/货架标准上位机/Models/AuthEnum.cs
+++ b/货架标准上位机/Models/AuthEnum.cs
@@ -31,6 +31,8 @@ namespace 智慧物流软件系统
         PDA库存盘点 = 16000,
         PDA任务管理 = 17000,
         PDA货架位置绑定解绑 = 18000,
+        PDA厂内物料查询 = 19000,
+        PDA货架库区 = 20000,
     }
 
     public class EnumTreeAttribute : Attribute