Browse Source

修改任务提交后跳转

wms3.0_pda
lijuncheng 11 months ago
parent
commit
1edeaff726
  1. 17
      pages/count/job/countDetail.vue
  2. 20
      pages/count/record/countRecord.vue
  3. 6
      pages/customerReturn/job/returnDetail.vue
  4. 8
      pages/deliver/job/deliverDetail.vue
  5. 16
      pages/inventoryMove/job/inventoryMoveDetail.vue
  6. 4
      pages/issue-按批次推荐/job/issueDetail.vue
  7. 9
      pages/issue/job/issueDetail.vue
  8. 2
      pages/issue/job/issueReceiptJob.vue
  9. 16
      pages/productDismantle/job/productDismantleDetail.vue
  10. 5
      pages/productPutaway/job/productPutawayDetail.vue
  11. 7
      pages/productReceipt/job/productReceiptDetail.vue
  12. 56
      pages/productionReceipt/job/productionReceiptDetail.vue
  13. 10
      pages/productionReturn/coms/comReturn.vue
  14. 6
      pages/productionReturn/job/returnDetail.vue
  15. 9
      pages/repleinsh/job/repleinshDetail.vue
  16. 16
      pages/scrap/job/scrapJobDetail.vue
  17. 16
      pages/transfer/job/issueDetail.vue
  18. 16
      pages/transfer/job/receiptDetail.vue
  19. 18
      pages/transfer/job/transferDetail.vue
  20. 16
      pages/unPlanned/job/issueJobDetail.vue
  21. 19
      pages/unPlanned/job/receiptJobDetail.vue

17
pages/count/job/countDetail.vue

@ -47,6 +47,7 @@
import {
goHome,
navigateBack,
getPackingNumberAndBatch
} from '@/common/basic.js';
@ -562,15 +563,6 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
editItem(item) {
var detail = this.detailSource.find(r => r.itemCode == item.record.itemCode);
this.$refs.CountQtyEdit.openEditPopup(item.record,
@ -579,13 +571,8 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1);
})
setTimeout(() => {
uni.navigateTo({
url: './receiptJob'
})
}, 3000)
}
}

20
pages/count/record/countRecord.vue

@ -47,7 +47,8 @@
<script>
import {
goHome,
getDataSource
getDataSource,
navigateBack
} from '@/common/basic.js';
import {
@ -497,25 +498,10 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
})
setTimeout(() => {
uni.navigateTo({
url: './receiptJob'
})
}, 3000)
},
}
}

6
pages/customerReturn/job/returnDetail.vue

@ -50,7 +50,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
getDirectoryItemArray
@ -478,9 +478,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './returnJob'
})
navigateBack(1)
})
},
}

8
pages/deliver/job/deliverDetail.vue

@ -57,6 +57,7 @@
import {
goHome,
updateTitle,
navigateBack,
getRemoveOption,
getCurrDateTime,
getDirectoryItemArray,
@ -374,9 +375,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './deliverJob'
})
navigateBack(1)
})
},
@ -384,9 +383,6 @@
this.$refs.comMessage.showRescanMessage(message);
},
closeCommitMessage() {
this.openScanPopup();
},
afterCloseMessage() {
this.scanPopupGetFocus();

16
pages/inventoryMove/job/inventoryMoveDetail.vue

@ -50,6 +50,7 @@
import {
goHome,
updateTitle,
navigateBack,
getCurrDateTime,
getPackingNumberAndBatch,
getInventoryStatusName
@ -414,22 +415,9 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './inventoryMoveJob'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './inventoryMoveJob'
})
navigateBack(1)
})
},

4
pages/issue-按批次推荐/job/issueDetail.vue

@ -628,10 +628,6 @@
this.$refs.comMessage.showRescanMessage(message);
},
closeCommitMessage() {
this.openScanPopup();
},
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
},

9
pages/issue/job/issueDetail.vue

@ -40,6 +40,7 @@
import {
goHome,
updateTitle,
navigateBack,
getRemoveOption,
getISODateTime,
getCurrDateTime,
@ -393,9 +394,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './issueJob'
})
navigateBack(1)
})
},
@ -403,10 +402,6 @@
this.$refs.comMessage.showRescanMessage(message);
},
closeCommitMessage() {
this.openScanPopup();
},
afterCloseMessage() {
this.scanPopupGetFocus();
},

2
pages/issue/job/issueReceiptJob.vue

@ -33,7 +33,7 @@
import {
goHome,
updateTitle
updateTitle,
} from '@/common/basic.js';
import {

16
pages/productDismantle/job/productDismantleDetail.vue

@ -14,7 +14,7 @@
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
@ -54,6 +54,7 @@
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
} from '@/common/basic.js';
@ -369,7 +370,7 @@
}
});
},
setParams() {
var subList = []
var creator = this.$store.state.user.id
@ -483,14 +484,9 @@
},
showCommitSuccessMessage(hint) {
setTimeout(() => {
this.$refs.comMessage.showSuccessMessage(hint, res => {
})
uni.navigateTo({
url: './putawayJob'
})
}, 3000)
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
})
},
}
}

5
pages/productPutaway/job/productPutawayDetail.vue

@ -53,6 +53,7 @@
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
} from '@/common/basic.js';
@ -469,9 +470,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './putawayJob'
})
navigateBack(1);
})
},
}

7
pages/productReceipt/job/productReceiptDetail.vue

@ -14,8 +14,6 @@
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
@ -50,6 +48,7 @@
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
} from '@/common/basic.js';
@ -403,9 +402,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './productReceiptJob'
})
navigateBack(1)
})
},
}

56
pages/productionReceipt/job/productionReceiptDetail.vue

@ -14,7 +14,7 @@
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
@ -53,6 +53,7 @@
import {
goHome,
updateTitle,
navigateBack,
getCurrDateTime,
getPackingNumberAndBatch,
getInventoryStatusName
@ -234,7 +235,7 @@
getScanResult(result) {
try {
var supplierCode =result.package.supplierCode
var supplierCode = result.package.supplierCode
var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch;
var qty = result.balance.qty;
@ -266,14 +267,14 @@
']不一致,是否继续上架?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.supplierCode =supplierCode
itemDetail.supplierCode = supplierCode
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
.qty) ? Number(result.balance.qty) : Number(result.label.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty =result.package.stdPackQty
itemDetail.balance.stdPackUnit =result.package.stdPackUnit
itemDetail.balance.stdPackQty = result.package.stdPackQty
itemDetail.balance.stdPackUnit = result.package.stdPackUnit
this.calcHandleQty();
} else {
this.scanPopupGetFocus();
@ -320,7 +321,7 @@
if (!this.checkLocation()) {
return
}
//
if (this.scanCount == this.subList.length) {
this.submitJob();
@ -341,19 +342,19 @@
}
}
},
checkLocation() {
var isPass = true;
if (this.toLocationCode == "" || this.toLocationCode == null) {
this.showMessageHint('请扫描目库位', callback => {
this.$refs.comScanLocation.showLocation();
})
return isPass = false;
}
return isPass;
},
showMessageHint(hint, callback) {
this.$refs.comMessage.showErrorMessage(hint, res => {
if (res) {
@ -362,7 +363,7 @@
});
},
submitJob() {
submitJob() {
uni.showLoading({
title: "提交中....",
mask: true
@ -371,13 +372,13 @@
this.detailSource.forEach(item => {
itemCodes.push(item.itemCode)
})
getManagementPrecisions(itemCodes,this.toLocationCode, res => {
getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) {
this.managementList = res.list;
var params = this.setParams()
console.log("提交参数",JSON.stringify(params));
console.log("提交参数", JSON.stringify(params));
productionReceiptJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
@ -395,27 +396,27 @@
}
});
},
setParams() {
var subList = []
var creator = this.$store.state.user.id
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber;
detail.toBatch =info.batch;
detail.toContainerNumber = "";
detail.toLocationCode =this.toLocationCode;
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
detail.toContainerNumber = "";
detail.toLocationCode = this.toLocationCode;
subList.push(detail)
}
})
})
this.jobContent.subList = subList
this.jobContent.creator =creator;
this.jobContent.creator = creator;
return this.jobContent;
},
@ -463,7 +464,7 @@
afterCloseMessage() {
this.scanPopupGetFocus();
},
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
@ -476,14 +477,9 @@
},
showCommitSuccessMessage(hint) {
setTimeout(() => {
this.$refs.comMessage.showSuccessMessage(hint, res => {
})
uni.navigateTo({
url: './putawayJob'
})
}, 3000)
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
})
},
}
}

10
pages/productionReturn/coms/comReturn.vue

@ -434,16 +434,6 @@
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
/**
* BlobUrl转blob数据
* @param {Object} url blob URL

6
pages/productionReturn/job/returnDetail.vue

@ -45,7 +45,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch
} from '@/common/basic.js';
import {
@ -462,9 +462,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './returnJob'
})
navigateBack(1)
})
},
}

9
pages/repleinsh/job/repleinshDetail.vue

@ -41,6 +41,7 @@
import {
goHome,
updateTitle,
navigateBack,
getRemoveOption,
getCurrDateTime,
getDirectoryItemArray,
@ -370,9 +371,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './repleinshJob'
})
navigateBack(1)
})
},
@ -380,10 +379,6 @@
this.$refs.comMessage.showRescanMessage(message);
},
closeCommitMessage() {
this.openScanPopup();
},
afterCloseMessage() {
this.scanPopupGetFocus();
},

16
pages/scrap/job/scrapJobDetail.vue

@ -39,7 +39,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getDirectoryItemArray,
getInventoryStatusName,
@ -378,21 +378,9 @@
this.$refs.scanPopup.losefocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './scrapJob'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './scrapJob'
})
navigateBack(1)
})
},
}

16
pages/transfer/job/issueDetail.vue

@ -48,7 +48,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
getDirectoryItemArray
@ -504,21 +504,9 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './issueJob'
})
navigateBack(1)
})
},

16
pages/transfer/job/receiptDetail.vue

@ -45,7 +45,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName,
getDirectoryItemArray
@ -480,21 +480,9 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './receiptJob'
})
navigateBack(1)
})
},

18
pages/transfer/job/transferDetail.vue

@ -42,6 +42,7 @@
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getInventoryStatusName
} from '@/common/basic.js';
@ -523,16 +524,6 @@
this.scanPopupGetFocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receipt'
})
})
//
uni.hideLoading();
},
/**
* BlobUrl转blob数据
* @param {Object} url blob URL
@ -553,13 +544,8 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
})
setTimeout(() => {
uni.navigateTo({
url: './receiptJob'
})
}, 3000)
},
}

16
pages/unPlanned/job/issueJobDetail.vue

@ -44,7 +44,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getDirectoryItemArray,
getInventoryStatusName,
@ -380,21 +380,9 @@
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './issueJob'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './issueJob'
})
navigateBack(1)
})
},
}

19
pages/unPlanned/job/receiptJobDetail.vue

@ -46,7 +46,7 @@
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
getDirectoryItemArray
} from '@/common/basic.js';
@ -379,25 +379,10 @@
this.$refs.scanPopup.losefocus();
},
closeCommitMessage() {
setTimeout(() => {
uni.navigateTo({
url: './receiptJob'
})
})
//
uni.hideLoading();
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
})
setTimeout(() => {
uni.navigateTo({
url: './receiptJob'
})
}, 3000)
},
}
}

Loading…
Cancel
Save