diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue
index 0ef7c08f..3988d82f 100644
--- a/src/mycomponents/detail/comJobDetailCard.vue
+++ b/src/mycomponents/detail/comJobDetailCard.vue
@@ -6,15 +6,17 @@
-
+
-
-
@@ -36,6 +38,7 @@
} from '@/common/array.js';
export default {
+ emits: ["updateData"],
components: {
itemCompareQty,
recommend,
@@ -124,12 +127,8 @@
},
swipeClick(e, item) {
- if (e.content.text == "详情") {
- this.detail(item)
- } else if (e.content.text == "编辑") {
+ if (e.content.text == "编辑") {
this.edit(item)
- } else if (e.content.text == "库位") {
- this.showLocation(item)
} else if (e.content.text == "移除") {
this.remove(item)
}
@@ -138,20 +137,6 @@
this.editItem = item;
this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
},
- showLocation(item) {
- this.locatonItem = item;
- this.$refs.scanLocationCode.openScanPopup();
- },
- //扫描源库位
- getLocation(location, code) {
- this.locatonItem.toLocationCode = code;
- this.$emit('updateData')
- },
-
- detail(item) {
- this.showItem = item;
- this.$refs.jobDetailPopup.openPopup(item)
- },
remove(item) {
this.$refs.message.showQuestionMessage("确定移除扫描信息?",
res => {
@@ -166,6 +151,9 @@
confirm(qty) {
this.editItem.handleQty = qty;
this.$emit('updateData')
+ },
+ updateData(){
+ this.$emit('updateData')
}
}
}
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 5734021c..10f12497 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -5,15 +5,18 @@
-
+
-
-
-
-
+
+
+
+
+
+
@@ -21,6 +24,7 @@
+
@@ -35,7 +39,7 @@
getEditRemoveOption
} from '@/common/array.js';
export default {
- emits: ["collapseChange"],
+ emits: ["collapseChange", "updateData"],
components: {
packageCard,
recommendQtyEdit
@@ -46,12 +50,12 @@
editItem: {},
options: [],
removeOptions: [],
- editAndRemoveOptions:[]
+ editAndRemoveOptions: []
}
},
mounted() {
this.removeOptions = getRemoveOption();
- this.editAndRemoveOptions =getEditRemoveOption()
+ this.editAndRemoveOptions = getEditRemoveOption()
},
props: {
dataContent: {
@@ -91,7 +95,7 @@
type: Object,
default: null
},
- isEdit:{
+ isEdit: {
type: Boolean,
default: false
}
@@ -104,8 +108,22 @@
swipeClick(e, item) {
if (e.content.text == "编辑") {
this.edit(item)
+ } else if (e.content.text == "移除") {
+ this.remove(item)
}
},
+ remove(item) {
+ this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
+ res => {
+ if (res) {
+ item.scaned = false
+ item.handleQty = 0
+ this.$emit('updateData')
+ this.$forceUpdate()
+ }
+ });
+ },
+
edit(item) {
this.editItem = item;
this.$refs.receiptEdit.openTaskEditPopup(item.qty, item.handleQty, item.labelQty);
@@ -180,11 +198,11 @@
isDevlement() {
return config.isDevelopment;
},
- confirm(qty){
- this.editItem.handleQty =qty;
+ confirm(qty) {
+ this.editItem.handleQty = qty;
this.$emit("updateData")
}
-
+
}
}
diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
index ba630c80..9c1b4781 100644
--- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
+++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
@@ -28,7 +28,7 @@
+ style='height: 30rpx;border:1px solid #fff ;'>
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index f79d579c..ed3d3bdc 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -36,6 +36,7 @@
} from '@/common/array.js';
export default {
+
components: {
itemCompareQty,
recommend,
@@ -166,6 +167,9 @@
confirm(qty) {
this.editItem.handleQty = qty;
this.$emit('updateData')
+ },
+ updateData(){
+ this.$emit('updateData')
}
}
}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 3d5c268d..71aa0e8f 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -334,7 +334,8 @@
},
updateData() {
- calcHandleQty(this.detailSource);
+ calcTreeHandleQty(this.detailSource)
+ // calcHandleQty(this.detailSource);
},
scanLocationCode(location, code) {
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 8515a896..55e831bc 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -39,7 +39,6 @@
-
@@ -224,7 +223,9 @@
},
updateData() {
- this.calcHandleQty();
+ console.log("updateData")
+ // this.calcHandleQty();
+ calcTreeHandleQty(this.detailSource)
},
openScanPopup() {