From 2db3212c608a65622096dd29ee3e3ddb6df871d1 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Wed, 27 Oct 2021 17:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/component/artComponent.vue          | 33 ++++++++++++++++---
 .../basic/component/pkgComponent.vue          | 29 ++++++++++++++--
 src/views/productexe/basic/dispatchOrder.vue  |  4 +++
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/views/productexe/basic/component/artComponent.vue b/src/views/productexe/basic/component/artComponent.vue
index 3247880..aaaf4a3 100644
--- a/src/views/productexe/basic/component/artComponent.vue
+++ b/src/views/productexe/basic/component/artComponent.vue
@@ -1,10 +1,19 @@
 <template>
 	<el-dialog title="零件明细" width="80%" :visible.sync="currentVisible" :close-on-click-modal="false" :before-close="cancel">
-		<el-table v-loading="loading" :data="dataList" border height="500px">
-			<el-table-column v-for="(item, index) in headers" :key="index" width="120" :label="getColumnName(item)" :show-overflow-tooltip="true">
+		<el-table v-loading="loading" :data="dataList" border height="500px" >
+			<el-table-column
+				v-for="(item, index) in headers"
+				:key="index"
+				width="120"
+				align="center"
+				:label="getColumnName(item)"
+				:show-overflow-tooltip="true">
 				<template slot-scope="scope">
 					<span v-if="item === 'JIT_ShipOrderItemlst-PlantNr'">{{ getValue(scope.row['JIT_ShipOrderItemlst-PlantNr']) }}</span>
-					<span v-if="item === 'JIT_ShipOrderItemlst-ItemType'">{{ fieldTrans(scope.row['JIT_ShipOrderItemlst-ItemType']) }}</span>
+					<span v-else-if="item === 'JIT_ShipOrderItemlst-ItemType'">{{ fieldTrans(scope.row['JIT_ShipOrderItemlst-ItemType']) }}</span>
+					<div 
+						v-else-if="item === 'JIT_ShipOrderItemlst-Status'"
+						:class="[colorData[scope.row[item]], 'bg-div']"> {{ fieldTransOrder(scope.row[item]) }} </div>
 					<span v-else-if="item === 'JIT_ShipOrderItemlst-ShortTime'"> {{ parseTime(scope.row[item]) }} </span>
 					<span v-else>{{ scope.row[item] }}</span>
 				</template>
@@ -27,6 +36,12 @@ export default {
 		},
 		item: {
 			default: {},
+		},
+		colorData: {
+			default: {},
+		},
+		orderStatusArray: {
+			default: []
 		}
 	},
 	data() {
@@ -69,7 +84,6 @@ export default {
 		}
 	},
 	created() {
-		// 订单生产状态
 		this.getStanderOne({ statid: 'ItemType' }).then(res => {
 			this.itemTypeArray = res.data
 		})
@@ -89,6 +103,17 @@ export default {
 				return fieldValue
 			}
 		},
+		fieldTransOrder(value) {
+			if (this.orderStatusArray.length > 0) {
+				let fieldValue = ''
+				this.orderStatusArray.forEach(el => {
+					if (value === Number(el['stdeftab-stdeftyp'])) {
+						fieldValue = el['stdeftab-bez']
+					}
+				})
+				return fieldValue
+			}
+		},
 	},
 	mounted() {
 		this.dataList = []
diff --git a/src/views/productexe/basic/component/pkgComponent.vue b/src/views/productexe/basic/component/pkgComponent.vue
index 75bfc2a..f6f1906 100644
--- a/src/views/productexe/basic/component/pkgComponent.vue
+++ b/src/views/productexe/basic/component/pkgComponent.vue
@@ -1,9 +1,17 @@
 <template>
 	<el-dialog title="包装单明细" width="80%" :visible.sync="currentVisible" :close-on-click-modal="false" :before-close="cancel">
 		<el-table v-loading="loading" :data="dataList" border height="500px">
-			<el-table-column v-for="(item, index) in headers" :key="index" :label="getColumnName(item)" :show-overflow-tooltip="true">
+			<el-table-column 
+				v-for="(item, index) in headers" 
+				align="center" 
+				:key="index" 
+				:label="getColumnName(item)" 
+				:show-overflow-tooltip="true">
 				<template slot-scope="scope">
 					<span v-if="item === 'JIT_ShipOrderDatalst-PlantNr'">{{ getValue(scope.row['JIT_ShipOrderDatalst-PlantNr']) }}</span>
+					<div 
+						v-else-if="item === 'JIT_ShipOrderDatalst-Status'"
+						:class="[colorData[scope.row[item]], 'bg-div']"> {{ fieldTrans(scope.row[item]) }} </div>
 					<span v-else>{{ scope.row[item] }}</span>
 				</template>
 			</el-table-column>
@@ -25,6 +33,12 @@ export default {
 		},
 		item: {
 			default: {},
+		},
+		colorData: {
+			default: {},
+		},
+		orderStatusArray: {
+			default: []
 		}
 	},
 	data() {
@@ -32,9 +46,9 @@ export default {
 			currentVisible: this.isPkgVisible,
 			loading: false,
 			headers: [
+				"JIT_ShipOrderDatalst-Pos",
 				"JIT_ShipOrderDatalst-PlantNr",
 				"JIT_ShipOrderDatalst-ShipOrderId",
-				"JIT_ShipOrderDatalst-Pos",
 				"JIT_ShipOrderDatalst-ShipObjId",
 				"JIT_ShipOrderDatalst-ShipObjBarcode",
 				"JIT_ShipOrderDatalst-ItemId",
@@ -49,6 +63,17 @@ export default {
 		cancel() {
 			this.$emit('completeCallBack', false)
 		},
+		fieldTrans(value) {
+			if (this.orderStatusArray.length > 0) {
+				let fieldValue = ''
+				this.orderStatusArray.forEach(el => {
+					if (value === Number(el['stdeftab-stdeftyp'])) {
+						fieldValue = el['stdeftab-bez']
+					}
+				})
+				return fieldValue
+			}
+		},
 	},
 	mounted() {
 		this.dataList = []
diff --git a/src/views/productexe/basic/dispatchOrder.vue b/src/views/productexe/basic/dispatchOrder.vue
index 033645a..571c360 100644
--- a/src/views/productexe/basic/dispatchOrder.vue
+++ b/src/views/productexe/basic/dispatchOrder.vue
@@ -79,11 +79,15 @@
 			v-if="isVisible"
 			:isVisible="isVisible"
 			:item="item"
+			:colorData="colorData"
+			:orderStatusArray="orderStatusArray"
 			@completeCallBack="completeCallBackArt"/>
 		<pkgComponent 
 			v-if="isPkgVisible"
 			:isPkgVisible="isPkgVisible"
 			:item="item"
+			:colorData="colorData"
+			:orderStatusArray="orderStatusArray"
 			@completeCallBack="completeCallBackPkg"/>
   </div>
 </template>