From a0ea8efa68d2a64bdcf0ac65a1da246b604d114c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 7 Dec 2023 10:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/job/jobRequestInfo.vue | 36 ++++++++++++++++++++++++++---
 mycomponents/job/jobTop.vue         |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/mycomponents/job/jobRequestInfo.vue b/mycomponents/job/jobRequestInfo.vue
index 66d18570..59294f68 100644
--- a/mycomponents/job/jobRequestInfo.vue
+++ b/mycomponents/job/jobRequestInfo.vue
@@ -8,11 +8,11 @@
 				</view>
 				<view class="item">
 					<text class="item_title">申请时间 : </text>
-					<text class="text_wrap">{{dataContent.requestTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">要求截至时间 : </text>
-					<text class="text_wrap">{{dataContent.requestDueTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.requestDueTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">从仓库代码 : </text>
@@ -22,16 +22,34 @@
 					<text class="item_title">到仓库代码 : </text>
 					<text class="text_wrap">{{dataContent.toWarehouseCode}} </text>
 				</view>
+				<view class="item">
+					<text class="item_title">出库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.outInventoryStatuses))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">入库库存状态范围 : </text>
+					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.inInventoryStatuses))}} </text>
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc
+	} from '@/common/directory.js';
+	
 	export default {
 		components: {},
 		data() {
 			return {
+				list:["OK"]
 
 			}
 		},
@@ -44,7 +62,19 @@
 			}
 		},
 
-		methods: {}
+		methods: {
+			dateFormat(value){
+				return dateFormat(value)
+			},
+			getInventoryStatusDesc(value){
+				return getInventoryStatusDesc(value)
+			},
+			
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			}
+			
+		}
 	}
 </script>
 
diff --git a/mycomponents/job/jobTop.vue b/mycomponents/job/jobTop.vue
index 56562d7e..66f985d3 100644
--- a/mycomponents/job/jobTop.vue
+++ b/mycomponents/job/jobTop.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="task_top">
-		<view class="uni-flex space-between u-col-center">
+		<view class="uni-flex space-between u-col-center align-center" style="margin: 10rpx;">
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>