修改到货检验bug

mycomponents/job/jobDetailPopup.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<uni-popup ref="popup">
-			<detail-common-info :dataContent='dataContent'></detail-common-info>
+			<detail-common-info :dataContent='dataContent' @onClose="closeScanPopup()" ></detail-common-info>
 		</uni-popup>
 	</view>
 </template>

mycomponents/recommend/recommend.vue

@@ -11,7 +11,7 @@
 				</location>
 			</view>
 			<view>
-				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
+				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined||detail.handleQty==0" :dataContent="detail"
 					:isShowStdPack="false"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">

pages/inspect/coms/inspectComDetailCard.vue

@@ -1,23 +1,33 @@
 <template>
 	<view class="" style="background-color: #fff;">
 		<view class="">
-			<view class="" style="font-size: 32rpx;margin-left: 20rpx;">
-				<view class="">
-					检验类型 : {{getInspectType(jobContent.inspectType)}}
-				</view>
-				<view class="">
-					收货数量 : {{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					检验数量 : {{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					不合格数量 : {{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					报废数量 : {{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}
+			
+			<view class="cen_card" style="padding: 20rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">类型</view>
+						<view>{{getInspectType(jobContent.inspectType)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">收货数</view>
+						<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">检验数</view>
+						<view>{{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">不合格数</view>
+						<view>{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">报废数</view>
+						<view>{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
 				</view>
+				<u-line />
 			</view>
+			
 		</view>
 		<u-line />
 		<uni-collapse ref="collapse1" @change="">
@@ -168,7 +178,7 @@
 
 			detail(item) {
 				this.showItem = item;
-				this.$refs.receiptHint.openScanPopup()
+				this.$refs.receiptHint.openScanPopup(item)
 			},
 			remove(item) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
@@ -181,6 +191,7 @@
 							item.notPassedQty = 0;
 							item.inspectResult =""
 							item.failedReason =""
+							item.handleQty =0;
 							item.photos =""
 							this.$forceUpdate()
 							this.$emit('remove', item)

pages/inspect/coms/inspectEdit.vue

@@ -100,7 +100,7 @@
 			openEditPopup(item) {
 				this.failedReasonArray = getInspectFailedReasonList();
 				//拷贝数据到页面显示，防止修改数据原数据修改
-				Object.assign(this.dataContent, item)
+				this.dataContent = Object.assign({}, item)
 				this.$refs['editPopup'].open("bottom");
 			},
 
@@ -138,6 +138,7 @@
 				this.dataContent.failedQty = failedQty;
 				this.dataContent.crackQty = crackQty
 				this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty
+				debugger
 				this.afterSave()
 
 

pages/inspect/job/inspectDetail.vue

@@ -291,8 +291,7 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty)
 												itemDetail.balance = result.balance;
 												this.calcHandleQty();
 											} else {
@@ -302,8 +301,7 @@
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
-										result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty)
 									this.calcHandleQty();
 								}
 							}
@@ -370,7 +368,7 @@
 				inspectJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, )
+						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}

pages/inspect/job/inspectResult.vue

@@ -51,7 +51,7 @@
 					<view class="uni-label">不合格数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty"
+					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty" @clear="clearFailedQty"
 						@blur="failedQtyConfirm" class="count-input">
 					</uni-easyinput>
 				</view>
@@ -63,7 +63,7 @@
 					<view class="uni-label">报废数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur=""
+					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur="" @clear="clearCrackQty"
 						class="count-input">
 					</uni-easyinput>
 				</view>
@@ -156,6 +156,10 @@
 		getUnitInfo
 	} from '@/common/directory.js';
 	
+	import {
+		goHome
+	} from '@/common/basic.js';
+
 	export default {
 		components: {
 			comMessage
@@ -181,6 +185,12 @@
 
 			}
 		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
 		onLoad(option) {
 			this.id = option.id;
 			this.status = option.status;
@@ -318,6 +328,13 @@
 				}
 			},
 			
+			clearFailedQty(){
+				this.jobContent.failedQty = null;
+			},
+			
+			clearCrackQty(){
+				this.jobContent.crackQty = null
+			},
 
 			commit() {
 

pages/inspect/request/inspectRequestDetail.vue

@@ -5,10 +5,10 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						发货单号 :
+						单据号 : {{jobContent.number}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商 : </text>
+						<text>供应商代码 :  {{jobContent.supplierCode}} </text>
 					</view>
 				</view>
 				<u-line />