From 420bd4e0100992d33787259e765f434fb6673f72 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 29 Aug 2024 15:15:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 81575e5c..3dd50b9e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.69",
-    "versionCode" : 69,
+    "versionName" : "1.0.70",
+    "versionCode" : 70,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From ef8258245a11a4a482ef3ed5a75643bd98eea399 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 29 Aug 2024 16:48:44 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/countLightDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index b1d153dd..59a6865d 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/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 => {
 							//创建盘点信息，标记为已经扫描

From 93a1c275d7b1b654548cc8626926cff9f10cad2b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 29 Aug 2024 16:52:33 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=8B=96=E6=8B=BD-?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9APP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanButton.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/mycomponents/scan/winScanButton.vue b/src/mycomponents/scan/winScanButton.vue
index 2da37a22..0672ad2a 100644
--- a/src/mycomponents/scan/winScanButton.vue
+++ b/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,6 +22,8 @@
 				},
 				btnX:20,
 				btnY:20,
+				viewLeft:'auto',
+				viewTop:'auto',
 			}
 		},
 		props: {
@@ -38,8 +40,15 @@
 			},
 			handleTouchMove(e) {
 				console.log("handleTouchMove",e);
-				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'		
+				// 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'
+				this.viewLeft = e.changedTouches[0].clientX-this.btnX+'px'
+				this.viewTop = e.changedTouches[0].clientY-this.btnY+'px'
+				// const query = uni.createSelectorQuery().in(this)
+				// console.log('scanRef',query.select("#scanRef"))
+				// query.select("#scanRef").boundingClientRect((data=>{
+				// 	console.log('得到的位置信息',data)
+				// })).exec();		
 			},
 
 			goScan(content) {

From 89a176544daac5bd347326d23219543a572223d3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 29 Aug 2024 17:26:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanButton.vue | 29 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/mycomponents/scan/winScanButton.vue b/src/mycomponents/scan/winScanButton.vue
index 0672ad2a..60135d97 100644
--- a/src/mycomponents/scan/winScanButton.vue
+++ b/src/mycomponents/scan/winScanButton.vue
@@ -28,22 +28,35 @@
 		},
 		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) {
-				console.log("handleTouchMove",e);
+			handleTouchMove(e) {
+				let maxLeft = this.getScreenWidth() - 60
+				let maxTop = this.getScreenHeight() - 40
+				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'
-				this.viewLeft = e.changedTouches[0].clientX-this.btnX+'px'
-				this.viewTop = 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=>{

From ed5504cbfdbb9b3784b56c2c2403fc6e8472329c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 29 Aug 2024 18:18:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AE=9E=E9=99=85=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemQty.vue               | 9 ++++++++-
 src/mycomponents/record/recordComDetailCard.vue | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index dc9623f7..eb37f9e8 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/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: {
 
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index a303f0ed..d0144453 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/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='目标库位'

From d144485869cb5082569bb0e7ddeb71fbcdce2ff5 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 29 Aug 2024 20:07:14 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BF=AE=E6=94=B9=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemQty.vue               | 9 ++++++++-
 src/mycomponents/record/recordComDetailCard.vue | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index dc9623f7..eb37f9e8 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/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: {
 
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index a303f0ed..d0144453 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/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='目标库位'

From c40773a2f5b598896f77c07c81914f3fb22fcdeb Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 30 Aug 2024 09:08:19 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 81575e5c..4b2a91c4 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.69",
-    "versionCode" : 69,
+    "versionName" : "1.0.71",
+    "versionCode" : 71,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {