diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index cbd92cdf..741d2cc3 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -178,18 +178,20 @@
},
setValue() {
var balanceQty = Number(this.dataContent.balanceQty);
- if (this.allQty == 0) {
- this.$refs.comMessage.showConfirmWarningModal('数量必须大于0',
+ if(this.allQty<0){
+ this.$refs.comMessage.showConfirmWarningModal('数量必须大于等于0',
res => {
this.allQty = balanceQty;
})
- } else if (this.allQty > balanceQty) {
- this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
- res => {
- this.allQty = balanceQty;
- })
- } else {
- this.callback();
+ }else {
+ if (this.allQty > balanceQty) {
+ this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
+ res => {
+ this.allQty = balanceQty;
+ })
+ } else {
+ this.callback();
+ }
}
},
callback() {
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index d1082ca4..f5fd805e 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -1,22 +1,23 @@
-
+
-
+
-
+
-
+
+ :isShowPack="true" :isShowFromLocation="isShowFromLocation"
+ :isShowToLocation="isShowToLocation">
@@ -26,7 +27,7 @@
-
+
@@ -90,19 +91,23 @@
},
},
watch: {
+
dataContent: {
handler(newName, oldName) {
if (this.dataContent.subList.length > 0) {
- if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
- this.$nextTick(res => {
- this.$refs.collapse1.resize()
- })
- }
+ this.$nextTick(res => {
+ setTimeout(() => {
+ if (this.$refs.collapse1) {
+ this.$refs.collapse1.resize();
+ }
+ }, 500)
+ })
}
},
immediate: true,
deep: true
}
+
},
data() {
@@ -176,4 +181,4 @@
+
\ No newline at end of file
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index 46aee81a..d52e0114 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -97,8 +97,6 @@
var labelInfo = data.label;
var data = {
- productionLineCode:labelInfo.productionLineCode,
- workStationCode:labelInfo.workStationCode,
itemCode:labelInfo.itemCode,
location:labelInfo.location,
qty:labelInfo.qty,
@@ -107,6 +105,8 @@
};
this.detailSource.subList.push(data)
+ this.detailSource.productionLineCode=labelInfo.productionLineCode;
+ this.detailSource.workStationCode=labelInfo.workStationCode;
this.detailSource.warehouseCode = labelInfo.warehouseCode;
this.detailSource.workshopCode = labelInfo.workshopCode;
this.submit();
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 3f016a43..eb213c52 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -515,10 +515,7 @@
const timer1 = setInterval(async () => {
if (timerCount == 15) {
clearInterval(timer1)
- uni.showToast({
- title: "跳转打印页面失败",
- icon: "none"
- });
+ this.showErrorMessage("上架任务生成异常,请到收货记录里重新生成上架申请")
return;
}
await getPutawayJobList({
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index cea8602c..1bf861a3 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -285,7 +285,8 @@
},
selectBalanceItem(balance) {
- this.afterGetBalance(this.resultData, balance);
+ this.resultData.balance =balance;
+ this.afterGetBalance(this.resultData);
},
afterGetBalance(result){