From 35b49e2e779088abfe7ba88b8e37d3e6ccbddf8f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 22 May 2024 11:42:06 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/major/index.vue | 413 +++++++++++++++++-----------------
 1 file changed, 207 insertions(+), 206 deletions(-)

diff --git a/src/views/wms/major/index.vue b/src/views/wms/major/index.vue
index f4d80cd..4a9cbaa 100644
--- a/src/views/wms/major/index.vue
+++ b/src/views/wms/major/index.vue
@@ -1,14 +1,14 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="唯一序列" prop="storageId">
-				<el-input
-					v-model="queryParams.storageId"
-					placeholder="请输入唯一序列"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="唯一序列" prop="storageId">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.storageId"-->
+<!--					placeholder="请输入唯一序列"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 			<el-form-item label="仓库编码" prop="whCode">
 				<el-input
 					v-model="queryParams.whCode"
@@ -41,6 +41,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
+      <el-form-item label="库位名称" prop="wlName">
+        <el-input
+          v-model="queryParams.wlName"
+          placeholder="请输入库位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 			<el-form-item label="产品编码" prop="productCode">
 				<el-input
 					v-model="queryParams.productCode"
@@ -81,22 +89,22 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="LPN" prop="lpn">
-				<el-input
-					v-model="queryParams.lpn"
-					placeholder="请输入LPN"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="入库批次号" prop="productBatch">
-				<el-input
-					v-model="queryParams.productBatch"
-					placeholder="请输入入库批次号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="LPN" prop="lpn">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.lpn"-->
+<!--					placeholder="请输入LPN"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="入库批次号" prop="productBatch">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.productBatch"-->
+<!--					placeholder="请输入入库批次号"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 			<el-form-item label="入库时间" prop="receiveDate">
 				<el-date-picker clearable
 					v-model="queryParams.receiveDate"
@@ -105,14 +113,14 @@
 					placeholder="请选择入库时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="生产时间" prop="productDate">
-				<el-date-picker clearable
-					v-model="queryParams.productDate"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择生产时间">
-				</el-date-picker>
-			</el-form-item>
+<!--			<el-form-item label="生产时间" prop="productDate">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.productDate"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="请选择生产时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
 			<el-form-item label="单位" prop="userDefined1">
 				<el-input
 					v-model="queryParams.userDefined1"
@@ -121,78 +129,78 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="SAP库位" prop="userDefined2">
-				<el-input
-					v-model="queryParams.userDefined2"
-					placeholder="请输入SAP库位"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用3" prop="userDefined3">
-				<el-input
-					v-model="queryParams.userDefined3"
-					placeholder="请输入备用3"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用4" prop="userDefined4">
-				<el-input
-					v-model="queryParams.userDefined4"
-					placeholder="请输入备用4"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用5" prop="userDefined5">
-				<el-input
-					v-model="queryParams.userDefined5"
-					placeholder="请输入备用5"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用6" prop="userDefined6">
-				<el-input
-					v-model="queryParams.userDefined6"
-					placeholder="请输入备用6"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用7" prop="userDefined7">
-				<el-input
-					v-model="queryParams.userDefined7"
-					placeholder="请输入备用7"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用8" prop="userDefined8">
-				<el-input
-					v-model="queryParams.userDefined8"
-					placeholder="请输入备用8"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用9" prop="userDefined9">
-				<el-input
-					v-model="queryParams.userDefined9"
-					placeholder="请输入备用9"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="备用10" prop="userDefined10">
-				<el-input
-					v-model="queryParams.userDefined10"
-					placeholder="请输入备用10"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="SAP库位" prop="userDefined2">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined2"-->
+<!--					placeholder="请输入SAP库位"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用3" prop="userDefined3">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined3"-->
+<!--					placeholder="请输入备用3"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用4" prop="userDefined4">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined4"-->
+<!--					placeholder="请输入备用4"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用5" prop="userDefined5">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined5"-->
+<!--					placeholder="请输入备用5"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用6" prop="userDefined6">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined6"-->
+<!--					placeholder="请输入备用6"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用7" prop="userDefined7">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined7"-->
+<!--					placeholder="请输入备用7"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用8" prop="userDefined8">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined8"-->
+<!--					placeholder="请输入备用8"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用9" prop="userDefined9">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined9"-->
+<!--					placeholder="请输入备用9"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="备用10" prop="userDefined10">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.userDefined10"-->
+<!--					placeholder="请输入备用10"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 			<el-form-item label="创建时间" prop="gmtCreate">
 				<el-date-picker clearable
 					v-model="queryParams.gmtCreate"
@@ -201,54 +209,47 @@
 					placeholder="请选择创建时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="最后更新人" prop="lastModifiedBy">
-				<el-input
-					v-model="queryParams.lastModifiedBy"
-					placeholder="请输入最后更新人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="最后更新时间" prop="gmtModified">
-				<el-date-picker clearable
-					v-model="queryParams.gmtModified"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择最后更新时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="有效标记" prop="activeFlag">
-				<el-input
-					v-model="queryParams.activeFlag"
-					placeholder="请输入有效标记"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="工厂号" prop="factoryCode">
-				<el-input
-					v-model="queryParams.factoryCode"
-					placeholder="请输入工厂号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="SAP工厂号" prop="sapFactoryCode">
-				<el-input
-					v-model="queryParams.sapFactoryCode"
-					placeholder="请输入SAP工厂号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="库位名称" prop="wlName">
-				<el-input
-					v-model="queryParams.wlName"
-					placeholder="请输入库位名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="最后更新人" prop="lastModifiedBy">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.lastModifiedBy"-->
+<!--					placeholder="请输入最后更新人"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="时间" prop="gmtModified">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.gmtModified"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="有效标记" prop="activeFlag">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.activeFlag"-->
+<!--					placeholder="请输入有效标记"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="工厂号" prop="factoryCode">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.factoryCode"-->
+<!--					placeholder="请输入工厂号"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="SAP工厂号" prop="sapFactoryCode">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.sapFactoryCode"-->
+<!--					placeholder="请输入SAP工厂号"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -256,16 +257,16 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:major:add']"
-				>新增</el-button>
-			</el-col>
+<!--			<el-col :span="1.5">-->
+<!--				<el-button-->
+<!--					type="primary"-->
+<!--					plain-->
+<!--					icon="el-icon-plus"-->
+<!--					size="mini"-->
+<!--					@click="handleAdd"-->
+<!--					v-hasPermi="['wms:major:add']"-->
+<!--				>新增</el-button>-->
+<!--			</el-col>-->
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -303,7 +304,7 @@
 
 		<el-table v-loading="loading" :data="majorList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="唯一序列" align="center" prop="storageId" />
+			<el-table-column label="唯一序列" align="center" prop="storageId" v-if="false" />
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="区域编号" align="center" prop="regionCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" />
@@ -315,27 +316,27 @@
 			<el-table-column label="冻结数量" align="center" prop="storageAmount" />
 			<el-table-column label="占用数量" align="center" prop="occupyAmount" />
 			<el-table-column label="LPN" align="center" prop="lpn" />
-			<el-table-column label="入库批次号" align="center" prop="productBatch" />
+<!--			<el-table-column label="入库批次号" align="center" prop="productBatch" />-->
 			<el-table-column label="入库时间" align="center" prop="receiveDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="生产时间" align="center" prop="productDate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
+<!--			<el-table-column label="生产时间" align="center" prop="productDate" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
 			<el-table-column label="单位" align="center" prop="userDefined1" />
 			<el-table-column label="SAP库位" align="center" prop="userDefined2" />
-			<el-table-column label="备用3" align="center" prop="userDefined3" />
-			<el-table-column label="备用4" align="center" prop="userDefined4" />
-			<el-table-column label="备用5" align="center" prop="userDefined5" />
-			<el-table-column label="备用6" align="center" prop="userDefined6" />
-			<el-table-column label="备用7" align="center" prop="userDefined7" />
-			<el-table-column label="备用8" align="center" prop="userDefined8" />
-			<el-table-column label="备用9" align="center" prop="userDefined9" />
-			<el-table-column label="备用10" align="center" prop="userDefined10" />
+			<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
+			<el-table-column label="备用4" align="center" prop="userDefined4" v-if="false" />
+			<el-table-column label="备用5" align="center" prop="userDefined5" v-if="false" />
+			<el-table-column label="备用6" align="center" prop="userDefined6"v-if="false" />
+			<el-table-column label="备用7" align="center" prop="userDefined7" v-if="false" />
+			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
+			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
+			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
 			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
@@ -351,24 +352,24 @@
 			<el-table-column label="工厂号" align="center" prop="factoryCode" />
 			<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" />
 			<el-table-column label="库位名称" align="center" prop="wlName" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:major:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:major:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
+<!--			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--				<template slot-scope="scope">-->
+<!--					<el-button-->
+<!--						size="mini"-->
+<!--						type="text"-->
+<!--						icon="el-icon-edit"-->
+<!--						@click="handleUpdate(scope.row)"-->
+<!--						v-hasPermi="['wms:major:edit']"-->
+<!--					>修改</el-button>-->
+<!--					<el-button-->
+<!--						size="mini"-->
+<!--						type="text"-->
+<!--						icon="el-icon-delete"-->
+<!--						@click="handleDelete(scope.row)"-->
+<!--						v-hasPermi="['wms:major:remove']"-->
+<!--					>删除</el-button>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
 		</el-table>
 
 		<pagination
@@ -415,9 +416,9 @@
 				<el-form-item label="LPN" prop="lpn">
 					<el-input v-model="form.lpn" placeholder="请输入LPN" />
 				</el-form-item>
-				<el-form-item label="入库批次号" prop="productBatch">
-					<el-input v-model="form.productBatch" placeholder="请输入入库批次号" />
-				</el-form-item>
+<!--				<el-form-item label="入库批次号" prop="productBatch">-->
+<!--					<el-input v-model="form.productBatch" placeholder="请输入入库批次号" />-->
+<!--				</el-form-item>-->
 				<el-form-item label="入库时间" prop="receiveDate">
 					<el-date-picker clearable
 						v-model="form.receiveDate"
@@ -426,14 +427,14 @@
 						placeholder="请选择入库时间">
 					</el-date-picker>
 				</el-form-item>
-				<el-form-item label="生产时间" prop="productDate">
-					<el-date-picker clearable
-						v-model="form.productDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择生产时间">
-					</el-date-picker>
-				</el-form-item>
+<!--				<el-form-item label="生产时间" prop="productDate">-->
+<!--					<el-date-picker clearable-->
+<!--						v-model="form.productDate"-->
+<!--						type="date"-->
+<!--						value-format="yyyy-MM-dd"-->
+<!--						placeholder="请选择生产时间">-->
+<!--					</el-date-picker>-->
+<!--				</el-form-item>-->
 				<el-form-item label="单位" prop="userDefined1">
 					<el-input v-model="form.userDefined1" placeholder="请输入单位" />
 				</el-form-item>