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" : {
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 @@
+ :handleQty="dataContent.handleQty"
+ :isShowRecommendQty="isShowRecommendQty"
+ :isShowStatus="false" :isShowStdPack="showStdPack">
@@ -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 @@
+ :isShowBalanceQty="isShowBalanceQty"
+ :isShowRecommendQty="false"
+ >
-
+
扫描
@@ -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) {
- 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'
+ 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'
+ let newLeft = e.changedTouches[0].clientX-this.btnX
+ let newTop = e.changedTouches[0].clientY-this.btnY
+ console.log('newTop',newTop)
+ if(newTop>0&&newTop0&&newLeft{
+ // console.log('得到的位置信息',data)
+ // })).exec();
},
goScan(content) {
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 => {
//创建盘点信息,标记为已经扫描