From 91e431e545188207cde00d27e12d5d20387daf26 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Wed, 25 Jun 2025 08:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/asrs/delivery/add-or-updata.vue     | 35 +++++++++++++++----
 src/views/asrs/delivery/add-or-updatab.vue    | 35 +++++++++++++++----
 .../asrs/warehouseLineMonitoring/index.vue    | 21 +++++++++++
 .../asrs/warehouseLineMonitoring/indexb.vue   | 31 +++++++++++++---
 4 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/src/views/asrs/delivery/add-or-updata.vue b/src/views/asrs/delivery/add-or-updata.vue
index e332ef5..6816737 100644
--- a/src/views/asrs/delivery/add-or-updata.vue
+++ b/src/views/asrs/delivery/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-19 09:42:47
+ * @LastEditTime: 2025-06-25 08:49:35
  * @Description:
 -->
 <template>
@@ -263,6 +263,7 @@
 				ref="queryForm"
 				size="small"
 				:inline="true"
+				:rules="listQueryRules"
 				label-width="68px">
 				<el-form-item label="托盘编码" prop="trayCode">
 					<el-input
@@ -292,13 +293,23 @@
 						placeholder="请输入产品名"
 						clearable />
 				</el-form-item>
-				<el-form-item label="品质" prop="grade">
+				<el-form-item label="初判等级" prop="cpGrade">
 					<el-input
-						v-model="listQuery.grade"
+						v-model="listQuery.cpGrade"
 						@input="$forceUpdate()"
-						placeholder="请输入品质"
+						placeholder="请输入初判等级"
 						clearable />
 				</el-form-item>
+				<el-form-item label="复判等级" prop="fpGrade">
+					<el-input
+						v-model="listQuery.fpGrade"
+						@input="$forceUpdate()"
+						placeholder="请输入复判等级"
+						clearable />
+				</el-form-item>
+				<el-form-item label="数量" prop="planQty">
+					<el-input v-model="listQuery.planQty" clearable placeholder="请输入数量" />
+				</el-form-item>
 				<el-form-item label="当日工单" prop="todayOrder">
 					<el-input
 						v-model="listQuery.todayOrder"
@@ -342,7 +353,10 @@
 				<el-table-column property="trayCode" label="托盘编码" width="80" />
 				<el-table-column property="productCode" label="物料编码" width="120" />
 				<el-table-column property="description" label="物料名称" />
+				<el-table-column property="planQty" label="数量" width="80" />
 				<el-table-column property="grade" label="货物品质" width="80" />
+				<el-table-column property="cpGrade" label="初判等级" width="80" />
+				<el-table-column property="fpGrade" label="复判等级" width="80" />
 				<el-table-column property="inventory" label="膜卷号" />
 				<el-table-column property="process" label="工序" width="80" />
 				<el-table-column property="createTime" label="入库时间" width="180">
@@ -422,12 +436,19 @@ export default {
 				process: null,
 				rollCode: null,
 				productName: null,
-				grade: null,
+				cpGrade: null,
+				fpGrade: null,
 				todayOrder: null,
+				planQty: null,
 				pageSize: 10,
 				pageNo: 1,
 				total: 1,
 			},
+			listQueryRules: {
+				planQty: [
+					{ pattern: /^\d+$/, message: '请输入有效的数字', trigger: 'blur' },
+				],
+			},
 			tableData: [{}],
 			regionArr,
 			potArr: [],
@@ -560,8 +581,10 @@ export default {
 			this.listQuery.process = this.listQuery.process || null;
 			this.listQuery.rollCode = this.listQuery.rollCode || null;
 			this.listQuery.productName = this.listQuery.productName || null;
-			this.listQuery.grade = this.listQuery.grade || null;
+			this.listQuery.cpGrade = this.listQuery.cpGrade || null;
+			this.listQuery.fpGrade = this.listQuery.fpGrade || null;
 			this.listQuery.todayOrder = this.listQuery.todayOrder || null;
+			this.listQuery.planQty = this.listQuery.planQty || null;
 			this.listQuery.startTime = this.listQuery.createTime
 				? this.listQuery.createTime[0]
 				: null;
diff --git a/src/views/asrs/delivery/add-or-updatab.vue b/src/views/asrs/delivery/add-or-updatab.vue
index 012777b..418aeb6 100644
--- a/src/views/asrs/delivery/add-or-updatab.vue
+++ b/src/views/asrs/delivery/add-or-updatab.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-01-07 15:48:54
+ * @LastEditTime: 2025-06-25 08:50:54
  * @Description:
 -->
 <template>
@@ -263,6 +263,7 @@
 				ref="queryForm"
 				size="small"
 				:inline="true"
+				:rules="listQueryRules"
 				label-width="68px">
 				<el-form-item label="托盘编码" prop="trayCode">
 					<el-input
@@ -292,13 +293,23 @@
 						placeholder="请输入产品名"
 						clearable />
 				</el-form-item>
-				<el-form-item label="品质" prop="grade">
+				<el-form-item label="初判等级" prop="cpGrade">
 					<el-input
-						v-model="listQuery.grade"
+						v-model="listQuery.cpGrade"
 						@input="$forceUpdate()"
-						placeholder="请输入品质"
+						placeholder="请输入初判等级"
 						clearable />
 				</el-form-item>
+				<el-form-item label="复判等级" prop="fpGrade">
+					<el-input
+						v-model="listQuery.fpGrade"
+						@input="$forceUpdate()"
+						placeholder="请输入复判等级"
+						clearable />
+				</el-form-item>
+				<el-form-item label="数量" prop="planQty">
+					<el-input v-model="listQuery.planQty" clearable placeholder="请输入数量" />
+				</el-form-item>
 				<el-form-item label="当日工单" prop="todayOrder">
 					<el-input
 						v-model="listQuery.todayOrder"
@@ -342,7 +353,10 @@
 				<el-table-column property="trayCode" label="托盘编码" width="80" />
 				<el-table-column property="productCode" label="物料编码" width="120" />
 				<el-table-column property="description" label="物料名称" />
+				<el-table-column property="planQty" label="数量" width="80" />
 				<el-table-column property="grade" label="货物品质" width="80" />
+				<el-table-column property="cpGrade" label="初判等级" width="80" />
+				<el-table-column property="fpGrade" label="复判等级" width="80" />
 				<el-table-column property="inventory" label="膜卷号" />
 				<el-table-column property="process" label="工序" width="80" />
 				<el-table-column property="createTime" label="入库时间" width="180">
@@ -422,12 +436,19 @@ export default {
 				process: null,
 				rollCode: null,
 				productName: null,
-				grade: null,
+				cpGrade: null,
+				fpGrade: null,
+				todayOrder: null,
 				todayOrder: null,
 				pageSize: 10,
 				pageNo: 1,
 				total: 1,
 			},
+			listQueryRules: {
+				planQty: [
+					{ pattern: /^\d+$/, message: '请输入有效的数字', trigger: 'blur' },
+				],
+			},
 			tableData: [{}],
 			regionArr,
 			potArr: [],
@@ -560,8 +581,10 @@ export default {
 			this.listQuery.process = this.listQuery.process || null;
 			this.listQuery.rollCode = this.listQuery.rollCode || null;
 			this.listQuery.productName = this.listQuery.productName || null;
-			this.listQuery.grade = this.listQuery.grade || null;
+			this.listQuery.cpGrade = this.listQuery.cpGrade || null;
+			this.listQuery.fpGrade = this.listQuery.fpGrade || null;
 			this.listQuery.todayOrder = this.listQuery.todayOrder || null;
+			this.listQuery.planQty = this.listQuery.planQty || null;
 			this.listQuery.startTime = this.listQuery.createTime
 				? this.listQuery.createTime[0]
 				: null;
diff --git a/src/views/asrs/warehouseLineMonitoring/index.vue b/src/views/asrs/warehouseLineMonitoring/index.vue
index a485213..963759f 100644
--- a/src/views/asrs/warehouseLineMonitoring/index.vue
+++ b/src/views/asrs/warehouseLineMonitoring/index.vue
@@ -263,6 +263,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
@@ -289,6 +296,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
@@ -315,6 +329,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
diff --git a/src/views/asrs/warehouseLineMonitoring/indexb.vue b/src/views/asrs/warehouseLineMonitoring/indexb.vue
index 079407e..4a6c9e1 100644
--- a/src/views/asrs/warehouseLineMonitoring/indexb.vue
+++ b/src/views/asrs/warehouseLineMonitoring/indexb.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-01-17 09:58:41
  * @LastEditors: zwq
- * @LastEditTime: 2024-12-23 17:00:32
+ * @LastEditTime: 2025-06-20 10:54:21
  * @Description:
 -->
 <template>
@@ -74,7 +74,9 @@
 					<el-row style="margin-bottom: 10px" type="flex" class="flex-warp">
 						<div
 							class="dashboard-layout-item"
-							v-for="j in wareData.filter((item) => item.region == 21).reverse()"
+							v-for="j in wareData
+								.filter((item) => item.region == 21)
+								.reverse()"
 							:key="j.id"
 							:title="j.lineEdgeLibraryCode">
 							<el-popover
@@ -263,6 +265,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
@@ -289,6 +298,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
@@ -315,6 +331,13 @@
 						<br />
 						<div class="point" />
 						Agv地码: {{ j.agvGroundCode }}
+						<br />
+						<el-button
+							@click="lState(j.id)"
+							v-hasPermi="['asrs:warehouse-line-monitoring:change']"
+							type="text">
+							改变库位状态
+						</el-button>
 						<div
 							slot="reference"
 							class="hoverDiv"
@@ -471,8 +494,8 @@ export default {
 	},
 	components: {},
 	created() {
-    this.listQuery.warehouseId = this.bId
-  },
+		this.listQuery.warehouseId = this.bId;
+	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {