diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index 4a6904fa..ed980091 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -6,7 +6,7 @@
-
+
@@ -45,7 +45,7 @@
type: Number,
default: 0
},
- showItemQty: {
+ isShowBalanceQty: {
type: Boolean,
default: true
},
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 9631545a..62883887 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -6,7 +6,7 @@
+ :isShowBalance="true" :isShowBalanceQty="isShowBalanceQty">
@@ -86,7 +86,7 @@
default: true
},
- isShowItemQty: {
+ isShowBalanceQty: {
type: Boolean,
default: false
},
diff --git a/pages/container/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue
index f41af4d6..ad07a2b9 100644
--- a/pages/container/coms/comPalletRecord.vue
+++ b/pages/container/coms/comPalletRecord.vue
@@ -5,7 +5,7 @@
-
diff --git a/pages/count/coms/comCountDetailCard.vue b/pages/count/coms/comCountDetailCard.vue
index 5ce487ef..b3c070a8 100644
--- a/pages/count/coms/comCountDetailCard.vue
+++ b/pages/count/coms/comCountDetailCard.vue
@@ -6,10 +6,10 @@
+ :handleQty="dataContent.handleQty" :isShowBalanceQty="true">
+ :isShowBalanceQty="false" :showRecommendQty="false" :showStdPack="true">
diff --git a/pages/customerReturn/coms/comReturnRecord.vue b/pages/customerReturn/coms/comReturnRecord.vue
index fbbb3f30..c834449b 100644
--- a/pages/customerReturn/coms/comReturnRecord.vue
+++ b/pages/customerReturn/coms/comReturnRecord.vue
@@ -5,7 +5,7 @@
-
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
index 01f1c890..656f5e88 100644
--- a/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -4,10 +4,10 @@
-
- 客户 :
+
+ 客户 :
-
+
{{customerName}}
@@ -22,6 +22,7 @@
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
index 7410aa18..38339e15 100644
--- a/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -6,7 +6,7 @@
diff --git a/pages/productionReturn/coms/comReturnRecord.vue b/pages/productionReturn/coms/comReturnRecord.vue
index 093d9a17..0f1dadb5 100644
--- a/pages/productionReturn/coms/comReturnRecord.vue
+++ b/pages/productionReturn/coms/comReturnRecord.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
index 344432cd..8035a832 100644
--- a/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -117,7 +117,7 @@
requestInfo: null,
itemCodeList: [],
isCheckItemCode: false,
- counQty: 0,
+ counQty: undefined,
editPosition: true,
numberFocus: false,
uom: "",
@@ -230,7 +230,9 @@
} else {
this.itemCode = "";
this.uom = ""
- this.qty = 0
+ this.qty = 0;
+ this.counQty = undefined
+ this.numberFocus = false
this.itemCodeGetFocus();
}
@@ -263,6 +265,12 @@
this.showErrorMessage("请输入物料", "itemCode")
return
}
+
+ if (this.counQty == undefined) {
+ this.showErrorMessage("请输入数量")
+ return
+ }
+
if (this.qty == 0) {
this.showErrorMessage("数量必须大于0")
return
diff --git a/pages/unPlanned/coms/comReceiptRecord.vue b/pages/unPlanned/coms/comReceiptRecord.vue
index e5c1e852..f1566dd7 100644
--- a/pages/unPlanned/coms/comReceiptRecord.vue
+++ b/pages/unPlanned/coms/comReceiptRecord.vue
@@ -5,7 +5,7 @@
-