From 06f16ecca2dd9bd78e522fb58fe7f16f4ca7958a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 8 Dec 2023 17:27:15 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/directory.js                           | 37 ++++++-
 mycomponents/common/comListItem.vue           | 50 +++++++++-
 mycomponents/detail/comDetailCard.vue         |  8 +-
 mycomponents/detail/recordDetailBasicInfo.vue |  1 +
 .../detail/requestDetailBasicInfo.vue         |  4 +-
 mycomponents/job/jobRequestInfo.vue           | 15 ++-
 mycomponents/package/packageDetailPopup.vue   |  3 +-
 mycomponents/record/recordMainInfo.vue        | 52 +++++++---
 mycomponents/request/requestCommonInfo.vue    |  2 -
 .../request/requestListCommonInfo.vue         |  3 +-
 .../customerReturn/coms/requestInfoPopup.vue  |  2 +
 pages/deliver/coms/requestInfoPopup.vue       |  6 +-
 pages/inspect/coms/requestInfoPopup.vue       | 10 +-
 .../issue/coms/comIssueRequestDetailCard.vue  |  7 +-
 pages/issue/coms/comIssueRequestInfo.vue      |  3 +-
 pages/issue/coms/requestInfoPopup.vue         |  3 +
 pages/issue/request/issueRequestDetail.vue    |  2 +-
 .../coms/requestInfoPopup.vue                 | 20 +++-
 .../coms/requestDetailInfoPopup.vue           | 12 ---
 .../productPutaway/coms/requestInfoPopup.vue  |  2 +
 pages/productionReturn/coms/comReturn.vue     |  1 -
 .../coms/requestInfoPopup.vue                 |  2 +
 .../purchaseReceipt/coms/receiptInfoPopup.vue |  8 +-
 .../coms/comReturnRequestCard.vue             |  2 +-
 .../coms/requestDetailInfoPopup.vue           | 99 ++++++++++---------
 .../purchaseReturn/coms/requestInfoPopup.vue  | 11 ++-
 pages/purchaseReturn/coms/returnInfoPopup.vue |  8 +-
 pages/purchaseReturn/job/returnDetail.vue     |  2 +-
 pages/putaway/coms/requestInfoPopup.vue       |  2 +
 pages/repleinsh/coms/repleinshInfoPopup.vue   | 19 +++-
 pages/repleinsh/coms/requestInfoPopup.vue     | 20 +++-
 pages/scrap/coms/requestInfoPopup.vue         |  3 +-
 .../supplierDeliver/coms/recordInfoPopup.vue  |  3 +-
 pages/unPlanned/coms/requestIssInfoPopup.vue  |  3 +-
 pages/unPlanned/coms/requestRecInfoPopup.vue  |  3 +-
 static/config.json                            |  2 +-
 36 files changed, 314 insertions(+), 116 deletions(-)

diff --git a/common/directory.js b/common/directory.js
index 4ad973c2..0ae9dfd8 100644
--- a/common/directory.js
+++ b/common/directory.js
@@ -15,6 +15,7 @@ let inspectFailedReasonList = [];
 let nextActionList = []; 
 let inspectTypeList = [];
 let sampleMethodList = [];
+let transferModeList = [];
 
 
 // 获取业务类型字典项
@@ -46,7 +47,8 @@ export function clearCacheData() {
 	   inspectFailedReasonList = [];
 	   nextActionList = []; 
 	   inspectTypeList = [];
-	   sampleMethodList =[]
+	   sampleMethodList =[];
+	   transferModeList = [];
 }
 
 //获取字典信息
@@ -185,6 +187,17 @@ export function getLocationTypeName(value) {
 	return location == '' ? value : location.label;
 }
 
+
+//获取库位类型名称
+export function getLocationTypeNameList(lst) {
+	let desc = '';
+	lst.forEach(res => {
+		desc += getLocationTypeInfo(res).label + ","
+	})
+	desc = desc.slice(0, -1);
+	return desc;
+}
+
 //获取计量单位
 export function getUnitInfo(value) {
 	var resultInfo = "";
@@ -282,7 +295,7 @@ export function getInventoryStatusName(value) {
 	}
 }
 
-//获取状态描述
+//获取状态描述 list
 export function getInventoryStatusDesc(lst) {
 	let desc = '';
 	lst.forEach(res => {
@@ -404,5 +417,25 @@ export function getSampleMethod(value) {
 	return resultInfo
 }
 
+//获取运输方式
+export function getTransferModeName(value) {
+	var resultInfo = "";
+	if (transferModeList.length == 0) {
+		transferModeList = getDirectoryInfo("transfer_mode")
+	}
+	if (transferModeList.length > 0) {
+		for (let item of transferModeList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
+
+
 
 
diff --git a/mycomponents/common/comListItem.vue b/mycomponents/common/comListItem.vue
index 4af08b7a..ec9b85b1 100644
--- a/mycomponents/common/comListItem.vue
+++ b/mycomponents/common/comListItem.vue
@@ -6,7 +6,15 @@
 				<text v-if="(item.type=='')||(item.type==undefined)" class="text_wrap">{{item.content}} </text>
 				<text v-else-if="item.type=='dateTime'" class="text_wrap">{{formatDate(item.content)}} </text>
 				<text v-else-if="item.type=='boolean'" class="text_wrap">{{boolean(item.content)}} </text>
-
+				<text v-else-if="item.type=='transferMode'" class="text_wrap">{{getTransferModeName(item.content)}} </text>
+				<text v-else-if="item.type=='locationType'" class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(item.content))}} </text>
+				<text v-else-if="item.type=='uom'" class="text_wrap">{{getUnitInfo(item.content)}} </text>
+				<text v-else-if="item.type=='inspectType'" class="text_wrap">{{getInspectType(item.content)}} </text>
+				<text v-else-if="item.type=='sampleMethod'" class="text_wrap">{{getSampleMethod(item.content)}} </text>
+				<text v-else-if="item.type=='requestState'" class="text_wrap">{{getRequestStateInfo(item.content)}} </text>
+			    <text v-else-if="item.type=='inventoryStatus'" class="text_wrap">{{getInventoryStatusName(item.content)}} </text>
+				 <text v-else-if="item.type=='locationCode'" class="text_wrap">{{getLocationTypeName(item.content)}} </text>
+			
 			</view>
 
 		</view>
@@ -17,6 +25,19 @@
 	import {
 		dateFormat
 	} from '@/common/basic.js';
+	
+	import {
+		getTransferModeName,
+		getLocationTypeNameList,
+		getDirectoryItemArray,
+		getUnitInfo,
+		getInspectType,
+		getSampleMethod,
+		getRequestStateInfo,
+		getInventoryStatusName,
+		getLocationTypeName
+		
+	} from '@/common/directory.js';
 	export default {
 		components: {},
 		data() {
@@ -50,6 +71,33 @@
 			},
 			formatDate(val) {
 				return dateFormat(val)
+			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			},
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			getUnitInfo(value){
+				return getUnitInfo(value).label
+			},
+			getInspectType(value){
+				return getInspectType(value)
+			},
+			getSampleMethod(value){
+				return getSampleMethod(value)
+			},
+			getRequestStateInfo(value){
+				return getRequestStateInfo(value).label
+			},
+			getInventoryStatusName(value){
+				return getInventoryStatusName(value)
+			},
+			getLocationTypeName(value){
+				return getLocationTypeName(value)
 			}
 		}
 	}
diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index 258e90c0..f3c72706 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<view class="cell_box uni-flex uni-row">
+		<!-- <view class="cell_box uni-flex uni-row">
 			<view class="cell_info">
 				<view class="text_lightblue">车间</view>
 				<view>{{workShopCode}}</view>
@@ -17,7 +17,7 @@
 				<view class="text_lightblue">原材料库</view>
 				<view>{{ dataContent.toLocationCode}}</view>
 			</view>
-		</view>
+		</view> -->
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
@@ -143,14 +143,14 @@
 						if (res) {
 							item.scaned = false
 							item.balance = {}
-							item.handleQty = 0;
+							item.handleQty = null;
 							this.$forceUpdate()
 							this.$emit('remove', item)
 						}
 					});
 			},
 			confirm(qty) {
-				this.editItem.qty = qty;
+				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			},
 			showLocation(item) {
diff --git a/mycomponents/detail/recordDetailBasicInfo.vue b/mycomponents/detail/recordDetailBasicInfo.vue
index 39b3c526..0b63bbe2 100644
--- a/mycomponents/detail/recordDetailBasicInfo.vue
+++ b/mycomponents/detail/recordDetailBasicInfo.vue
@@ -41,6 +41,7 @@
 					}, {
 						title: '计量单位',
 						content: this.dataContent.uom,
+						type:"uom"
 					}];
 				},
 				immediate: true,
diff --git a/mycomponents/detail/requestDetailBasicInfo.vue b/mycomponents/detail/requestDetailBasicInfo.vue
index 4961b535..8c650986 100644
--- a/mycomponents/detail/requestDetailBasicInfo.vue
+++ b/mycomponents/detail/requestDetailBasicInfo.vue
@@ -32,13 +32,15 @@
 					},  {
 						title: '计量单位',
 						content: this.dataContent.uom,
+						type:"uom"
 					},
 					{
 						title: '项目代码',
 						content: this.dataContent.projectCode,
 					},{
 						title: '最后更新时间',
-						content: this.dataContent.lastModificationTime,
+						content: this.dataContent.updateTime,
+						type:"dateTime"
 					},
 					{
 						title: '最后更新者Id',
diff --git a/mycomponents/job/jobRequestInfo.vue b/mycomponents/job/jobRequestInfo.vue
index 59294f68..31cb2302 100644
--- a/mycomponents/job/jobRequestInfo.vue
+++ b/mycomponents/job/jobRequestInfo.vue
@@ -30,6 +30,14 @@
 					<text class="item_title">入库库存状态范围 : </text>
 					<text class="text_wrap">{{getInventoryStatusDesc(getDirectoryItemArray(dataContent.inInventoryStatuses))}} </text>
 				</view>
+				<view class="item">
+					<text class="item_title">从库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
+				</view>
+				<view class="item">
+					<text class="item_title">到库位类型范围 : </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -42,7 +50,8 @@
 	} from '@/common/basic.js';
 	
 	import {
-		getInventoryStatusDesc
+		getInventoryStatusDesc,
+		getLocationTypeNameList
 	} from '@/common/directory.js';
 	
 	export default {
@@ -72,6 +81,10 @@
 			
 			getDirectoryItemArray(value){
 				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
 			}
 			
 		}
diff --git a/mycomponents/package/packageDetailPopup.vue b/mycomponents/package/packageDetailPopup.vue
index 7abc53d7..8d628c99 100644
--- a/mycomponents/package/packageDetailPopup.vue
+++ b/mycomponents/package/packageDetailPopup.vue
@@ -89,7 +89,8 @@
 					text_wrap: this.dataContent.expireDate
 				}, {
 					item_title: '计量单位',
-					text_wrap: this.dataContent.uom
+					text_wrap: this.dataContent.uom,
+					type:"uom"
 				}, {
 					item_title: '数量',
 					text_wrap: this.dataContent.qty
diff --git a/mycomponents/record/recordMainInfo.vue b/mycomponents/record/recordMainInfo.vue
index 1c774cf2..8958184e 100644
--- a/mycomponents/record/recordMainInfo.vue
+++ b/mycomponents/record/recordMainInfo.vue
@@ -18,12 +18,12 @@
 				
 				<view class="item">
 					<text class="item_title">从库位类型范围 : </text>
-					<text class="text_wrap">{{dataContent.fromLocationTypes}} </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
 				</view>
 				
 				<view class="item">
 					<text class="item_title">到库位类型范围 : </text>
-					<text class="text_wrap">{{dataContent.toLocationTypes}} </text>
+					<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
 				</view>
 				
 				<view class="item">
@@ -41,10 +41,9 @@
 					<text class="text_wrap">{{dataContent.number}} </text>
 				</view>
 				
-				
 				<view class="item">
 					<text class="item_title">业务类型 : </text>
-					<text class="text_wrap">{{dataContent.businessType}} </text>
+					<text class="text_wrap">{{getBusinessTypeDesc(dataContent.businessType)}} </text>
 				</view>
 				
 				<view class="item">
@@ -74,12 +73,12 @@
 				</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.dueTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.dueTime)}} </text>
 				</view>
 				
 				<view class="item">
@@ -92,16 +91,16 @@
 				</view>
 				<view class="item">
 					<text class="item_title">自动提交 : </text>
-					<text class="text_wrap">{{dataContent.autoCommit}} </text>
+					<text class="text_wrap">{{boolean(dataContent.autoCommit)}} </text>
 				</view>
 				
 				<view class="item">
 					<text class="item_title">自动通过 : </text>
-					<text class="text_wrap">{{dataContent.autoAgree}} </text>
+					<text class="text_wrap">{{boolean(dataContent.autoAgree)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">自动执行 : </text>
-					<text class="text_wrap">{{dataContent.autoExecute}} </text>
+					<text class="text_wrap">{{boolean(dataContent.autoExecute)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">直接生成记录 : </text>
@@ -110,7 +109,7 @@
 				
 				<view class="item">
 					<text class="item_title">最后更新时间 : </text>
-					<text class="text_wrap">{{dataContent.lastModificationTime}} </text>
+					<text class="text_wrap">{{dateFormat(dataContent.lastModificationTime)}} </text>
 				</view>
 				<view class="item">
 					<text class="item_title">最后更新者Id : </text>
@@ -143,6 +142,12 @@
 </template>
 
 <script>
+	import {
+		getDirectoryItemArray,
+		getInventoryStatusDesc,
+		getLocationTypeNameList,
+		getBusinessTypeDesc
+	} from '@/common/directory.js';
 	export default {
 		components: {},
 		data() {
@@ -159,7 +164,32 @@
 			}
 		},
 
-		methods: {}
+		methods: {
+			avaliable(value) {
+				return value == "TRUE" ? "可用" : "不可用"
+			},
+			boolean(value) {
+				return value == "TRUE" ? "是" : "否"
+			},
+			dateFormat(value){
+				return dateFormat(value)
+			},
+			getInventoryStatusDesc(value){
+				return getInventoryStatusDesc(value)
+			},
+			
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			},
+			getBusinessTypeDesc(value){
+				return getBusinessTypeDesc(value)
+			},
+			
+		}
 	}
 </script>
 
diff --git a/mycomponents/request/requestCommonInfo.vue b/mycomponents/request/requestCommonInfo.vue
index 4ea47042..b044adb5 100644
--- a/mycomponents/request/requestCommonInfo.vue
+++ b/mycomponents/request/requestCommonInfo.vue
@@ -29,7 +29,6 @@
 <script>
 	import requestTop from '@/mycomponents/request/requestTop.vue'
 	import requestRequestInfo from '@/mycomponents/request/requestRequestInfo.vue'
-	import requestMainInfo from '@/mycomponents/request/requestMainInfo.vue'
 	import requestItemInfo from '@/mycomponents/request/requestItemInfo.vue'
 	import requestPersonInfo from '@/mycomponents/request/requestPersonInfo.vue'
 	import requestListCommonInfo from '@/mycomponents/request/requestListCommonInfo.vue'
@@ -42,7 +41,6 @@
 			requestTop,
 			requestRequestInfo,
 			requestItemInfo,
-			requestMainInfo,
 			requestPersonInfo,
 			requestListCommonInfo
 		},
diff --git a/mycomponents/request/requestListCommonInfo.vue b/mycomponents/request/requestListCommonInfo.vue
index 2459a406..611942bc 100644
--- a/mycomponents/request/requestListCommonInfo.vue
+++ b/mycomponents/request/requestListCommonInfo.vue
@@ -23,7 +23,8 @@
 							content: this.dataContent.departmentCode
 						}, {
 							title: '状态',
-							content: this.dataContent.status
+							content: this.dataContent.status,
+							type:"requestState"
 						},{
 							title: '自动提交',
 							content: this.dataContent.autoCommit,
diff --git a/pages/customerReturn/coms/requestInfoPopup.vue b/pages/customerReturn/coms/requestInfoPopup.vue
index 5d7e774b..dfd49978 100644
--- a/pages/customerReturn/coms/requestInfoPopup.vue
+++ b/pages/customerReturn/coms/requestInfoPopup.vue
@@ -69,10 +69,12 @@
 					{
 						title: '从库位类型范围',
 						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '到库位类型范围',
 						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '从库区代码范围',
diff --git a/pages/deliver/coms/requestInfoPopup.vue b/pages/deliver/coms/requestInfoPopup.vue
index 9314d4ae..8553b7af 100644
--- a/pages/deliver/coms/requestInfoPopup.vue
+++ b/pages/deliver/coms/requestInfoPopup.vue
@@ -66,11 +66,13 @@
 					},
 					{
 						title: '从库位类型范围',
-						content: this.dataContent.fromLocationTypes
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '到库位类型范围',
-						content: this.dataContent.toLocationTypes
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '从库区代码范围',
diff --git a/pages/inspect/coms/requestInfoPopup.vue b/pages/inspect/coms/requestInfoPopup.vue
index 206213ae..07e38dfc 100644
--- a/pages/inspect/coms/requestInfoPopup.vue
+++ b/pages/inspect/coms/requestInfoPopup.vue
@@ -42,7 +42,8 @@
 							content: this.dataContent.fromWarehouseCode
 						},{
 							title: '从库位类型范围',
-							content: this.dataContent.fromLocationTypes
+							content: this.dataContent.fromLocationTypes,
+							type:"locationType"
 						},{
 							title: '从库区代码范围',
 							content: this.dataContent.fromAreaCodes
@@ -64,20 +65,23 @@
 						},{
 							title: '计量单位',
 							content: this.dataContent.uom,
+							type:"uom"
 						},
 						{
 							title: '收货数量',
 							content: this.dataContent.receiveQty
 						},{
 							title: '检验类型',
-							content: this.dataContent.inspectType
+							content: this.dataContent.inspectType,
+							type:'inspectType'
 						},{
 							title: '下一步检验动作',
 							content: this.dataContent.nextAction
 						},
 						{
 							title: '抽检方式',
-							content: this.dataContent.sampleMethod
+							content: this.dataContent.sampleMethod,
+							type:'sampleMethod'
 						},
 						{
 							title: '样品数量',
diff --git a/pages/issue/coms/comIssueRequestDetailCard.vue b/pages/issue/coms/comIssueRequestDetailCard.vue
index 2e1dc2c3..fbbb8f3f 100644
--- a/pages/issue/coms/comIssueRequestDetailCard.vue
+++ b/pages/issue/coms/comIssueRequestDetailCard.vue
@@ -6,9 +6,10 @@
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in dataContent.subList" :key="index">
 					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
-						<item-qty :dataContent="item" :isShowStdPack="false">
-						</item-qty>
-						<u-line />
+							<item-qty :dataContent="item" :isShowStdPack="false">
+							</item-qty>
+							<u-line />
+						
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
diff --git a/pages/issue/coms/comIssueRequestInfo.vue b/pages/issue/coms/comIssueRequestInfo.vue
index fbb64a31..b1245958 100644
--- a/pages/issue/coms/comIssueRequestInfo.vue
+++ b/pages/issue/coms/comIssueRequestInfo.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="cen_card" style="padding: 20rpx;">
+	<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
 		<view class="cell_box uni-flex uni-row">
 			<view class="cell_info">
 				<view class="text_lightblue">车间</view>
@@ -18,7 +18,6 @@
 				<view>{{ dataContent.toLocationCode}}</view>
 			</view>
 		</view>
-		<u-line />
 	</view>
 </template>
 
diff --git a/pages/issue/coms/requestInfoPopup.vue b/pages/issue/coms/requestInfoPopup.vue
index 723cade1..8a73b229 100644
--- a/pages/issue/coms/requestInfoPopup.vue
+++ b/pages/issue/coms/requestInfoPopup.vue
@@ -44,12 +44,15 @@
 					},{
 						title: '使用在途库',
 						content: this.dataContent.useOnTheWayLocation,
+						type:"boolean"
 					},{
 						title: '从库位类型范围',
 						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},{
 						title: '到库位类型范围',
 						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},{
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue
index 677e2da9..01fa9327 100644
--- a/pages/issue/request/issueRequestDetail.vue
+++ b/pages/issue/request/issueRequestDetail.vue
@@ -94,7 +94,7 @@
 							// 	res.fromLocationCode = res.toLocationCode
 							// })
 							// that.detailSource = getDataSource(that.subList);
-							updateTitle(this.requestContent.number);
+							// updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productDismantle/coms/requestInfoPopup.vue b/pages/productDismantle/coms/requestInfoPopup.vue
index 939f09a0..d8cdae21 100644
--- a/pages/productDismantle/coms/requestInfoPopup.vue
+++ b/pages/productDismantle/coms/requestInfoPopup.vue
@@ -18,11 +18,11 @@
 						</view>
 						<view class="item">
 							<text class="item_title">从库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.fromLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">到库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.toLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
 						</view>
 						
 						<view class="item">
@@ -43,6 +43,15 @@
 </template>
 
 <script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
 	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
 	export default {
 		components: {
@@ -68,6 +77,13 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/productPutaway/coms/requestDetailInfoPopup.vue b/pages/productPutaway/coms/requestDetailInfoPopup.vue
index 8bc5c446..d7a87a60 100644
--- a/pages/productPutaway/coms/requestDetailInfoPopup.vue
+++ b/pages/productPutaway/coms/requestDetailInfoPopup.vue
@@ -12,10 +12,6 @@
 							<text class="item_title">器具号 : </text>
 							<text class="text_wrap">{{dataContent.containerNumber}} </text>
 						</view>
-						<view class="item">
-							<text class="item_title">批次 : </text>
-							<text class="text_wrap">{{dataContent.batch}} </text>
-						</view>
 						<view class="item">
 							<text class="item_title">从库位代码 : </text>
 							<text class="text_wrap">{{dataContent.fromLocationCode	}} </text>
@@ -24,14 +20,6 @@
 							<text class="item_title">库存状态 : </text>
 							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
 						</view>
-						<view class="item">
-							<text class="item_title">订单号 : </text>
-							<text class="text_wrap">{{dataContent.poNumber}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">订单行 : </text>
-							<text class="text_wrap">{{dataContent.poLine}} </text>
-						</view>
 						<view class="item">
 							<text class="item_title">从货主代码 : </text>
 							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
diff --git a/pages/productPutaway/coms/requestInfoPopup.vue b/pages/productPutaway/coms/requestInfoPopup.vue
index 069c31d3..85136228 100644
--- a/pages/productPutaway/coms/requestInfoPopup.vue
+++ b/pages/productPutaway/coms/requestInfoPopup.vue
@@ -44,9 +44,11 @@
 					},{
 						title: '从库位类型范围',
 						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},{
 						title: '到库位类型范围',
 						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},{
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue
index 0d0852f9..c2d1af1c 100644
--- a/pages/productionReturn/coms/comReturn.vue
+++ b/pages/productionReturn/coms/comReturn.vue
@@ -43,7 +43,6 @@
 
 <script>
 	import {
-		productionReturnRequestSubmit,
 		productionReturnRecordSubmit
 	} from '@/api/request2.js';
 	
diff --git a/pages/productionReturn/coms/requestInfoPopup.vue b/pages/productionReturn/coms/requestInfoPopup.vue
index 4b3904f9..52ca2286 100644
--- a/pages/productionReturn/coms/requestInfoPopup.vue
+++ b/pages/productionReturn/coms/requestInfoPopup.vue
@@ -44,9 +44,11 @@
 					},{
 						title: '从库位类型范围',
 						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},{
 						title: '到库位类型范围',
 						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},{
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
diff --git a/pages/purchaseReceipt/coms/receiptInfoPopup.vue b/pages/purchaseReceipt/coms/receiptInfoPopup.vue
index 71a8f427..92c401ff 100644
--- a/pages/purchaseReceipt/coms/receiptInfoPopup.vue
+++ b/pages/purchaseReceipt/coms/receiptInfoPopup.vue
@@ -22,7 +22,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">运输方式 : </text>
-							<text class="text_wrap">{{dataContent.transferMode}} </text>
+							<text class="text_wrap">{{getTransferModeName(dataContent.transferMode)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">车牌号 : </text>
@@ -38,6 +38,9 @@
 
 <script>
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import {getTransferModeName} from '@/common/directory.js'
+	
+	
 	export default {
 		components: {
 			jobCommonInfo,
@@ -62,6 +65,9 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/purchaseReturn/coms/comReturnRequestCard.vue b/pages/purchaseReturn/coms/comReturnRequestCard.vue
index fcdd96f0..ee1589bb 100644
--- a/pages/purchaseReturn/coms/comReturnRequestCard.vue
+++ b/pages/purchaseReturn/coms/comReturnRequestCard.vue
@@ -2,7 +2,7 @@
  	<request-com-main-card :dataContent="dataContent">
  		<view class="task_item">
  			<view class="task_text">
- 				收货单号 : {{dataContent.PurchaseReceiptRecordNumber}}
+ 				收货单号 : {{dataContent.purchaseReceiptRecordNumber}}
  			</view>
  			<view class="task_text">
  				供应商代码 : {{dataContent.supplierCode}}
diff --git a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
index 93d1b5a2..dce67535 100644
--- a/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
+++ b/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -3,52 +3,7 @@
 		<uni-popup ref="popup">
 			<requestDetailCommonInfo :dataContent="dataContent" @onClose="closePopup">
 				<view class="">
-					<view class="uni-flex uni-column">
-						<view class="item">
-							<text class="item_title">包装号 : </text>
-							<text class="text_wrap">{{dataContent.packingNumber}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">器具号 : </text>
-							<text class="text_wrap">{{dataContent.containerNumber}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">批次 : </text>
-							<text class="text_wrap">{{dataContent.batch}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">替代批次 : </text>
-							<text class="text_wrap">{{dataContent.altBatch}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">到库位代码 : </text>
-							<text class="text_wrap">{{dataContent.toLocationCode}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">库存状态 : </text>
-							<text class="text_wrap">{{dataContent.inventoryStatus}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">订单号 : </text>
-							<text class="text_wrap">{{dataContent.poNumber}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">订单行 : </text>
-							<text class="text_wrap">{{dataContent.poLine}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">原因 : </text>
-							<text class="text_wrap">{{dataContent.reason}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">从货主代码 : </text>
-							<text class="text_wrap">{{dataContent.fromOwnerCode}} </text>
-						</view>
-						<view class="item">
-							<text class="item_title">到货主代码 : </text>
-							<text class="text_wrap">{{dataContent.toOwnerCode}} </text>
-						</view>
-					</view>
+					<comListItem :dataList="dataList"></comListItem>
 				</view>
 			</requestDetailCommonInfo>
 		</uni-popup>
@@ -57,16 +12,64 @@
 
 <script>
 	import requestDetailCommonInfo from '@/mycomponents/detail/requestDetailCommonInfo.vue'
+	import comListItem from '@/mycomponents/common/comListItem.vue';
 	export default {
+		
 		components: {
-			requestDetailCommonInfo
+			requestDetailCommonInfo,
+			comListItem
 		},
 		data() {
 			return {
 				dataContent: {
 					type: Object,
 					default: {}
-				}
+				},
+				dataList:[]
+			}
+		},
+		watch:{
+			dataContent: {
+				handler(newName, oldName) {
+					this.dataList=[{
+							title: '包装号',
+							content: this.dataContent.packingNumber
+						}, {
+							title: '器具号',
+							content: this.dataContent.containerNumber
+						},{
+							title: '批次',
+							content: this.dataContent.batch
+						},{
+							title: '替代批次',
+							content: this.dataContent.altBatch,
+						},{
+							title: '到库位代码',
+							content: this.dataContent.toLocationCode
+						},{
+							title: '库存状态',
+							content: this.dataContent.inventoryStatus,
+							type:"inventoryStatus"
+						},{
+							title: '订单号',
+							content: this.dataContent.poNumber
+						},{
+							title: '订单行',
+							content: this.dataContent.poLine
+						},{
+							title: '原因',
+							content: this.dataContent.reason
+						},{
+							title: '从货主代码',
+							content: this.dataContent.fromOwnerCode,
+						},{
+							title: '到货主代码',
+							content: this.dataContent.toOwnerCode,
+						}
+						];
+				},
+				immediate: true,
+				deep: true
 			}
 		},
 
diff --git a/pages/purchaseReturn/coms/requestInfoPopup.vue b/pages/purchaseReturn/coms/requestInfoPopup.vue
index a9128631..98dabe0b 100644
--- a/pages/purchaseReturn/coms/requestInfoPopup.vue
+++ b/pages/purchaseReturn/coms/requestInfoPopup.vue
@@ -40,7 +40,7 @@
 						content: this.dataContent.purchaseReceiptRecordNumber
 					}, {
 						title: '发货单号',
-						content: this.dataContent.asnNumbe
+						content: this.dataContent.asnNumber
 					},{
 						title: '要货计划单号',
 						content: this.dataContent.ppNumber,
@@ -53,6 +53,7 @@
 					},{
 						title: '运输方式',
 						content: this.dataContent.transferMode,
+						type:"transferMode",
 					},{
 						title: '车牌号',
 						content: this.dataContent.vehiclePlateNumber,
@@ -64,15 +65,17 @@
 						content: this.dataContent.toWarehouseCode,
 					},{
 						title: '从库位类型范围',
-						content: this.dataContent.fromLocationTypes
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '到库位类型范围',
-						content: this.dataContent.toLocationTypes
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},
 					{
 						title: '从库区代码范围',
-						content: this.dataContent.fromAreaCodes
+						content: this.dataContent.fromAreaCodes,
 					},
 					{
 						title: '到库区代码范围',
diff --git a/pages/purchaseReturn/coms/returnInfoPopup.vue b/pages/purchaseReturn/coms/returnInfoPopup.vue
index 71a8f427..5765e481 100644
--- a/pages/purchaseReturn/coms/returnInfoPopup.vue
+++ b/pages/purchaseReturn/coms/returnInfoPopup.vue
@@ -14,7 +14,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">供应商代码 : </text>
-							<text class="text_wrap">{{dataContent.carrierCode}} </text>
+							<text class="text_wrap">{{dataContent.supplierCode}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">承运商 : </text>
@@ -22,7 +22,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">运输方式 : </text>
-							<text class="text_wrap">{{dataContent.transferMode}} </text>
+							<text class="text_wrap">{{getTransferModeName(dataContent.transferMode)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">车牌号 : </text>
@@ -38,6 +38,7 @@
 
 <script>
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import {getTransferModeName} from '@/common/directory.js'
 	export default {
 		components: {
 			jobCommonInfo,
@@ -62,6 +63,9 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getTransferModeName(value){
+				return getTransferModeName(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 2c06f310..5c205316 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -246,7 +246,7 @@
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
 									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
+										']不一致,是否继续退货?', res => {
 											if (res) {
 												itemDetail.scaned = true;
 												itemDetail.handleQty = Number(result.balance.qty) ;
diff --git a/pages/putaway/coms/requestInfoPopup.vue b/pages/putaway/coms/requestInfoPopup.vue
index 0cf786b8..ab530294 100644
--- a/pages/putaway/coms/requestInfoPopup.vue
+++ b/pages/putaway/coms/requestInfoPopup.vue
@@ -41,9 +41,11 @@
 				}, {
 					title: '从库位类型范围',
 					content: this.dataContent.fromLocationTypes,
+					type:"locationType"
 				}, {
 					title: '到库位类型范围',
 					content: this.dataContent.toLocationTypes,
+					type:"locationType"
 				}, {
 					title: '从库区代码范围',
 					content: this.dataContent.fromAreaCodes,
diff --git a/pages/repleinsh/coms/repleinshInfoPopup.vue b/pages/repleinsh/coms/repleinshInfoPopup.vue
index d446a8b1..082a2bd9 100644
--- a/pages/repleinsh/coms/repleinshInfoPopup.vue
+++ b/pages/repleinsh/coms/repleinshInfoPopup.vue
@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">从库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.fromLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">到库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.toLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">从库区代码范围 : </text>
@@ -28,6 +28,14 @@
 </template>
 
 <script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
 	export default {
 		components: {
@@ -53,6 +61,13 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/repleinsh/coms/requestInfoPopup.vue b/pages/repleinsh/coms/requestInfoPopup.vue
index 4e7f864b..5815fb83 100644
--- a/pages/repleinsh/coms/requestInfoPopup.vue
+++ b/pages/repleinsh/coms/requestInfoPopup.vue
@@ -14,11 +14,11 @@
 						</view>
 						<view class="item">
 							<text class="item_title">从库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.fromLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.fromLocationTypes))}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">到库位类型范围 : </text>
-							<text class="text_wrap">{{dataContent.toLocationTypes}} </text>
+							<text class="text_wrap">{{getLocationTypeNameList(getDirectoryItemArray(dataContent.toLocationTypes))}} </text>
 						</view>
 						
 						<view class="item">
@@ -44,6 +44,15 @@
 </template>
 
 <script>
+	import {
+		dateFormat,
+		getDirectoryItemArray,
+	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusDesc,
+		getLocationTypeNameList
+	} from '@/common/directory.js';
 	import requestCommonInfo from '@/mycomponents/request/requestCommonInfo.vue'
 	export default {
 		components: {
@@ -69,6 +78,13 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getDirectoryItemArray(value){
+				return getDirectoryItemArray(value)
+			},
+			
+			getLocationTypeNameList(value){
+				return getLocationTypeNameList(value)
+			}
 		}
 	}
 </script>
diff --git a/pages/scrap/coms/requestInfoPopup.vue b/pages/scrap/coms/requestInfoPopup.vue
index 04bdcb96..f468e6d3 100644
--- a/pages/scrap/coms/requestInfoPopup.vue
+++ b/pages/scrap/coms/requestInfoPopup.vue
@@ -37,7 +37,8 @@
 						content: this.dataContent.fromWarehouseCode
 					}, {
 						title: '从库位类型范围',
-						content: this.dataContent.fromLocationTypes
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},{
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
diff --git a/pages/supplierDeliver/coms/recordInfoPopup.vue b/pages/supplierDeliver/coms/recordInfoPopup.vue
index 7603a1b8..12d5abfb 100644
--- a/pages/supplierDeliver/coms/recordInfoPopup.vue
+++ b/pages/supplierDeliver/coms/recordInfoPopup.vue
@@ -75,7 +75,8 @@
 							content: this.dataContent.carrierCode
 						},{
 							title: '运输方式',
-							content: this.dataContent.transferMode
+							content: this.dataContent.transferMode,
+							type:"transferMode"
 						},{
 							title: '车牌号',
 							content: this.dataContent.vehiclePlateNumber
diff --git a/pages/unPlanned/coms/requestIssInfoPopup.vue b/pages/unPlanned/coms/requestIssInfoPopup.vue
index c7bda5c4..eac873df 100644
--- a/pages/unPlanned/coms/requestIssInfoPopup.vue
+++ b/pages/unPlanned/coms/requestIssInfoPopup.vue
@@ -37,7 +37,8 @@
 						content: this.dataContent.fromWarehouseCode
 					}, {
 						title: '从库位类型范围',
-						content: this.dataContent.fromLocationTypes
+						content: this.dataContent.fromLocationTypes,
+						type:"locationType"
 					},{
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
diff --git a/pages/unPlanned/coms/requestRecInfoPopup.vue b/pages/unPlanned/coms/requestRecInfoPopup.vue
index d666cb2d..d7a281ca 100644
--- a/pages/unPlanned/coms/requestRecInfoPopup.vue
+++ b/pages/unPlanned/coms/requestRecInfoPopup.vue
@@ -37,7 +37,8 @@
 						content: this.dataContent.toWarehouseCode
 					}, {
 						title: '到库位类型范围',
-						content: this.dataContent.toLocationTypes
+						content: this.dataContent.toLocationTypes,
+						type:"locationType"
 					},{
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes,
diff --git a/static/config.json b/static/config.json
index 1c570702..4f688e61 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",

From 73eca7a1f3f06e41d8c242bd62e627d2e45705ba Mon Sep 17 00:00:00 2001
From: Niext <85552560@qq.com>
Date: Fri, 8 Dec 2023 20:55:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/pdabasic.css                 | 9 +++++++++
 pages/purchaseReturn/job/returnDetail.vue | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/style/pdabasic.css b/common/style/pdabasic.css
index 8fc37203..d26c7aae 100644
--- a/common/style/pdabasic.css
+++ b/common/style/pdabasic.css
@@ -716,6 +716,15 @@ page {
 	height: 100%;
 }
 
+.page-header {
+	background-color: #fff;
+	font-size: 35rpx;
+	padding: 10rpx 20rpx;
+}
+
+.page-header .header_item {
+	padding: 5rpx 0rpx;
+}
 
 .page-main {
 	flex: 1;
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 5c205316..9eec579d 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="" style="font-size: 35rpx;margin-top: 20rpx;margin-bottom: 20rpx;margin-left: 10rpx;">
+			<view class="header_item" >
 				发货单：{{jobContent.asnNumber}}
 			</view>
-			<view class="" style="font-size: 35rpx;margin-top: 20rpx;margin-left: 10rpx;">
+			<view class="header_item" >
 				供应商：{{jobContent.supplierCode}}
 			</view>
 			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>

From bd9f02b476b321c9ec7dfd5850189caf7faa7a28 Mon Sep 17 00:00:00 2001
From: Niext <85552560@qq.com>
Date: Fri, 8 Dec 2023 22:53:02 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/pdabasic.css                   |   6 +-
 mycomponents/item/itemQty.vue               |   3 +
 pages/issue/coms/comIssueDetailCard.vue     |   7 +-
 pages/issue/coms/comScanIssuePack.vue       | 149 +++++++++++++++-----
 pages/issue/job/issueDetail.vue             |  67 ++++++---
 pages/purchaseReceipt/job/receiptDetail.vue |   8 +-
 pages/purchaseReturn/job/returnDetail.vue   |   7 +-
 7 files changed, 180 insertions(+), 67 deletions(-)

diff --git a/common/style/pdabasic.css b/common/style/pdabasic.css
index d26c7aae..96e132e0 100644
--- a/common/style/pdabasic.css
+++ b/common/style/pdabasic.css
@@ -723,9 +723,13 @@ page {
 }
 
 .page-header .header_item {
-	padding: 5rpx 0rpx;
+	/* padding-left: 10rpx; */
+	padding: 5rpx 10rpx;
 }
 
+.page-header .header_job_top {
+	padding:5rpx 0rpx;
+}
 .page-main {
 	flex: 1;
 	position: relative;
diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index b1b5f10f..94e0ca8a 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -5,6 +5,9 @@
 		</view>
 		<view>
 			<balanceQty v-if="showItemQty" :dataContent="dataContent"></balanceQty>
+			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+				:handleQty="Number(handleQty)" :isShowStatus="false">
+			</compare-qty>
 		</view>
 		<!-- 	<view v-else>
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index afd9726b..f03fc0a7 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -9,6 +9,8 @@
 					<template v-slot:title>
 						<!-- 物品 -->
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+			<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
+						</com-issue-request-info> -->
 					</template>
 					<u-line />
 					<view v-for="(loacation,index) in item.Locations">
@@ -63,7 +65,7 @@
 	import location from '@/mycomponents/balance/location.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
-
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
 	import {
 		getDetailOption,
 		getEditRemoveOption
@@ -81,7 +83,8 @@
 			balanceQtyEdit,
 			location,
 			comMessage,
-			detailInfoPopup
+			detailInfoPopup,
+			comIssueRequestInfo
 		},
 		props: {
 			dataContent: {
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 1b2bc367..cbc52bc9 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -7,7 +7,7 @@
 						扫描箱码
 						<text class="fr" @click="closeScanPopup()">关闭</text>
 					</view>
-				<!-- 	<view class="uni-flex uni-row" style="align-items: center;
+					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
 						margin-left: 20rpx;
 						margin-right: 20rpx;
@@ -145,7 +145,7 @@
 				positionInfo: "请选择位置",
 				positionList: [],
 				defaultValueList: [],
-				fromInventoryStatuses :"",
+				fromInventoryStatuses: "",
 			}
 		},
 		created() {
@@ -157,8 +157,8 @@
 			this.scanOptions = getDetailEditRemoveOption();
 		},
 		methods: {
-			
-			
+
+
 			openScanPopup(content, jobcontent) {
 				this.issueRecord = [];
 				this.dataContent = content;
@@ -186,26 +186,26 @@
 					that.fromLocationList = that.getFromLocationList();
 				}
 			},
+
 			showBalanceSelect(items) {
 				this.$refs.balanceSelect.openPopup(items);
 			},
 
 			getFromLocationList() {
 				let list = [];
-				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
-				if (location != undefined) {
+				this.dataContent.forEach(location => {
 					location.Items.forEach(item => {
 						item.Locations.forEach(f => {
-							list.push(f.fromLocationCode)
+							let item = list.find(l => l == f.fromLocationCode);
+							if (item == undefined) {
+								list.push(f.fromLocationCode)
+							}
 						})
 					})
-					this.fromLocationCode = list[0];
-					return list;
-				} else {
-					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
-						this.toLocationCode = '';
-					});
-				}
+				});
+
+				this.fromLocationCode = list[0];
+				return list;
 			},
 
 			fromLocationUpdate(fromlocation) {
@@ -215,10 +215,78 @@
 					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
 				}
 			},
-			onScan(result) {
+			onScan1(result) {
 				try {
 					let that = this;
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
 
+
+					that.dataContent.forEach(l => {
+						let item = l.Items.find(r => r.itemCode == itemCode);
+						if (item == undefined) {
+							continue;
+							// that.showErrorMessage('未查找到零件【' + itemCode + '】的发料明细',
+							// 	res => {
+							// 		that.getfocus();
+							// 	}
+							// )
+							// return;
+						} else {
+							//查找库存信息
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
+							
+							
+							
+							
+							
+							
+							getBalanceByManagementPrecision(result.label, that.fromLocationCode, that
+								.fromInventoryStatuses,
+								balanceRes => {
+									if (balanceRes.success) {
+										if (balanceRes.data.list.length == 0) {
+											this.showErrorMessage('在来源库位[' + this.fromLocationCode +
+												'],未查找到该包装的库存记录',
+												res => {
+													this.packGetFocus();
+												})
+										} else if (balanceRes.data.list.length == 1) {
+											let balance = balanceRes.data.list[0];
+											this.afterGetBalance(result.label, balance, packageInfo);
+										} else {
+											this.showBalanceSelect(balanceRes.data.list);
+										}
+									} else {
+										this.showErrorMessage(balanceRes.message.message);
+									}
+									uni.hideLoading();
+								});
+						}
+
+
+					})
+
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			onScan(result) {
+				try {
+					let that = this;
 					if (that.fromLocationCode == '') {
 						that.showErrorMessage('请选择来源库位', res => {
 							that.$refs.toLocationCombox.onFocus();
@@ -243,35 +311,37 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
-							if (balanceRes.success) {
-								if (balanceRes.data.list.length == 0) {
-									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-										res => {
-											this.packGetFocus();
-										})
-								} else if (balanceRes.data.list.length == 1) {
-									let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance,packageInfo);
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.showBalanceSelect(balanceRes.data.list);
+									}
 								} else {
-									this.showBalanceSelect(balanceRes.data.list);
+									this.showErrorMessage(balanceRes.message.message);
 								}
-							} else {
-								this.showErrorMessage(balanceRes.message.message);
-							}
-							uni.hideLoading();
-						});
+								uni.hideLoading();
+							});
 					}
 				} catch (e) {
 					this.showErrorMessage(e.stack)
 					uni.hideLoading();
 				}
 			},
+
 			selectBalanceItem(balance) {
 				this.afterGetBalance(this.label, balance);
 			},
 
-			afterGetBalance(label, balance,packageInfo) {
+			afterGetBalance(label, balance, packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -292,11 +362,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance,packageInfo)
+										that.addRecord(batch, label, balance, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance,packageInfo);
+											that.addRecord(batch, label, balance, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -306,7 +376,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance,packageInfo)
+									that.addRecord(batch, label, balance, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -361,14 +431,14 @@
 				return batch;
 			},
 
-			creatRecord(label, balance,packageInfo) {
+			creatRecord(label, balance, packageInfo) {
 				balance.stdPackQty = packageInfo.stdPackQty
 				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
@@ -384,10 +454,11 @@
 					handleQty += Number(res.qty)
 				})
 				batch.handleQty = handleQty;
+				
 			},
 
-			addRecord(batch, label, balance,packageInfo) {
-				let record = this.creatRecord(label, balance,packageInfo);
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index e60ac841..ede15045 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -1,27 +1,39 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<view style="margin: 5px;">
-				<job-top :dataContent="jobContent"></job-top>
-				<view class="card_content">
+			<view class="page-header">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
 					申请单号 : {{jobContent.requestNumber}}
 				</view>
 				<u-line />
 			</view>
-
 			<scroll-view scroll-y="true" class="">
-				<view v-for="(toLocation, index) in detailSource">
-					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
-					</com-issue-request-info>
-					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
-					</com-issue-detail-card>
-				</view>
+				<uni-collapse ref="mainCollapse" v-for="(toLocation, index) in detailSource">
+					<uni-collapse-item :open="true">
+						<template v-slot:title>
+							<view>
+								<com-issue-request-info :workShopCode="jobContent.workShopCode"
+									:dataContent="toLocation">
+								</com-issue-request-info>
+							</view>
+						</template>
+						<view>
+							<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+								@updateData='updateData'>
+							</com-issue-detail-card>
+						</view>
+					</uni-collapse-item>
+				</uni-collapse>
 			</scroll-view>
 		</view>
 
 		<div class="btn_bottom">
 			<view class="" style="display: flex;flex-direction: row;">
 				<view class="">
+					<button class="btn_commit" hover-class="btn_commit_after" @click="resizeCollapse()">刷新UI</button>
 					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
@@ -132,10 +144,26 @@
 			},
 		},
 		mounted: function() {
-
+			// this.resizeCollapse();
 		},
 
 		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					// debugger;
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+					this.$refs.mainCollapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+
 			//接收
 			receive(callback) {
 				if (this.id != null) {
@@ -162,7 +190,11 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							that.resizeCollapse();
+
+							setTimeout(r => {
+								that.resizeCollapse();
+							}, 100)
+
 							uni.hideLoading();
 						} else {
 							that.showMessage('列表数据为0');
@@ -178,14 +210,6 @@
 				this.resizeCollapse();
 			},
 
-			resizeCollapse() {
-				this.$nextTick(r => {
-					this.$refs.comIssueDetailCard.forEach(r => {
-						r.resizeCollapse();
-					})
-				});
-			},
-
 			// submit() {
 			//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
 			//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
@@ -366,7 +390,8 @@
 						}
 					})
 				}
-				// item.handleQty=itemHandleQty;
+				this.resizeCollapse();
+				item.handleQty=itemHandleQty;
 			},
 
 			scanPopupGetFocus() {
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 9d3e8512..c55d1e07 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -1,8 +1,10 @@
 <template>
 	<view class="page-wraper">
-		<view style="margin: 5px;">
-			<job-top :dataContent="jobContent"></job-top>
-			<view class="card_content">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
 				发货单号 : {{jobContent.asnNumber}}
 			</view>
 			<u-line />
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 9eec579d..b7deb966 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent" ></job-top>
+			</view>
 			<view class="header_item" >
 				发货单：{{jobContent.asnNumber}}
 			</view>
@@ -75,7 +78,8 @@
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import returnDetailInfoPopup from '@/pages/purchaseReturn/coms/returnDetailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	
 	export default {
 		name: 'returnDetail',
 		components: {
@@ -84,6 +88,7 @@
 			comDetailCard,
 			returnDetailInfoPopup,
 			comMessage,
+			jobTop
 		},
 		data() {
 			return {

From 76559e92ec07a51ade3d3efcb0da44ab6838fec8 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 11 Dec 2023 14:00:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/item/itemQty.vue   |  4 +++-
 pages/issue/job/issueDetail.vue | 42 +++++++++++++--------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index 94e0ca8a..920026e9 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -20,11 +20,13 @@
 <script>
 	import item from '@/mycomponents/item/item.vue'
 	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
 
 	export default {
 		components: {
 			item,
-			balanceQty
+			balanceQty,
+			compareQty
 		},
 		data() {
 			return {
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index ede15045..2a28c1de 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -8,32 +8,23 @@
 				<view class="header_item">
 					申请单号 : {{jobContent.requestNumber}}
 				</view>
-				<u-line />
+
 			</view>
 			<scroll-view scroll-y="true" class="">
-				<uni-collapse ref="mainCollapse" v-for="(toLocation, index) in detailSource">
-					<uni-collapse-item :open="true">
-						<template v-slot:title>
-							<view>
-								<com-issue-request-info :workShopCode="jobContent.workShopCode"
-									:dataContent="toLocation">
-								</com-issue-request-info>
-							</view>
-						</template>
-						<view>
-							<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
-								@updateData='updateData'>
-							</com-issue-detail-card>
-						</view>
-					</uni-collapse-item>
-				</uni-collapse>
+				<view v-for="(toLocation, index) in detailSource">
+					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
+					</com-issue-request-info>
+					<u-line />
+					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					</com-issue-detail-card>
+				</view>
 			</scroll-view>
 		</view>
 
 		<div class="btn_bottom">
 			<view class="" style="display: flex;flex-direction: row;">
 				<view class="">
-					<button class="btn_commit" hover-class="btn_commit_after" @click="resizeCollapse()">刷新UI</button>
+					<!-- <button class="btn_commit" hover-class="btn_commit_after" @click="resizeCollapse()">刷新UI</button> -->
 					<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
@@ -154,16 +145,15 @@
 					this.$refs.comIssueDetailCard.forEach(r => {
 						r.resizeCollapse();
 					})
-					this.$refs.mainCollapse.forEach(r => {
-						r.childrens.forEach(i => {
-							i.init();
-						})
-						r.resize();
-					})
+					// this.$refs.mainCollapse.forEach(r => {
+					// 	r.childrens.forEach(i => {
+					// 		i.init();
+					// 	})
+					// 	r.resize();
+					// })
 				});
 			},
 
-
 			//接收
 			receive(callback) {
 				if (this.id != null) {
@@ -391,7 +381,7 @@
 					})
 				}
 				this.resizeCollapse();
-				item.handleQty=itemHandleQty;
+				item.handleQty = itemHandleQty;
 			},
 
 			scanPopupGetFocus() {

From 240b2894ad8502f19c0cf9556aa642972b263945 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 11 Dec 2023 14:24:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=94=B6=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/productionReceiptDetail.vue           | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index d6e03ab7..a8345727 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -1,21 +1,29 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
+			<view class="page-header">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					发料任务单号 : {{jobContent.issueJobNumber}}
+				</view>
+				<u-line />
+			</view>
+			<scroll-view scroll-y="true" class="">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
 							:locationTypeList='tolocationTypeList'>
 						</com-detail-card>
+						<u-line />
 					</view>
-					<u-line />
+					
 				</view>
 			</scroll-view>
 		</view>
 
-
-
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
@@ -75,6 +83,8 @@
 
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		components: {
@@ -83,7 +93,9 @@
 			comMessage,
 			requiredLocation,
 			comDetailCard,
-			detailInfoPopup
+			detailInfoPopup,
+			comIssueRequestInfo,
+			jobTop
 		},
 		data() {
 			return {