From 2cbf2353adb9e6702b3c2bf927d269d030302a91 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 8 Dec 2023 11:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/directory.js                           | 20 ++++++++++++++++++
 pages/index/index.vue                         |  2 +-
 pages/inspect/coms/inspectInfoPopup.vue       | 21 ++++++++++++++++---
 .../request/returnToStoreRequestSubmit.vue    | 12 +++++++----
 static/config.json                            |  2 +-
 5 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/common/directory.js b/common/directory.js
index af8e4037..4ad973c2 100644
--- a/common/directory.js
+++ b/common/directory.js
@@ -14,6 +14,7 @@ let scrapReasonList = [];
 let inspectFailedReasonList = [];
 let nextActionList = []; 
 let inspectTypeList = [];
+let sampleMethodList = [];
 
 
 // 获取业务类型字典项
@@ -45,6 +46,7 @@ export function clearCacheData() {
 	   inspectFailedReasonList = [];
 	   nextActionList = []; 
 	   inspectTypeList = [];
+	   sampleMethodList =[]
 }
 
 //获取字典信息
@@ -385,4 +387,22 @@ export function getInspectType(value) {
 	}
 	return resultInfo
 }
+//获取抽检方式
+export function getSampleMethod(value) {
+	var resultInfo = "";
+	if (sampleMethodList.length == 0) {
+		sampleMethodList = getDirectoryInfo("sample_method")
+	}
+	if (sampleMethodList.length > 0) {
+		for (let item of sampleMethodList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a71ca8f6..97a1cee9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -272,7 +272,7 @@
 					types:["job_status","location_type","item_status","uom",
 					"inventory_status","container_type","pack_unit","unplanned_receipt_reason",
 					"unplanned_issue_reason","scrap_reason","inspect_failed_reason",
-					"request_status","inspect_type","next_action"]
+					"request_status","inspect_type","next_action","sample_method"]
 				} 
 				getDictionaryItem(params).then(res => {
 					if (res.data.length > 0) {
diff --git a/pages/inspect/coms/inspectInfoPopup.vue b/pages/inspect/coms/inspectInfoPopup.vue
index 8a73d011..e022fe0f 100644
--- a/pages/inspect/coms/inspectInfoPopup.vue
+++ b/pages/inspect/coms/inspectInfoPopup.vue
@@ -38,7 +38,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">检验类型 : </text>
-							<text class="text_wrap">{{dataContent.inspectType}} </text>
+							<text class="text_wrap">{{getInspectType(dataContent.inspectType)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">下一步检验动作 : </text>
@@ -46,11 +46,11 @@
 						</view>
 						<view class="item">
 							<text class="item_title">抽检方式 : </text>
-							<text class="text_wrap">{{dataContent.sampleMethod}} </text>
+							<text class="text_wrap">{{getSampleMethod(dataContent.sampleMethod)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">计量单位 : </text>
-							<text class="text_wrap">{{dataContent.uom}} </text>
+							<text class="text_wrap">{{getUnitInfo(dataContent.uom)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">收货数量 : </text>
@@ -70,6 +70,10 @@
 
 <script>
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
+	import{getInspectType,
+	getSampleMethod,
+	getUnitInfo
+	} from "@/common/directory.js"
 	export default {
 		components: {
 			jobCommonInfo,
@@ -94,6 +98,17 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getInspectType(value){
+				return getInspectType(value);
+			},
+			getSampleMethod(value){
+				return getSampleMethod(value);
+			},
+			getUnitInfo(value){
+				var info = getUnitInfo(value)
+				return info.label;
+			},
+			
 		}
 	}
 </script>
diff --git a/pages/productionReturn/request/returnToStoreRequestSubmit.vue b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
index 5ab26580..31e04a0c 100644
--- a/pages/productionReturn/request/returnToStoreRequestSubmit.vue
+++ b/pages/productionReturn/request/returnToStoreRequestSubmit.vue
@@ -23,7 +23,7 @@
 			<comMessage ref="comMessage"></comMessage>
 		</view>
 	</view>
-	<comReturnRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm'></comReturnRequestPopup>
+	<comReturnRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm' title="申请信息"></comReturnRequestPopup>
 </template>
 
 <script>
@@ -106,7 +106,6 @@
 						itemCode: item.itemCode,
 						itemName: item.itemName,
 						inventoryStatus:"OK",
-						batch:"000000",
 						packingNumber:"",
 						fromLocationCode:item.rawLocationCode,
 						qty: item.qty,
@@ -156,10 +155,15 @@
 			setParams() {
 				if(this.fromType=="ReturnToStore"){
 					this.detailSource.isOK = true
+					this.detailSource.subList.forEach(res => {
+						res.batch ="000000"
+					})
+					
 				}else if(this.fromType=="ReturnToHold"){
 					this.detailSource.isOK = false
-				}else {
-					this.detailSource.isOK = false
+					this.detailSource.subList.forEach(res => {
+						res.batch = ""
+					})
 				}
 				return this.detailSource
 			},
diff --git a/static/config.json b/static/config.json
index 471c6bba..1c570702 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.178: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.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",