Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -36,12 +36,13 @@
 		<!-- 合格转隔离单独的弹窗-->
 		<okToHoldRecordPack ref="okToHoldRecordPackRef" :showOnePop='showOnePop'
 			@showFromLocationPopup='showFromLocationPopup' @itemCodeClick='openScanPopup'
-			@confirm='okToHoldRecordPackConfirm' @getInputMsgResult="getInputMsgResult"
+			@onConfirm='okToHoldRecordPackConfirm' @getInputMsgResult="getInputMsgResult"
-			@itemCodeScanMsg='itemCodeScanMsg'></okToHoldRecordPack>
+			></okToHoldRecordPack>
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"
+			@clearFromLocation="clearFromLocationCode"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -157,7 +158,7 @@
 				itemCodeTypeList: [],
 				isShowEditLocation: false,
 				isJustReplay: true, //是否只是回显，不走库存余额接口
-				fromWarehouseCode:""
+				fromWarehouseCode: ""
 			}
 		},
 
@@ -287,14 +288,13 @@
 				this.toLocationInfo = location;
 			},
 			getScanResult(result, managementTypeParams) {
-				console.log(222,result)
 				this.fromWarehouseCode =result.fromWarehouseCode
 				this.managementType = managementTypeParams
 				if (this.showOnePop) {
 					if (this.isJustReplay) {
 						this.$refs.okToHoldRecordPackRef.itemCode = result.label.itemCode
 						this.$refs.okToHoldRecordPackRef.batch = result.label.batch
-						this.$refs.okToHoldRecordPackRef.uom = result.package.uom
+						this.$refs.okToHoldRecordPackRef.uom = result.balance?result.balance.uom:""
 						this.getResult = result //存储接受的结果
 						this.$refs.scanPopup.closeScanPopup()
 					} else {
@@ -324,10 +324,6 @@
 					return;
 				}
 				
-				this.checkItemCode(obj.itemCode, callBack => {
-
-					if (callBack) {
-						if (checkDirectoryItemExist(this.itemCodeTypeList, callBack)) {
 				this.getResult = this.getResult ? this.getResult : {
 					label: {},
 					fromLocationCode: ''
@@ -338,17 +334,6 @@
 				this.getResult.label.qty = obj.handleQty
 				this.isJustReplay = false
 				this.$refs.scanPopup.getScanResult(this.getResult, this.businessType)
-						} else {
-							var hint = getListItemTypeDesc(this.itemCodeTypeList);
-							this.showErrorMessage("扫描物料[" + obj.itemCode + "]是[" +
-								getItemTypeName(callBack) + "],需要的物料类型是[" + hint + "]")
-						}
-
-					} else {
-						this.showErrorMessage('未查找到物料【' + obj.itemCode + '】');
-					}
-
-				})
 
 			},
 			//checkItemCode
@@ -375,6 +360,10 @@
 				return true
 			},
 
+			clearFromLocationCode() {
+				this.$refs.okToHoldRecordPackRef.fromLocationCode = ''
+			},
+
 
 			getScanResultAfter(result) {
 				var balance = result.balance;
@@ -545,10 +534,28 @@
 				if (fromWitch == 'fromLocationScanMsg') {
 					this.isClearFromLocationCode = false
 					this.$refs.scanFromLocationCode.getScanResult(result)
-				} else if (fromWitch == 'itemCodeScanMsg') {
+				} else if (fromWitch == 'itemCodeScan') {
 					result.fromLocationCode = this.fromLocationCode
+					result.label.itemCode = result.label.code
+					this.checkItemCode(result.label.itemCode, callBack => {
+						if (callBack) {
+							if (checkDirectoryItemExist(this.itemCodeTypeList, callBack)) {
+								this.$refs.scanPopup.getScanResult(result)
+							} else {
+								this.$refs.okToHoldRecordPackRef.itemCode = ''
+								var hint = getListItemTypeDesc(this.itemCodeTypeList);
+								this.showErrorMessage("扫描物料[" + result.label.itemCode + "]是[" +
+									getItemTypeName(callBack) + "],需要的物料类型是[" + hint + "]")
+							}
+
+						} else {
+							this.$refs.okToHoldRecordPackRef.itemCode = ''
+							this.showErrorMessage('未查找到物料【' + result.label.itemCode + '】');
+						}
+
+					})
+
 					this.$refs.scanPopup.getScanResult(result)
-					console.log(result)
 				}
 			},
 			// 清除来源库位

src/pages/inventoryMove/coms/okToHoldRecordPack.vue

@@ -10,41 +10,47 @@
 			<view class="item">
 				<view class="label">来源库位：</view>
 				<view class="value">
-					<u-input v-model="fromLocationCode"></u-input>
+					<u-input v-model="fromLocationCode" @confirm="fromLocationScanMsg" @blur="fromLocationScanMsg"
-					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="fromLocationCode=''" v-if="fromLocationCode"></u-icon>
+						
+						></u-input>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="fromLocationCode=''"
+						v-if="fromLocationCode"></u-icon>
 				</view>
 				<view class="searchIcon">
-					<image src="/static/search.svg" mode=""  @click="fromLocationClick"/>
+					<image src="/static/search.svg" mode="" @click="fromLocationClick" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="label">零件：</view>
 				<view class="value">
-					<u-input v-model="itemCode"></u-input>
+					<u-input v-model="itemCode" @confirm="itemCodeScanMsg" @blur="itemCodeScanMsg"></u-input>
-					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="itemCode=''" v-if="itemCode"></u-icon>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="itemCode=''"
+						v-if="itemCode"></u-icon>
 				</view>
 				<view class="searchIcon">
-					<image src="/static/search.svg" mode=""  @click="itemCodeClick"/>
+					<image src="/static/search.svg" mode="" @click="itemCodeClick" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="label">批次：</view>
 				<view class="value">
 					<u-input v-model='batch'></u-input>
-					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="batch = ''" v-if="batch"></u-icon>
+					<u-icon name="close-circle-fill" color="#acacac" size="36" @click="batch = ''"
+						v-if="batch"></u-icon>
 				</view>
 				<view class="searchIcon"></view>
 			</view>
 			<view class="item">
 				<view class="label">数量：</view>
 				<view class="value1">
-					<u-number-box v-model="handleQty" ></u-number-box>
+					<u-number-box v-model="handleQty"></u-number-box>
 					<uom :uom="uom"></uom>
 				</view>
 			</view>
 			<view class="uni-flex uni-row hide_border">
-				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="showOne = false">取消</button>
+				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after"
-				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+					@click="showOne = false">取消</button>
+				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="clickConfirm">确认</button>
 			</view>
 		</u-popup>
 
@@ -64,7 +70,11 @@
 		getLabelInfo
 	} from '../../../common/label.js';
 
-import uom from '@/mycomponents/qty/uom.vue'
+	import {
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import uom from '@/mycomponents/qty/uom.vue'
 
 
 
@@ -73,16 +83,18 @@ import uom from '@/mycomponents/qty/uom.vue'
 			winScanLocation,
 			uom
 		},
-		emits: ["showFromLocationPopup",'itemCodeClick','confirm','getInputMsgResult','clearFromLocationCode','clickBtnClearItemCode'],
+		emits: ["showFromLocationPopup", 'itemCodeClick', 'onConfirm', 'getInputMsgResult', 'clearFromLocationCode',
+			'clickBtnClearItemCode'
+		],
 		data() {
 			return {
-				handleQty:0,
+				handleQty: 0,
-				fromLocationCode:'',
+				fromLocationCode: '',
-				itemCode:'',
+				itemCode: '',
-				batch:'',
+				batch: '',
-				showOne:false,
+				showOne: false,
-				isFromLocationFocus:false,
+				isFromLocationFocus: false,
-				uom:""
+				uom: ""
 			}
 		},
 		props: {
@@ -92,33 +104,32 @@ import uom from '@/mycomponents/qty/uom.vue'
 				default: false
 			},
 		},
-		mounted() {
+		mounted() {},
-		},
 		methods: {
 			// 打开扫描来源库位组件
-			fromLocationClick(){
+			fromLocationClick() {
 				// this.$refs.scanLocationCode.openScanPopup()
 				this.$emit("showFromLocationPopup");
 			},
 			// 显示箱码
-			itemCodeClick(){
+			itemCodeClick() {
 				// this.$refs.scanLocationCode.openScanPopup()
-				if(!this.fromLocationCode){
+				if (!this.fromLocationCode) {
 					this.$refs.comMessage.showMessage("请先扫描来源库位")
 					return
 				}
 				this.$emit("itemCodeClick");
 			},
-			confirm(){
+			clickConfirm() {
 				// this.$refs.scanLocationCode.openScanPopup()
 
 				let obj = {
-					fromLocationCode:this.fromLocationCode,
+					fromLocationCode: this.fromLocationCode,
-					itemCode:this.itemCode,
+					itemCode: this.itemCode,
-					batch:this.batch,
+					batch: this.batch,
-					handleQty:this.handleQty,
+					handleQty: this.handleQty,
 				}
-				this.$emit("confirm",obj);
+				this.$emit("onConfirm", obj);
 				// if(!obj.fromLocationCode){
 				// 	this.$refs.comMessage.showErrorMessage('请选择来源库位');
 				// 	return;
@@ -133,24 +144,30 @@ import uom from '@/mycomponents/qty/uom.vue'
 				// }
 
 			},
-			fromLocationScanMsg(){
+			fromLocationScanMsg() {
+				setTimeout(() => {
 					if (this.fromLocationCode) {
 						this.scanMsg = this.fromLocationCode
 						this.fromWitch = 'fromLocationScanMsg'
 						this.isFromLocationFocus = false
 						this.handelScanMsg()
 					}
+				}, 500); 
+				
 			},
-			itemCodeScanMsg(){
+			itemCodeScanMsg() {
+				setTimeout(() => {
 					if (this.itemCode) {
-				if(!this.fromLocationCode){
+						if (!this.fromLocationCode) {
 							this.$refs.comMessage.showMessage("请先扫描来源库位")
 							return
 						}
-				this.fromWitch = 'itemCodeScanMsg'
+						this.fromWitch = 'itemCodeScan'
 						this.scanMsg = this.itemCode
 						this.handelScanMsg()
 					}
+				}, 500); 
+				
 			},
 			handelScanMsg() {
 				//点击了回车
@@ -159,7 +176,7 @@ import uom from '@/mycomponents/qty/uom.vue'
 				// 	mask: true
 				// })
 				let that = this;
-				console.log(777,that.scanMsg)
+				console.log(777, that.scanMsg)
 				// if(index==-1){
 				// 	that.scanMsg =that.scanMsg + "\n";
 				// }
@@ -191,7 +208,7 @@ import uom from '@/mycomponents/qty/uom.vue'
 							if (scanResult.success) {
 								// that.getfocus();//不能自动获取焦点
 								console.log(scanResult)
-								that.$emit("getInputMsgResult", scanResult,this.fromWitch);
+								that.$emit("getInputMsgResult", scanResult, this.fromWitch);
 							} else {
 								that.losefocus();
 								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
@@ -210,10 +227,10 @@ import uom from '@/mycomponents/qty/uom.vue'
 					that.boxfocus = false;
 				});
 			},
-			clickBtnClearFromLocation(){
+			clickBtnClearFromLocation() {
 				this.$emit("clickBtnClearFromLocation");
 			},
-			clickBtnClearItemCode(){
+			clickBtnClearItemCode() {
 				this.$emit("clickBtnClearItemCode");
 			},
 		},
@@ -224,36 +241,42 @@ import uom from '@/mycomponents/qty/uom.vue'
 </script>
 
 <style lang="scss">
-	.title{
+	.title {
-		padding:30rpx 20rpx;
+		padding: 30rpx 20rpx;
 		display: flex;
-		border-bottom:1px solid rgba(230, 230, 230, 1);
+		border-bottom: 1px solid rgba(230, 230, 230, 1);
-		.title-txt{
+
-			flex:1;
+		.title-txt {
+			flex: 1;
 			font-weight: bold;
 			font-size: 32rpx;
 		}
 
 	}
-	.select{
+
+	.select {
 		display: flex;
 	}
-	.border{
+
-		border:1px  solid rgba(230, 230, 230, 1)
+	.border {
+		border: 1px solid rgba(230, 230, 230, 1)
 	}
-	::v-deep .u-input__right-icon__clear{
+
+	::v-deep .u-input__right-icon__clear {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		color: #a7a7a7;
 	}
-	.item{
+
+	.item {
 		display: flex;
 		align-items: center;
 		padding: 20rpx;
 		border-bottom: 1px solid #dedede;
-		.value{
+
-			flex:1;
+		.value {
+			flex: 1;
 			width: 0px;
 			height: 80rpx;
 			border: 1px solid #dedede;
@@ -262,23 +285,27 @@ import uom from '@/mycomponents/qty/uom.vue'
 			font-size: 32rpx;
 			padding: 0px 20rpx;
 		}
-		.value1{
+
-			flex:1;
+		.value1 {
+			flex: 1;
 			width: 0px;
 			height: 80rpx;
 			display: flex;
 			align-items: center;
 			font-size: 32rpx;
 		}
-		.searchIcon{
+
+		.searchIcon {
 			width: 40rpx;
 			margin-left: 20rpx;
-			image{
+
+			image {
 				width: 40rpx;
-				height:40rpx
+				height: 40rpx
 			}
 		}
-		.uom{
+
+		.uom {
 			margin-left: 10rpx;
 		}