From f3630945de02794adfc9fdd592f7643a1470b230 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 25 Jan 2024 15:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B8=85=E9=99=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winScanPackAndPosition.vue  |  2 +-
 pages/issue/coms/comIssueRequestPopup.vue     | 28 +++++++++++++++++++
 pages/issue/coms/comScanIssuePack.vue         | 13 +++++++--
 pages/issue/job/issueDetail.vue               | 15 ++++++----
 pages/issue/record/issueRecord.vue            | 25 ++++++++++-------
 pages/issue/request/issueRequestCreate.vue    | 17 +++++------
 .../unPlanned/coms/comReceiptRequestPopup.vue |  9 ++++--
 7 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/mycomponents/scan/winScanPackAndPosition.vue b/mycomponents/scan/winScanPackAndPosition.vue
index a33bc574..dfe09e37 100644
--- a/mycomponents/scan/winScanPackAndPosition.vue
+++ b/mycomponents/scan/winScanPackAndPosition.vue
@@ -112,7 +112,7 @@
 			},
 			
 			initData(){
-				this.positionInfo= "请选择位置";
+				this.positionInfo = "请选择位置";
 				this.positionList = [];
 				this.productionLineCode = '';
 				this.rawLocationCode = "";
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index 7d1d5cce..aad3c3c4 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -162,8 +162,11 @@
 					this.isModifiedPosition = false
 				} else {
 					this.itemCode = "";
+					this.isCheckItemCode = false;
+					this.show = false
 					this.uom = ""
 					this.qty = 0;
+					this.stdPackInfo =undefined;
 					this.counQty = undefined;
 					this.numberFocus = false
 					this.itemCodeGetFocus();
@@ -171,6 +174,26 @@
 
 				this.$refs.popup.open('bottom')
 			},
+			initData(){
+				this.positionList = [];
+				this.itemCode = "请扫描物料信息";
+				this.isCheckItemCode = false;
+				this.rawLocationCode =""
+				this.positionInfo ="请选择位置"
+				this.workshopCode= "" //车间
+				this.workShopName= ""
+				this.productionLineCode="" //生产线
+				this.productionLineName=""
+				this.workStationCode= "" //工位
+				this.workStationName= ""
+				this.show = false
+				this.uom = ""
+				this.qty = 0;
+				this.stdPackInfo =undefined;
+				this.counQty = undefined;
+				this.numberFocus = false
+			},
+			
 			closeRequestPopup() {
 				this.$refs.popup.close()
 			},
@@ -194,6 +217,11 @@
 			},
 
 			confirm() {
+				if (this.positionInfo == "请选择位置" ) {
+					this.showErrorMessage("请选择位置")
+					return
+				}
+				
 				if (this.itemCode == "" || !this.isCheckItemCode) {
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index ba6fdeff..1213d1ae 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -3,9 +3,16 @@
 		<uni-popup ref="popup" :maskClick='false'>
 			<view class="">
 				<view class="popup_box">
-					<view class="pop_title">
-						扫描箱码
-						<text class="fr" @click="closeScanPopup()">关闭</text>
+					
+					<view class="pop_title uni-flex space-between">
+						<view class="" style="font-size: 35rpx;">
+							扫描箱码
+						</view>
+					
+						<view class="">
+							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+								@click="closeScanPopup()"></image>
+						</view>
 					</view>
 					<!-- 	<view class="uni-flex uni-row" style="align-items: center;
 						background-color: #fff; 
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index b0b0c302..745f1894 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -20,15 +20,18 @@
 				</view>
 			</scroll-view>
 		</view>
-
-		<div class="btn_bottom">
-			<view class="" style="display: flex;flex-direction: row;">
+		
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
 				<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 class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 				</view>
 			</view>
-		</div>
+		</view>
+
 		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
 		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 		</com-scan-issue-pack>
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index eb5268f7..939d5aa8 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -22,21 +22,26 @@
 				</scroll-view>
 				<button class="btn_add" @click="goScan(true)">+去添加</button>
 			</view>
-
-			<div class="btn_bottom">
-				<view class="" style="display: flex;flex-direction: row;">
+			
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 					</view>
 				</view>
-			</div>
+			</view>
+
 		</view>
 	</view>
-	<com-message ref="comMessage"></com-message>
+	
 	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
 	<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
 	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 	</com-scan-issue-pack>
+	<com-message ref="comMessage"></com-message>
 </template>
 
 <script>
@@ -182,7 +187,6 @@
 					if (res.data == null) {
 						that.showMessage('未获取到推荐信息');
 					} else {
-
 						if (res.data.length > 0) {
 							that.workShopCode = item.workshopCode;
 							res.data.forEach(r => {
@@ -190,7 +194,8 @@
 								r.productionLineCode = item.productionLineCode;
 								r.workStationCode = item.workStationCode;
 								// r.itemCode = item.itemCode;
-								// r.uom = item.uom;
+								r.itemName = item.itemName
+								r.uom = item.uom;
 								that.subList.push(r);
 							})
 							that.detailSource = getDataSource(that.detailSource, that.subList)
@@ -355,13 +360,12 @@
 			submitJob() {
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-
 				issueRecordSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
 					} else {
-						this.showErrorMessage("提交失败:" + res.msg)
+						this.showErrorMessage("提交失败:【" + res.msg+"】")
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -372,6 +376,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.clearData();
+					this.$refs.comIssueRequestPopup.initData()
 
 				})
 			},
diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue
index 970ff741..753dd3ed 100644
--- a/pages/issue/request/issueRequestCreate.vue
+++ b/pages/issue/request/issueRequestCreate.vue
@@ -9,14 +9,16 @@
 				</comIssueRequestCreator>
 				<button class="btn_add" @click="goScan(false)">+去添加</button>
 			</view>
-
-			<div class="btn_bottom">
-				<view class="" style="display: flex;flex-direction: row;">
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 					</view>
 				</view>
-			</div>
+			</view>
 
 			<com-scan-issue-pack ref="comScanIssuePack">
 			</com-scan-issue-pack>
@@ -39,6 +41,7 @@
 		goHome,
 		updateTitle,
 		getRemoveOption,
+		navigateBack,
 		getCurrDateOneMonthsTimes
 	} from '@/common/basic.js';
 
@@ -176,9 +179,7 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './issueRequest'
-					})
+					navigateBack(1)
 				})
 			},
 			showErrorMessage(message) {
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
index d523a4de..8021e91f 100644
--- a/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -108,7 +108,7 @@
 				itemCodeFocus: false,
 				requestInfo: null,
 				isCheckItemCode: false,
-				counQty: 0,
+				counQty: undefined,
 				numberFocus: false,
 				uom: "",
 				show: false,
@@ -149,7 +149,7 @@
 					this.itemCode = "";
 					this.uom = ""
 					this.qty = 0
-					this.count = 0;
+					this.counQty = undefined;
 					this.itemCodeGetFocus();
 				}
 				this.$refs.popup.open('bottom')
@@ -190,6 +190,11 @@
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
 				if (this.qty == 0) {
 					this.showErrorMessage("数量必须大于0")
 					return