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

src/mycomponents/job/jobRepleinshTimeQty.vue

@@ -2,7 +2,7 @@
 	<view class="u-flex u-row-between card_itemName" style="margin: 20rpx auto;">
 		<view class="uni-flex uni-column align-start" style="flex: 1;">
 			<text style="padding-left: 8rpx;">补料数量</text>
-			<text class="uom_blue">{{dataContent.unexecutedQty+dataContent.qty}}{{getUomInfo(dataContent.uom)}}</text>
+			<text class="uom_blue">{{dataContent.unexecutedQty}}{{getUomInfo(dataContent.uom)}}</text>
 		</view>
 		<view style="padding-left: 8rpx;padding-right: 8rpx;" >|</view>
 		<view class="uni-flex uni-column align-start" style="flex: 1;">
@@ -16,7 +16,7 @@
 		<view style="padding-left: 8rpx;padding-right: 8rpx;" >|</view>
 		<view class="uni-flex uni-column align-start" style="flex: 1;">
 			<text style="padding-left: 8rpx;">未补料数量</text>
-			<text class="uom_yellow">{{dataContent.unexecutedQty}}{{getUomInfo(dataContent.uom)}}</text>
+			<text class="uom_yellow">{{dataContent.unexecutedQty-dataContent.qty>0?dataContent.unexecutedQty-dataContent.qty:0}}{{getUomInfo(dataContent.uom)}}</text>
 			
 		</view>
 	</view>

src/mycomponents/job/jobTopDate.vue

@@ -87,6 +87,7 @@
 			background-color: #DA8910;
 			min-width: 40rpx;
 			height: 40rpx;
+			line-height: 40rpx;
 			border-radius: 50%;
 			color: white;
 		}

src/pages/count/job/countLightDetail.vue

@@ -185,7 +185,6 @@
 						that.dataList.forEach(res => {
 							res.scaned = false;
 						})
-						// that.dataList =[]
 
 						that.updateList(false)
 					}
@@ -483,7 +482,7 @@
 			calcQtyAndUpdateSatus() {
 				this.dataList.forEach(item => {
 					if (Number(item.currentQty) == 0) {
-						if (Number(item.qty) == Number(item.totalRecordCountQty)) {
+						if (Number(item.totalRecordCountQty) >= Number(item.qty)) {
 							item.countStatus = "finish"
 						} else {
 							item.countStatus = "wait"

src/pages/repleinsh/coms/comRepleishDetailCardTime.vue

@@ -24,7 +24,7 @@
 					<view class="uom_blue uni-flex align-center" >
 						<view class="uom_yellow" style="word-break:break-word;">{{dataContent.recordList?dataContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0):''}}</view>
 						<view class="">/</view>
-						<view class="uom_blue">{{dataContent.unexecutedQty}}{{' '+getUomInfo(dataContent.uom)}}</view>
+						<view class="uom_blue">{{dataContent.unexecutedQty-dataContent.qty>0?dataContent.unexecutedQty-dataContent.qty:0}}{{' '+getUomInfo(dataContent.uom)}}</view>
 					</view>
 				</view>
 			</view>

src/pages/repleinsh/job/repleinshTimeDetail.vue

@@ -310,16 +310,23 @@
 			},
 
 			clickSubmit() {
-			// 未补料数量unexecutedQty
+				if(!this.jobContent.recordList||this.jobContent.recordList.length==0){
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return
+				}
+				
+			// 补料数量unexecutedQty
 			// 已补料数量qty
-				let requestQty = this.jobContent.unexecutedQty+this.jobContent.qty
+				let requestQty = this.jobContent.unexecutedQty
+				debugger
 				if(this.jobContent.qty>=requestQty){
 					// 已完成
+					this.showErrorMessage("当前便次补料任务已完成")
 				}else{
 					//部分完成
 					let handleQty = this.jobContent.recordList.reduce((prev, item) => prev + Number(item['handleQty']),0)
-					if(handleQty>requestQty){
+					if(this.jobContent.qty+handleQty>requestQty){
-						showConfirmMsg("拆包信息还没提交，是否要重新扫描?",res=>{
+						showConfirmMsg("扫描数量大于补料数量，是否确认提交?",res=>{
 							if(res){
 								//防止重复点击
 								this.$throttle(this.submitJob, 2000, this)()
@@ -330,7 +337,6 @@
 						this.$throttle(this.submitJob, 2000, this)()
 					}
 				}
-				
 			},
 
 
@@ -570,6 +576,10 @@
 			},
 			getPackScanResult(result) {
 				console.log('扫描结果',result)
+				if(result.balance.itemCode!=this.jobContent.itemCode){
+					this.showErrorMessage('扫描非当前物料')
+					return
+				}
 				this.jobContent.recordList.push({
 					scaned:true,
 					uom:this.jobContent.uom,
@@ -644,7 +654,8 @@
 			text-align: center;
 			background-color: #DA8910;
 			min-width: 40rpx;
-			height: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
 			border-radius: 50%;
 			color: white;
 		}