From 90e73ae2ebc9a8b2f7f4c1427a6c2b2e11992741 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 30 Jan 2024 11:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=A4=96?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7=E6=A0=A1=E9=AA=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/issue/record/issueRecord.vue            |  1 -
 .../unPlanned/coms/comReceiptRequestPopup.vue | 53 ++++++-------------
 .../request/receiptRequestCreate.vue          | 18 +++++--
 3 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 8ebadbfe..58b99a81 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -136,7 +136,6 @@
 					this.toInventoryStatuses = res.toInventoryStatuses
 					this.goScan(true)
 				} else {
-					
 					this.showErrorMessage(res.message)
 				}
 			});
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
index 8021e91f..1bfeafbe 100644
--- a/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -68,7 +68,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemCode'>
+		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemScanResult'>
 		</win-scan-item>
 		<winScanLocation ref="locationPopup" title="库位代码" @getLocation='getLocationCode'></winScanLocation>
 		<comMessage ref="comMessage"></comMessage>
@@ -126,6 +126,10 @@
 				type: String,
 				default: '申请信息'
 			},
+			itemCodeTypeList: {
+				type: Array,
+				default: []
+			},
 		},
 		methods: {
 			checkNum(e) {
@@ -146,7 +150,7 @@
 			openRequestPopup(editPosition) {
 				this.editPosition = editPosition;
 				if (!editPosition) {
-					this.itemCode = "";
+					this.itemCode = "请扫描物料信息";
 					this.uom = ""
 					this.qty = 0
 					this.counQty = undefined;
@@ -175,10 +179,6 @@
 			itemCodeLoseFocus() {
 				this.itemCodeFocus = false;
 			},
-			selectedItem(item) {
-				this.itemCode = item.itemCode;
-				this.checkItemCode();
-			},
 
 			confirm() {
 				if (this.toLocationCode == "") {
@@ -186,7 +186,7 @@
 					return
 				}
 
-				if (this.itemCode == "" || !this.isCheckItemCode) {
+				if (this.itemCode == "请扫描物料信息" ) {
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
@@ -203,28 +203,6 @@
 				this.callback('add');
 			},
 
-			checkItemCode(itemCode) {
-				//校验物料
-				getBasicItemByCode(itemCode).then(res => {
-					uni.hideLoading();
-					this.$refs.itemPopup.closeScanPopup();
-					if (res.data != null && res.data.list.length > 0) {
-						this.itemCode = res.data.list[0].code;
-						this.itemName = res.data.list[0].name
-						this.isCheckItemCode = true;
-						this.numberFocus = true
-						this.uom = res.data.list[0].uom
-					} else {
-						this.showErrorMessage('未查找到物料【' + itemCode + '】', "itemCode");
-					}
-
-				}).catch(error => {
-					uni.hideLoading();
-					this.showErrorMessage(error, "itemCode");
-				})
-			},
-
-
 			callback(action) {
 				let item = {
 					toLocationCode: this.toLocationCode,
@@ -259,18 +237,17 @@
 				this.closeRequestPopup();
 			},
 
-			getItemCode(code, scanResult) {
-				if (code == "") {
-					this.showErrorMessage('物料号不能为空')
-					return;
-				}
-				this.itemCode = "";
-				this.checkItemCode(code)
-				this.stdPackInfo = scanResult.package;
-			},
 			getLocationCode(location, code) {
 				this.toLocationCode = code;
 			},
+			
+			getItemScanResult(code, scanResult) {
+				this.itemCode = code;
+				this.itemName = scanResult.name
+				this.uom =scanResult.uom
+				this.stdPackInfo = scanResult.package;
+				this.numberFocus = true
+			}
 
 		}
 	}
diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue
index 1fd5e8d3..a73aae91 100644
--- a/pages/unPlanned/request/receiptRequestCreate.vue
+++ b/pages/unPlanned/request/receiptRequestCreate.vue
@@ -39,7 +39,7 @@
 			<comMessage ref="comMessage"></comMessage>
 		</view>
 	</view>
-	<comReceiptRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm'></comReceiptRequestPopup>
+	<comReceiptRequestPopup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList"></comReceiptRequestPopup>
 </template>
 
 <script>
@@ -50,6 +50,9 @@
 	import {
 		calc
 	} from '@/common/calc.js';
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
 
 	import {
 		goHome,
@@ -84,7 +87,6 @@
 		},
 		data() {
 			return {
-				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: {
 					subList: []
@@ -92,14 +94,24 @@
 				reasonList: [], //需求信息
 				reasonText: "",
 				reasonCode: "",
+				itemCodeTypeList:[]
 
 			}
 		},
 		mounted() {
-			this.goScan(true)
 		},
 		onLoad(option) {
 			this.reasonList = getUnPlannedReceiptReasonList()
+			var typeCode = "UnplannedReceipt"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		
 		},
 		methods: {
 			goScan(editPosition) {