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

src/pages/customerReturn/job/returnDetail.vue

@@ -259,8 +259,7 @@
 
 			getScanResult(result) {
 				console.log(result)
-				this.managementType ==result.managementType
+				if(this.managementType == "BY_BATCH" || this.managementType == "BY_QUANTITY" ){
-				if(result.managementType == "BY_BATCH" || result.managementType == "BY_QUANTITY" ){
 					this.setDataBatch(result)
 				}else{
 					this.setData(result)
@@ -294,6 +293,7 @@
 								itemDetail.handleQty = Number(result.label.qty)
 								itemDetail.packQty = Number(result.package.packQty)
 								itemDetail.packUnit = result.package.packUnit
+								itemDetail.balanceQty=result.label.qty
 								this.calcHandleQty();
 				
 							}
@@ -416,6 +416,7 @@
 				let str = ''
 				let str1 = ''
 				let str2 = ''
+				let str3 = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
@@ -433,9 +434,13 @@
 						if(cur.handleQty < cur.qty){
 							str2 = `批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以小于推荐数量【${cur.qty}】`
 						}
+						
+						if(parseFloat(cur.handleQty)>parseFloat(cur.balanceQty)){
+							str3 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.qty}】\n`
+						}
 					})
 				})
-				this.jobContent.allowBiggerQty = 'FALSE'
+				// this.jobContent.allowBiggerQty = 'FALSE'
 				if(this.jobContent.allowBiggerQty == 'FALSE' &&str1){
 					this.$refs.comMessage.showConfirmWarningModal(str1)
 					return
@@ -444,6 +449,11 @@
 					this.$refs.comMessage.showConfirmWarningModal(str2)
 					return
 				}
+				if(str3){
+					this.$refs.comMessage.showErrorMessage(str3);
+					return;
+				}
+				
 				if (str) {
 					str = '任务明细未全部完成,是否提交?\n'+str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
@@ -471,7 +481,7 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						
+						return;
 						customerReturnJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {

src/pages/deliver/coms/comDeliverDetailCardBatch.vue

@@ -14,7 +14,7 @@
 					<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
 						    v-for="(item,index) in dataContent.subList">
 						<uni-swipe-action-item
-							:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"   @click="itemCoceClick($event,item,index)">
+							:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:detailOptions"   @click="itemCoceClick($event,item,index)">
 							<view class="" :class="item.scaned?'scan_view':''">
 								<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 							</view>

src/pages/deliver/coms/jobInfoPopup.vue

@@ -61,7 +61,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
+				setTimeout(res => {
 					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()

src/pages/deliver/job/deliverDetailBatch.vue

@@ -28,9 +28,6 @@
 
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view>
-		
-				</view>
 				<view v-for="(toLocation, index) in detailSource">
 				<comDeliverDetailCardBatch ref='comIssueDetailCardBatch' :dataContent="toLocation" :settingParam="jobContent"
 					@updateData='updateData' :allowBiggerQty='allowBiggerQty'>
@@ -54,7 +51,7 @@
 		<!-- <comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 		</comScanDeliverPackBatch> -->
 		
-		<winScanPackAndLocation :balanceFromInventoryStatuses="false" :toLocationCode="jobToLocationCode" ref="scanPopup"
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false"  ref="scanPopup"
 			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
 		</winScanPackAndLocation>
 		<comMessage ref="comMessage"></comMessage>
@@ -315,7 +312,7 @@
 										toLocationCode:this.toLocationCode,
 										batch:result.label.batch,
 										handleQty:result.label.qty,
-										qty:this.recommendQty,
+										qty:0,
 										inventoryStatus:result.balance.inventoryStatus,
 										toLocation:result.balance.toLocation,
 										balance:result.balance,

src/pages/issue/coms/comIssueDetailCardBatch.vue

@@ -14,7 +14,7 @@
 					<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
 						    v-for="(item,index) in dataContent.subList">
 						<uni-swipe-action-item
-							:right-options="(item.scaned&&settingParam.allowModifyQty == 'TRUE')?editAndRemoveOptions : item.scaned? removeOptions:options"   @click="itemCoceClick($event,item,index)">
+							:right-options="(item.scaned&&settingParam.allowModifyQty == 'TRUE')?editAndRemoveOptions : item.scaned? removeOptions:[]"   @click="itemCoceClick($event,item,index)">
 							<view class="" :class="item.scaned?'scan_view':''">
 								<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 							</view>
@@ -68,8 +68,8 @@
 		},
 		props: {
 			dataContent: {
-				type: Array,
+				type: Object,
-				default: []
+				default: {}
 			},
 			settingParam: {
 				type: Object,

src/pages/issue/job/issueDetailBatch.vue

@@ -39,10 +39,10 @@
 			@afterScan='afterScan' :locationCode='fromLocationCode'>
 		</com-scan-issue-pack> -->
 	
-		<winScanPackAndLocation :balanceFromInventoryStatuses="false" :toLocationCode="jobToLocationCode" ref="scanPopup"
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false"  ref="scanPopup"
 			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
 		</winScanPackAndLocation>
-		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<balance-select ref="balanceSelect" ></balance-select>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -347,7 +347,7 @@
 										toLocationCode:this.toLocationCode,
 										batch:result.label.batch,
 										handleQty:result.label.qty,
-										qty:this.recommendQty,
+										qty:0,
 										inventoryStatus:result.balance.inventoryStatus,
 										toLocation:result.balance.toLocation,
 										balance:result.balance,

src/pages/issue/record/directIssueByBatch.vue

@@ -81,7 +81,6 @@
 		createItemInfo,
 		createDetailInfo,
 		calcHandleQty,
-		createDetailInfoForLabel
 	} from '@/common/record.js';
 
 	import {
@@ -252,7 +251,7 @@
 				})
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
-						let newDetail = createDetailInfoForLabel(balance, pack,label);
+						let newDetail = createDetailInfo(balance, pack,label);
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -264,7 +263,7 @@
 						}
 					})
 					if (detail == undefined) {
-						let newDetail = createDetailInfoForLabel(balance, pack,label);
+						let newDetail = createDetailInfo(balance, pack,label);
 						item.subList.push(newDetail);
 					} else {
 						detail.handleQty =calc.add(detail.handleQty, result.label.qty)

src/pages/label/record/splitLabel.vue

@@ -140,7 +140,7 @@
 			openScanPopup() {
 				setTimeout(res=>{
 					if (this.detailSource.length > 0) {
-						showConfirmMsg("拆包信息还没提交，是否要重新扫描?", res => {
+						showConfirmMsg("拆标签信息还没提交，是否要重新扫描?", res => {
 							if (res) {
 								this.clearData();
 								this.$refs.scanPopup.openScanPopup("");
@@ -289,7 +289,7 @@
 									barcodeBase64: '',
 								})
 							})
-							this.showCommitSuccessMessage("提交成功\n生成拆包记录\n", list)
+							this.showCommitSuccessMessage("提交成功\n生成拆标签记录\n", list)
 
 						} else {
 							this.showErrorMessage("提交失败[" + res.msg + "]")