From 92ae61d55de6fe6faa339196f1ed516650c6a67c Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 15:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=94=B3=E8=AF=B7=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E5=87=BA=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/new_style.css                    |  5 ++
 mycomponents/balance/balance.vue              |  5 +-
 mycomponents/balance/toLocation.vue           |  2 +-
 mycomponents/detail/comRequestDetailCard.vue  |  1 -
 .../detail/requestDetailBasicInfo.vue         | 58 ++++---------------
 .../detail/requestDetailCommonInfo.vue        | 11 +++-
 mycomponents/recommend/recommend.vue          |  9 ++-
 .../coms/requestDetailInfoPopup.vue           |  6 +-
 pages/purchaseReturn/record/returnRecord.vue  |  7 +--
 .../purchaseReturn/request/returnRequest.vue  |  2 +-
 .../request/returnRequestDetail.vue           | 10 ++--
 11 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index 783cb8ca..3c571912 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -2104,6 +2104,11 @@ button::after {
 	padding: 5px;
 }
 
+.card_to_location {
+	color: #329362;
+	padding: 5px;
+}
+
 .card_location_content {
 	font-size: 32rpx;
 	padding: 5px;
diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue
index cc47d918..f22ba25b 100644
--- a/mycomponents/balance/balance.vue
+++ b/mycomponents/balance/balance.vue
@@ -5,7 +5,8 @@
 				<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
 				<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
 				<location title="来源库位" v-if="isShowFromLocation" :locationCode="dataContent.locationCode"></location>
-				<location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode"></location>
+				<to-location title="目标库位" v-if="isShowToLocation" :locationCode="dataContent.toLocationCode">
+				</to-location>
 			</view>
 			<view>
 				<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
@@ -28,6 +29,7 @@
 <script>
 	import pack from '@/mycomponents/balance/pack.vue'
 	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
 	import qty from '@/mycomponents/qty/qty.vue'
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
@@ -37,6 +39,7 @@
 		components: {
 			pack,
 			location,
+			toLocation,
 			batch,
 			qty,
 			recommendQty,
diff --git a/mycomponents/balance/toLocation.vue b/mycomponents/balance/toLocation.vue
index d5956aa4..d44ba995 100644
--- a/mycomponents/balance/toLocation.vue
+++ b/mycomponents/balance/toLocation.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="card_view ">
-		<text class="card_location card_content ">{{title}}</text>
+		<text class="card_to_location card_content ">{{title}}</text>
 		<text class="card_content ">{{locationCode}}</text>
 	</view>
 </template>
diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 96110434..6b8d2534 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -20,7 +20,6 @@
 								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line />
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
diff --git a/mycomponents/detail/requestDetailBasicInfo.vue b/mycomponents/detail/requestDetailBasicInfo.vue
index 8c650986..50cd5f75 100644
--- a/mycomponents/detail/requestDetailBasicInfo.vue
+++ b/mycomponents/detail/requestDetailBasicInfo.vue
@@ -1,16 +1,17 @@
 <template>
-
 	<view class="">
-		<comListItem :dataList="dataList"></comListItem>
+		<detail-basic-info :dataContent="dataContent"></detail-basic-info>
+		<!-- <comListItem :dataList="dataList"></comListItem> -->
+		 
 	</view>
-
 </template>
 
 <script>
-	import comListItem from '@/mycomponents/common/comListItem.vue';
+	 
+	import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue'
 	export default {
 		components: {
-			comListItem
+			 detailBasicInfo
 		},
 		data() {
 			return {
@@ -18,46 +19,7 @@
 			}
 		},
 		watch: {
-			dataContent: {
-				handler(newName, oldName) {
-					this.dataList = [ {
-						title: '物品描述1',
-						content: this.dataContent.itemDesc1,
-					}, {
-						title: '物品描述2',
-						content: this.dataContent.itemDesc2,
-					}, {
-						title: '数量',
-						content: this.dataContent.qty,
-					},  {
-						title: '计量单位',
-						content: this.dataContent.uom,
-						type:"uom"
-					},
-					{
-						title: '项目代码',
-						content: this.dataContent.projectCode,
-					},{
-						title: '最后更新时间',
-						content: this.dataContent.updateTime,
-						type:"dateTime"
-					},
-					{
-						title: '最后更新者Id',
-						content: this.dataContent.lastModifierId,
-					},
-					{
-						title: '最后更新者用户名',
-						content: this.dataContent.lastModiferName,
-					},
-					{
-						title: '并发乐观锁',
-						content: this.dataContent.concurrencyStamp,
-					}];
-				},
-				immediate: true,
-				deep: true
-			}
+		 
 		},
 
 		mounted() {},
@@ -68,7 +30,11 @@
 			}
 		},
 
-		methods: {}
+		methods: {
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			}
+		}
 	}
 </script>
 
diff --git a/mycomponents/detail/requestDetailCommonInfo.vue b/mycomponents/detail/requestDetailCommonInfo.vue
index 01a6279a..0ee0c863 100644
--- a/mycomponents/detail/requestDetailCommonInfo.vue
+++ b/mycomponents/detail/requestDetailCommonInfo.vue
@@ -3,10 +3,13 @@
 		<com-item :dataContent="dataContent"></com-item>
 		<u-line></u-line>
 		<scroll-view style="height:320px ">
-			<requestDetailBasicInfo :dataContent="dataContent"></requestDetailBasicInfo>
+			<!-- 物品 -->
+			<detail-basic-info :dataContent="dataContent"></detail-basic-info>
+			<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
 			<u-line></u-line>
-		<!-- 	<detail-recommend-info :dataContent="dataContent"></detail-recommend-info>
-			<u-line></u-line> -->
+			<!-- 包装 -->
+
+			<!-- 库存余额 -->
 			<slot>
 				<!-- 每个任务的详情 -->
 			</slot>
@@ -24,6 +27,7 @@
 	import comItem from '@/mycomponents/item/item.vue'
 	import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue'
 	import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue'
+	import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue'
 
 	export default {
 		emits: ['onClose'],
@@ -31,6 +35,7 @@
 			comItem,
 			requestDetailBasicInfo,
 			detailRecommendInfo,
+			detailBasicInfo
 		},
 		data() {
 			return {}
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 37fc81cc..0efadef8 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -1,14 +1,15 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
-		<view class="uni-flex uni-row space-between"  style="align-items: center">
+		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view>
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
 				</location>
-				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
-				</location>
+				<!-- 	<to-location></to-location> -->
+				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
+				</to-location>
 			</view>
 			<view>
 				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
@@ -30,6 +31,7 @@
 <script>
 	import pack from '@/mycomponents/balance/pack.vue'
 	import location from '@/mycomponents/balance/location.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
 	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
@@ -38,6 +40,7 @@
 		components: {
 			pack,
 			location,
+			toLocation,
 			batch,
 			recommendQty,
 			compareQty
diff --git a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
index dce67535..422777b6 100644
--- a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
+++ b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="">
 		<uni-popup ref="popup">
-			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
+			<request-detail-common-info :dataContent="dataContent" @onClose="closePopup">
 				<view class="">
-					<comListItem :dataList="dataList"></comListItem>
+					<!-- <comListItem :dataList="dataList"></comListItem> -->
 				</view>
-			</requestDetailCommonInfo>
+			</request-detail-common-info>
 		</uni-popup>
 	</view>
 </template>
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 32cb1766..1303806f 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -4,24 +4,19 @@
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
-
 			<view class="page-header">
-				<!-- <view class="header_job_top">
-					<job-top :dataContent="jobContent"></job-top>
-				</view> -->
 				<view class="header_item">
 					采购订单：{{poNumber}}
 				</view>
 				<u-line color="#D8D8D8"></u-line>
 			</view>
 
-
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" @removeItem="removeItem(index,item)"
-								@updateData="updateData" @removePack="removePack">
+								@updateData="updateData" @removePack="removePack" :isShowToLocation="false">
 							</record-com-detail-card>
 						</view>
 					</view>
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
index 0d43048c..901f6f03 100644
--- a/pages/purchaseReturn/request/returnRequest.vue
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -268,7 +268,7 @@
 				getPurchaseReturnRequestList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+						that.showMessage('未查找到' + '【' + code + '】的退货任务');
 					} else if (res.data.list.length == 1) {
 						that.openRequestDetail(res.data.list[0]);
 					}
diff --git a/pages/purchaseReturn/request/returnRequestDetail.vue b/pages/purchaseReturn/request/returnRequestDetail.vue
index d4b23b4a..1425408a 100644
--- a/pages/purchaseReturn/request/returnRequestDetail.vue
+++ b/pages/purchaseReturn/request/returnRequestDetail.vue
@@ -4,15 +4,14 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comRequestDetailCard :dataContent="item" 
+						<com-request-detail-card :dataContent="item" 
 							 @openDetail="openDetail">
-						</comRequestDetailCard>
+						</com-request-detail-card>
 					</view>
 				</view>
 			</scroll-view>
 		</view>
-
-		<requestDetailInfoPopup ref="jobDetailPopup"></requestDetailInfoPopup>
+		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
 		<com-message ref="comMessage"></com-message>
 	</view>
 </template>
@@ -86,7 +85,8 @@
 						that.requestContent = res.data;
 						that.subList = res.data.subList;
 						that.subList.forEach(res=>{
-							res.fromLocationCode = res.toLocationCode
+							// res.fromLocationCode = res.toLocationCode
+							res.locationCode = res.fromLocationCode
 						})
 						that.detailSource = getDataSource(that.subList);
 					} else {