From 55e63664bc38378c6cd0b283b07409cb8631e9dc Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 16 May 2024 14:27:55 +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=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/odsRawOrderIn/index.vue   | 32 ++-------
 src/views/wms/order/index.vue           | 86 ++++++++-----------------
 src/views/wms/wmsRawOrderInSn/index.vue | 49 ++++++--------
 3 files changed, 53 insertions(+), 114 deletions(-)

diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 56f225d..0ebe7d2 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
-			
+
 			<el-form-item label="到货单号" prop="dnNo">
 				<el-input
 					v-model="queryParams.dnNo"
@@ -18,7 +18,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="物料编码" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -35,7 +35,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="供应商编码" prop="supplyCode" width="180">
 				<el-input
 					v-model="queryParams.supplyCode"
@@ -44,7 +44,7 @@
 					@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>
@@ -110,7 +110,7 @@
 			<el-table-column label="收货数量" align="center" prop="receiptAmount" />
 			<el-table-column label="备品数量" align="center" prop="shelvesAmount" />
 			<el-table-column label="单据状态" align="center" prop="orderStatus" />
-			
+
 			<el-table-column label="质检状态" align="center" prop="qualityStatus" />
 			<el-table-column label="收货人" align="center" prop="receiptOperator" />
 			<el-table-column label="收货时间" align="center" prop="receiptTime" width="180">
@@ -118,27 +118,9 @@
 					<span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
 				</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:odsRawOrderIn:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:odsRawOrderIn:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
+
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
diff --git a/src/views/wms/order/index.vue b/src/views/wms/order/index.vue
index e924c0e..ad15f04 100644
--- a/src/views/wms/order/index.vue
+++ b/src/views/wms/order/index.vue
@@ -55,16 +55,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:order: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:order:add']"-->
+<!--				>新增</el-button>-->
+<!--			</el-col>-->
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -105,9 +105,14 @@
       <el-table-column label="序号" type="index"   :index='indexMethod'> </el-table-column>
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="id" align="center" prop="id"  v-if="false" />
-			<el-table-column label="采购单号" align="center" prop="procureCode" />
-			<el-table-column label="物料编码" align="center" prop="materialCode" />
-			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+			<el-table-column label="采购单号" align="center" prop="procureCode" min-width="200"/>
+
+      <el-table-column label="物料编码" align="center" prop="materialCode"  min-width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.materialCode.replace(/^0{7}/, '') }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="300"/>
 			<el-table-column label="计划日期" align="center" prop="planDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
@@ -116,8 +121,13 @@
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="已入库数量" align="center" prop="realityNumber" v-if="false" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
-
+      <el-table-column label="订单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.orderStatus === '0'">未进行</span>
+          <span v-else-if="scope.row.orderStatus === '1'">进行中</span>
+          <span v-else-if="scope.row.orderStatus === '2'">完成</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" />
 			<el-table-column label="供应商名称" align="center" prop="supplierName" />
 			<el-table-column label="备注" align="center" prop="Remark" />
@@ -128,24 +138,7 @@
 				</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:order:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:order:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
+
 		</el-table>
 
 		<pagination
@@ -182,9 +175,7 @@
 				<el-form-item label="计划数量" prop="planNumber">
 					<el-input v-model="form.planNumber" placeholder="请输入计划数量" />
 				</el-form-item>
-				<el-form-item label="单位" prop="Unit">
-					<el-input v-model="form.Unit" placeholder="请输入单位" />
-				</el-form-item>
+
 				<el-form-item label="已入库数量" prop="realityNumber">
 					<el-input v-model="form.realityNumber" placeholder="请输入已入库数量" />
 				</el-form-item>
@@ -230,28 +221,7 @@
 				<el-form-item label="备注" prop="Remark">
 					<el-input v-model="form.Remark" placeholder="请输入备注" />
 				</el-form-item>
-				<el-form-item label="创建时间" prop="createDate">
-					<el-date-picker clearable
-						v-model="form.createDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择创建时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="最后更新人" prop="lastUpdateBy">
-					<el-input v-model="form.lastUpdateBy" placeholder="请输入最后更新人" />
-				</el-form-item>
-				<el-form-item label="最后更新时间" prop="lastUpdateDate">
-					<el-date-picker clearable
-						v-model="form.lastUpdateDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择最后更新时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="可用标识" prop="Active">
-					<el-input v-model="form.Active" placeholder="请输入可用标识" />
-				</el-form-item>
+
 				<el-form-item label="企业主键" prop="enterpriseId">
 					<el-input v-model="form.enterpriseId" placeholder="请输入企业主键" />
 				</el-form-item>
diff --git a/src/views/wms/wmsRawOrderInSn/index.vue b/src/views/wms/wmsRawOrderInSn/index.vue
index dd50620..d971756 100644
--- a/src/views/wms/wmsRawOrderInSn/index.vue
+++ b/src/views/wms/wmsRawOrderInSn/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
-			
+
 			<el-form-item label="库位编码" prop="wlCode">
 				<el-input
 					v-model="queryParams.wlCode"
@@ -26,7 +26,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -51,7 +51,7 @@
 					@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>
@@ -106,44 +106,31 @@
 
 		<el-table v-loading="loading" :data="wmsRawOrderInSnList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			
-			<el-table-column label="仓库编码" align="center" prop="whCode" />
-			
-			<el-table-column label="库位编码" align="center" prop="wlCode" />
-			<el-table-column label="到货单号" align="center" prop="orderNo" />
+
+			<el-table-column label="到货单号" align="center" prop="userDefined5" :min-width="200"/>
 			<el-table-column label="采购单号" align="center" prop="poNo" />
 			<el-table-column label="采购行号" align="center" prop="poLine" />
-			<el-table-column label="物料号" align="center" prop="materialCode" />
-			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+      <el-table-column label="物料编码" align="center" prop="materialCode"  min-width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.materialCode.replace(/^0{7}/, '') }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料描述" align="center" prop="materialDesc":min-width="300"/>
 			<el-table-column label="托盘号" align="center" prop="sn" />
 			<el-table-column label="数量" align="center" prop="amount" />
-			
+
+      <el-table-column label="仓库编码" align="center" prop="whCode" />
+
+      <el-table-column label="库位编码" align="center" prop="wlCode" />
 			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
 				</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:wmsRawOrderInSn:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:wmsRawOrderInSn:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
+
+
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"