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

mycomponents/item/itemCompareQty.vue

@@ -4,7 +4,7 @@
 			<item :dataContent="dataContent"></item>
 		</view>
 		<view>
-			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="isShowStdPack"></recommend-qty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false"
 				:isShowStdPack ="isShowStdPack">

pages/inspect/coms/inspectComDetailCard.vue

@@ -31,7 +31,7 @@
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
-					<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)">
+					<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
 					</item-compare-qty>
 					<view class="" style="margin-left: 20rpx; ">
 						<batch :batch="jobContent.batch"></batch>
@@ -44,7 +44,8 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch"
 								:isShowFromLocation="isShowLocation"></recommend>
-							<view  v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;">
+								 <!--  -->
+							<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;margin-top: 5px;">
 								<view class="cell_box uni-flex uni-row">
 									<view class="cell_info uni-flex uni-row">
 										<view class="text_lightblue">