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

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.69",
+    "versionName" : "1.0.71",
-    "versionCode" : 69,
+    "versionCode" : 71,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/mycomponents/item/itemQty.vue

@@ -6,7 +6,9 @@
 		<view>
 			<balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-				:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack">
+				:handleQty="dataContent.handleQty"
+				:isShowRecommendQty="isShowRecommendQty"
+				 :isShowStatus="false" :isShowStdPack="showStdPack">
 			</compare-qty>
 		</view>
 	</view>
@@ -45,6 +47,11 @@
 				type: Boolean,
 				default: false
 			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
+			},
+			
 		},
 		watch: {
 

src/mycomponents/record/recordComDetailCard.vue

@@ -6,7 +6,9 @@
 					<uni-swipe-action>
 						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
 							<item-qty :dataContent="dataContent" :isShowBalance="true"
-								:isShowBalanceQty="isShowBalanceQty"></item-qty>
+								:isShowBalanceQty="isShowBalanceQty"
+								:isShowRecommendQty="false"
+								></item-qty>
 							<view style="margin-left: 10px; margin-top: 5px;">
 								<pack title='父包装' v-if="dataContent.containerNumber" :packingCode='dataContent.containerNumber'></pack>
 								<location v-if="isShowParentToLocation" title='目标库位'

src/mycomponents/scan/winScanButton.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="scan_float" ref="scanRef" @click="goScan('bottom')" @touchstart="handleTouchStart" @touchmove.prevent="handleTouchMove">
+		<view class="scan_float" :style="{left:viewLeft,top:viewTop}" ref="scanRef" @click="goScan('bottom')" @touchstart="handleTouchStart" @touchmove.prevent="handleTouchMove">
 			<image src="@/static/icons_ui/icon_scan_white.svg"></image>
 			<view>扫描</view>
 		</view>
@@ -22,24 +22,46 @@
 				},
 				btnX:20,
 				btnY:20,
+				viewLeft:'auto',
+				viewTop:'auto',
 			}
 		},
 		props: {
 		
-		},
-		
-		created() {
-
 		},
 		methods: {
+			getScreenWidth() {
+			    const systemInfo = uni.getSystemInfoSync();
+			    return systemInfo.windowWidth; // 屏幕宽度，单位px
+			},
+			getScreenHeight() {
+			    const systemInfo = uni.getSystemInfoSync();
+			    return systemInfo.windowHeight; // 屏幕宽度，单位px
+			},
 			handleTouchStart(e) {
 				this.btnX = e.changedTouches[0].clientX-e.currentTarget.offsetLeft
 				this.btnY = e.changedTouches[0].clientY-e.currentTarget.offsetTop
 			},
-			handleTouchMove(e) {
+			handleTouchMove(e) {
-				console.log("handleTouchMove",e);
+				let maxLeft = this.getScreenWidth() - 60
-				this.$refs.scanRef.$el.style.left = e.changedTouches[0].clientX-this.btnX+'px'
+				let maxTop = this.getScreenHeight() - 40
-				this.$refs.scanRef.$el.style.top = e.changedTouches[0].clientY-this.btnY+'px'		
+				console.log('maxTop',maxTop)
+				// this.$refs.scanRef.$el.style.left = e.changedTouches[0].clientX-this.btnX+'px'
+				// this.$refs.scanRef.$el.style.top = e.changedTouches[0].clientY-this.btnY+'px'
+				let newLeft = e.changedTouches[0].clientX-this.btnX
+				let newTop = e.changedTouches[0].clientY-this.btnY
+				console.log('newTop',newTop)
+				if(newTop>0&&newTop<maxTop){
+					this.viewTop = newTop+'px'
+				}
+				if(newLeft>0&&newLeft<maxLeft){
+					this.viewLeft  = newLeft+'px'
+				}
+				// const query = uni.createSelectorQuery().in(this)
+				// console.log('scanRef',query.select("#scanRef"))
+				// query.select("#scanRef").boundingClientRect((data=>{
+				// 	console.log('得到的位置信息',data)
+				// })).exec();		
 			},
 
 			goScan(content) {

src/pages/count/job/countLightDetail.vue

@@ -353,7 +353,7 @@
 					r.inventoryStatus === inventoryStatus)
 				//不在任务列表中,是否添加库存
 				if (items.length == 0) {
-					this.$refs.comMessage.showQuestionMessage("物料【"+ result.label.itemCode+"】不是盘点范围内,"+"包装【" + result.label.packingNumber +
+					this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
 						"】不在任务列表中,是否要添加到列表中?",
 						res => {
 							//创建盘点信息，标记为已经扫描