From e02a1e48e03b3bc1166fde7b70dedc1a09ad3e0f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 26 Feb 2024 10:55:24 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matetowsn/index.vue | 14 +++++++-------
 src/views/wms/outorder/index.vue  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index b351df1..8dfb43b 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -25,7 +25,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -50,7 +50,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="数量" prop="amount">
 				<el-input
 					v-model="queryParams.amount"
@@ -153,7 +153,7 @@
 			</el-table-column>
 			<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
 			<el-table-column label="工厂号" align="center" prop="factoryCode" />
-			
+
 		</el-table>
 
 		<pagination
@@ -252,11 +252,11 @@
 				<el-form-item label="有效标记" prop="activeFlag">
 					<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
 				</el-form-item>
-				<el-form-item label="${comment}" prop="factoryCode">
-					<el-input v-model="form.factoryCode" placeholder="请输入${comment}" />
+				<el-form-item label="工厂号" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂号" />
 				</el-form-item>
-				<el-form-item label="${comment}" prop="sapFactoryCode">
-					<el-input v-model="form.sapFactoryCode" placeholder="请输入${comment}" />
+				<el-form-item label="SAP工厂号" prop="sapFactoryCode">
+					<el-input v-model="form.sapFactoryCode" placeholder="请输入SAP工厂号" />
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue
index 6412091..6da8610 100644
--- a/src/views/wms/outorder/index.vue
+++ b/src/views/wms/outorder/index.vue
@@ -146,7 +146,7 @@
 				</el-table-column>
 				<el-table-column label="包装线" align="center" prop="stationNo" width="180">
 					<template slot-scope="scope">
-						<el-select v-model="scope.row.stationNo" placeholder="请选择包装线" @change="change1(scope.row)" clearable
+						<el-select v-model="scope.row.productionLineCode" placeholder="请选择包装线" @change="change1(scope.row)" clearable
 							filterable>
 							<el-option v-for="item in Packagingline" :key="item.stationNo" :label="item.stationname"
 								:value="item.stationNo">