From 848ebd3901f4e2a517de9e58cf23706214d744b1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 28 Dec 2023 09:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=80=80?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/productionReturn/job/returnDetail.vue | 29 +++++----------------
 static/config.json                          |  2 +-
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 46f8d568..9557298b 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -8,27 +8,9 @@
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
 
-			<view class="cen_card" style="margin-top: 10rpx;">
-				<view class="cell_box uni-flex uni-row" style="margin-top: 10rpx;">
-					<view class="cell_info">
-						<view class="text_lightblue">车间</view>
-						<view>{{jobContent.workshopCode}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">生产线</view>
-						<view>{{titleInfo.productionLineCode}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">工位</view>
-						<view>{{ titleInfo.workStationCode }}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">原材料库</view>
-						<view>{{ titleInfo.toLocationCode}}</view>
-					</view>
-				</view>
-			</view>
-			<u-line color="#D8D8D8" style="margin-bottom: 0rpx;margin-top: 10rpx;"></u-line>
+			<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
+				:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
+			</work-station>
 		</view>
 		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
 		<view class="page-main">
@@ -103,6 +85,7 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
 
 	export default {
 		name: 'receipt_detail',
@@ -114,8 +97,8 @@
 			comReturnDetailCard,
 			detailInfoPopup,
 			comMessage,
-			jobTop
-
+			jobTop,
+			workStation
 		},
 		data() {
 			return {
diff --git a/static/config.json b/static/config.json
index 310a012c..5ff11180 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.176:12080/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",