From 042ae8e73eeec20d2c42a90381e461e536e3c02f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 15 Aug 2024 11:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/index.vue                     |  8 ++++----
 src/views/wms/outorderfc/index.vue                | 15 +++------------
 .../wms/wmsProductProductionRecords/index.vue     |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/order/index.vue b/src/views/wms/order/index.vue
index ad15f04..fb6bb3a 100644
--- a/src/views/wms/order/index.vue
+++ b/src/views/wms/order/index.vue
@@ -120,12 +120,12 @@
 			</el-table-column>
 			<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="realityNumber" />
       <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>
+          <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" />
diff --git a/src/views/wms/outorderfc/index.vue b/src/views/wms/outorderfc/index.vue
index 85b7140..ff0f5d9 100644
--- a/src/views/wms/outorderfc/index.vue
+++ b/src/views/wms/outorderfc/index.vue
@@ -59,7 +59,6 @@
 			<el-table-column label="单位" align="center" prop="unit" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
-			<!-- <el-table-column label="托盘号" align="center" prop="userDefined2" /> -->
       <el-table-column label="需求时间" align="center" prop="userDefined5" />
 			<el-table-column label="仓库编号" align="center" prop="locCode" />
 			<el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />
@@ -83,24 +82,16 @@
 				</template>
 			</el-table-column>
       <el-table-column label="过账凭证" align="center" prop="userDefined9" />
-<!--			<el-table-column label="sap过账信息" align="center" prop="userDefined11" />-->
+
       <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
-<!--      <el-table-column label="sap反冲过账信息" align="center" prop="sapXMag" />-->
+
 			<el-table-column label="操作人" align="center" prop="createBy" />
 			<el-table-column label="操作时间" align="center" prop="createDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</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:outorder:edit']">修改</el-button>
-					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-						v-hasPermi="['wms:outorder:remove']">删除</el-button>
-				</template>
-			</el-table-column> -->
+
 		</el-table>
 
 		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
diff --git a/src/views/wms/wmsProductProductionRecords/index.vue b/src/views/wms/wmsProductProductionRecords/index.vue
index 1d2d350..2a8a88a 100644
--- a/src/views/wms/wmsProductProductionRecords/index.vue
+++ b/src/views/wms/wmsProductProductionRecords/index.vue
@@ -111,7 +111,7 @@
       <el-table-column label="产线名称" align="center" prop="lineName" width="200px" />
       <el-table-column label="数量" align="center" prop="quantity" />
       <el-table-column label="托盘号" align="center" prop="sn" width="200px"/>
-
+      <el-table-column label="标识卡" align="center" prop="userDefined1" width="200px"/>
       <el-table-column label="记录日期" align="center" prop="productDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>