From 776ffd16b1f84c896a4f792ba3d547a34806c18e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 14 Aug 2024 18:53:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=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 7a1fc122..b7047d24 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF",
"description" : "",
- "versionName" : "1.0.55",
- "versionCode" : 55,
+ "versionName" : "1.0.58",
+ "versionCode" : 58,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
From 686a10f682733d21bd8cdd7b08625eb0087f30f2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 22:33:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/qty/balanceQtyEdit.vue | 8 ++++++--
src/pages/inventoryMove/coms/comInventoryDetailCard.vue | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index e4c8c031..79109196 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -36,7 +36,7 @@
数量 :
+ @confirm="confirm()" @input="checkNum" :maxlength="maxlength" :disabled="!allowEditQty" :style="allowEditQty?{}:{background:'#f5f5f5',color:'#bbbbbb'}"/>
@@ -119,7 +119,11 @@
queryBalance: {
type: Boolean,
default: true
- }
+ },
+ allowEditQty: {
+ type: Boolean,
+ default: true
+ },
},
watch:{
'allQty'(newVal){
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index d01e273f..58125685 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -17,7 +17,7 @@
-
+
From b74b62c82764dae2ca177d161fbb5f213ff3552b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 22:41:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=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/pages/inventoryMove/coms/comInventoryDetailCard.vue | 6 +++++-
src/pages/inventoryMove/job/inventoryMoveDetail.vue | 2 +-
src/pages/transfer/job/transferDetail.vue | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 58125685..d06d84d0 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -17,7 +17,7 @@
-
+
@@ -67,6 +67,10 @@
type: Object,
default: {}
},
+ allowEditQty: {
+ type: Boolean,
+ default: true
+ }
},
watch: {
// dataContent: {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index bf64c75a..dad77e16 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -12,7 +12,7 @@
-
diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue
index 2fd37fe0..b2aeb931 100644
--- a/src/pages/transfer/job/transferDetail.vue
+++ b/src/pages/transfer/job/transferDetail.vue
@@ -12,7 +12,7 @@
-