Browse Source

修改提交成功清空数据

wms3.0_pda
lijuncheng 11 months ago
parent
commit
e8389f9583
  1. 113
      mycomponents/scan/winScanProdline.vue
  2. 8
      pages/count/job/countDetail.vue
  3. 10
      pages/count/record/countRecord.vue
  4. 8
      pages/customerReturn/job/returnDetail.vue
  5. 25
      pages/customerReturn/record/returnRecord.vue
  6. 4
      pages/customerReturn/request/customerReturnRequest.vue
  7. 25
      pages/deliver/record/deliverRecord.vue
  8. 3
      pages/deliver/request/deliverRequest.vue
  9. 16
      pages/inventoryMove/coms/comMove.vue
  10. 5
      pages/issue-按批次推荐/job/issueDetail.vue
  11. 2
      pages/issue/record/issueRecord.vue
  12. 3
      pages/issue/request/issueRequest.vue
  13. 13
      pages/package/record/mergePackageRecord.vue
  14. 11
      pages/package/record/overPackageRecord.vue
  15. 11
      pages/package/record/splitPackageRecord.vue
  16. 2
      pages/pallet/record/bindPalletRecord.vue
  17. 10
      pages/pallet/record/unBindPalletRecord.vue
  18. 10
      pages/productDismantle/record/productDismantleRecord.vue
  19. 52
      pages/productPutaway/record/productPutawayRecord.vue
  20. 4
      pages/productPutaway/request/putawayRequest.vue
  21. 52
      pages/productReceipt/job/productReceiptDetail.vue
  22. 78
      pages/productReceipt/record/productReceiptRecord.vue
  23. 13
      pages/productionReceipt/record/productionReceiptRecord.vue
  24. 30
      pages/productionReturn/coms/comReturn.vue
  25. 3
      pages/productionReturn/coms/comReturnCommonRequest.vue
  26. 10
      pages/productionReturn/job/returnDetail.vue
  27. 62
      pages/productionReturn/record/returnToHold.vue
  28. 11
      pages/productionReturn/record/returnToStore.vue
  29. 8
      pages/purchaseReceipt/job/receiptDetail.vue
  30. 2
      pages/purchaseReturn/job/returnDetail.vue
  31. 2
      pages/purchaseReturn/record/returnRecord.vue
  32. 3
      pages/purchaseReturn/request/returnRequest.vue
  33. 2
      pages/purchaseReturn/request/returnRequestCreate.vue
  34. 8
      pages/putaway/record/putawayRecord.vue
  35. 4
      pages/putaway/request/putawayRequest.vue
  36. 23
      pages/query/container.vue
  37. 4
      pages/query/item.vue
  38. 18
      pages/query/item_copy.vue
  39. 13
      pages/query/location.vue
  40. 5
      pages/query/location_copy.vue
  41. 32
      pages/repleinsh/record/repleinshRecord.vue
  42. 36
      pages/scrap/record/scrapRecord.vue
  43. 10
      pages/scrap/request/scrapRequestCreate.vue
  44. 2
      pages/setter/index.vue
  45. 30
      pages/transfer/coms/comTransferRecord.vue
  46. 30
      pages/unPlanned/job/receiptJobDetail.vue
  47. 17
      pages/unPlanned/record/issueRecord.vue
  48. 15
      pages/unPlanned/record/receiptRecord.vue
  49. 4
      pages/unPlanned/request/issueRequest.vue
  50. 6
      pages/unPlanned/request/issueRequestCreate.vue
  51. 3
      pages/unPlanned/request/receiptRequest.vue

113
mycomponents/scan/winScanProdline.vue

@ -1,113 +0,0 @@
<template>
<uni-popup ref="popup" :maskClick='false'>
<view class="popup_box">
<view class="pop_title uni-flex space-between">
<view class="" style="font-size: 35rpx;">
扫描生产线
</view>
<view>
<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
</image>
</view>
</view>
<view class="">
<view class="">
<win-com-scan ref="scan" @getResultult="getScanResult" placeholder='生产线' :clearResult="false"
:boxFocus="true" :isShowHistory="false">
</win-com-scan>
</view>
</view>
</view>
</uni-popup>
<comMessage ref="comMessage"></comMessage>
</template>
<script>
import {
getProductionlineByCode,
} from '@/api/request.js';
import {
getListLocationTypeDesc,
checkDirectoryItemExist
} from '@/common/directory.js';
import winComScan from '@/mycomponents/scan/winComScan.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
export default {
components: {
winComScan,
comMessage
},
emits: ["getProdLine"],
props: {},
data() {
return {
code: '',
prodLine: {}
}
},
created() {
},
methods: {
openScanPopup() {
this.$refs.popup.open('bottom')
},
closeScanPopup() {
this.$refs.popup.close()
},
scanClick() {
this.$refs.scan.clickScanMsg();
},
cancelClick() {
this.$refs.scan.clearScanValue();
},
getScanResult(result) {
uni.showLoading({
title: '扫描中...',
mask: true
});
let label = result.label;
if (label.barType === 'QRCode') {
this.code = label.ProdLineCode;
} else if (label.barType === 'BarCode') {
this.code = label.Code;
}
getProductionlineByCode(this.code).then(res => {
if (res.data.total > 0) {
this.prodLine = res.data.list[0];
this.callBack();
} else {
this.showErrorMessage('未查询到生产线[' + this.code + ']')
}
uni.hideLoading();
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error)
})
},
callBack() {
this.closeScanPopup();
this.$emit("getProdLine", this.prodLine, this.code);
},
getfocus() {
this.$refs.scan.getfocus();
},
losefocus() {
this.$refs.scan.losefocus();
},
showErrorMessage(message) {
setTimeout(r => {
this.losefocus();
this.$refs.comMessage.showErrorMessage(message, res => {
this.code = '';
this.getfocus();
})
})
}
}
}
</script>
<style>
</style>

8
pages/count/job/countDetail.vue

@ -288,11 +288,15 @@
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.packGetFocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.packGetFocus();
}
}, },
getScanResult(result) { getScanResult(result) {

10
pages/count/record/countRecord.vue

@ -116,7 +116,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message ); this.showErrorMessage(res.message)
} }
}); });
@ -218,11 +218,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.packGetFocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.packGetFocus();
}
}, },
getScanResult(result) { getScanResult(result) {

8
pages/customerReturn/job/returnDetail.vue

@ -466,11 +466,15 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.packGetFocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.packGetFocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.packLoseFocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.packLoseFocus();
}
}, },
afterCloseMessage() { afterCloseMessage() {

25
pages/customerReturn/record/returnRecord.vue

@ -218,11 +218,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
@ -388,16 +392,19 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.clearData()
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
}) })
}, },
clearData(){
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
},
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();
for (var i = 0; i < this.detailSource.length; i++) { for (var i = 0; i < this.detailSource.length; i++) {

4
pages/customerReturn/request/customerReturnRequest.vue

@ -33,9 +33,7 @@
goHome, goHome,
updateTitle updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getCustomerReturnRequestList, getCustomerReturnRequestList,
} from '@/api/request2.js'; } from '@/api/request2.js';

25
pages/deliver/record/deliverRecord.vue

@ -251,11 +251,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
@ -423,16 +427,19 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.clearData();
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
}) })
}, },
clearData(){
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
},
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();
for (var i = 0; i < this.detailSource.length; i++) { for (var i = 0; i < this.detailSource.length; i++) {

3
pages/deliver/request/deliverRequest.vue

@ -33,9 +33,6 @@
goHome, goHome,
updateTitle updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getDeliverRequestList, getDeliverRequestList,
} from '@/api/request2.js'; } from '@/api/request2.js';

16
pages/inventoryMove/coms/comMove.vue

@ -271,15 +271,17 @@
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.clearData()
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
}) })
}, },
clearData(){
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
},
commit() { commit() {
if (this.toLocationCode == "") { if (this.toLocationCode == "") {

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

@ -597,10 +597,11 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {

2
pages/issue/record/issueRecord.vue

@ -103,7 +103,7 @@
this.toInventoryStatuses = res.toInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses
this.goScan(true) this.goScan(true)
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });

3
pages/issue/request/issueRequest.vue

@ -36,9 +36,6 @@
clearTirmAndWrap clearTirmAndWrap
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getIssueRequestList, getIssueRequestList,
issueRequestClose, issueRequestClose,

13
pages/package/record/mergePackageRecord.vue

@ -35,7 +35,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
</win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
<com-message ref="comMessage"></com-message> <com-message ref="comMessage"></com-message>
@ -118,7 +119,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
}, },
@ -219,11 +220,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

11
pages/package/record/overPackageRecord.vue

@ -30,7 +30,8 @@
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
</win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
<win-scan-button @goScan='showScanPopupPack'></win-scan-button> <win-scan-button @goScan='showScanPopupPack'></win-scan-button>
@ -243,11 +244,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

11
pages/package/record/splitPackageRecord.vue

@ -29,7 +29,8 @@
</view> </view>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
</win-scan-pack-and-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
<win-scan-button @goScan='showScanPopupPack'></win-scan-button> <win-scan-button @goScan='showScanPopupPack'></win-scan-button>
@ -243,11 +244,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

2
pages/pallet/record/bindPalletRecord.vue

@ -111,7 +111,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
}, },

10
pages/pallet/record/unBindPalletRecord.vue

@ -242,15 +242,19 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup();
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },

10
pages/productDismantle/record/productDismantleRecord.vue

@ -119,7 +119,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
}, },
@ -214,11 +214,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

52
pages/productPutaway/record/productPutawayRecord.vue

@ -24,7 +24,7 @@
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationTypeList="tolocationTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -43,7 +43,6 @@
</template> </template>
<script> <script>
import { import {
productPutawayRecordSubmit productPutawayRecordSubmit
} from '@/api/request2.js'; } from '@/api/request2.js';
@ -105,7 +104,7 @@
inInventoryStatus: "", // inInventoryStatus: "", //
outInventoryStatus: "", // outInventoryStatus: "", //
businessType: {}, businessType: {},
managementList:[] managementList: []
}; };
}, },
onLoad(option) { onLoad(option) {
@ -133,8 +132,7 @@
onPullDownRefresh() {}, onPullDownRefresh() {},
mounted() { mounted() {},
},
methods: { methods: {
getScanResult(result) { getScanResult(result) {
let balance = result.balance; let balance = result.balance;
@ -214,11 +212,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
@ -253,17 +255,17 @@
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams() var params = this.setParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
productPutawayRecordSubmit(params).then(res => { productPutawayRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
} else { } else {
uni.hideLoading(); uni.hideLoading();
@ -381,14 +383,16 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.clearData();
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
}) })
}, },
clearData(){
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
},
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();

4
pages/productPutaway/request/putawayRequest.vue

@ -36,9 +36,7 @@
updateTitle, updateTitle,
clearTirmAndWrap clearTirmAndWrap
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getProductPutawayRequestList, getProductPutawayRequestList,
productPutawayRequestClose, productPutawayRequestClose,

52
pages/productReceipt/job/productReceiptDetail.vue

@ -14,8 +14,7 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" @remove="updateData" @updateData="updateData" :locationTypeList='tolocationTypeList'>
:locationTypeList='tolocationTypeList'>
</comProductDetailCard> </comProductDetailCard>
</view> </view>
<u-line /> <u-line />
@ -27,8 +26,9 @@
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; "> style="background-color:ghostwhite; width: 100%; ">
<view class=""> <view class="">
<requiredLocation title="收货库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" <requiredLocation title="收货库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> :isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -214,9 +214,9 @@
if (itemDetail == undefined) { if (itemDetail == undefined) {
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中") this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
} else { } else {
if(itemDetail.scaned){ if (itemDetail.scaned) {
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描") this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
}else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty); itemDetail.handleQty = Number(result.label.qty);
itemDetail.toLocationCode = this.toLocationCode; itemDetail.toLocationCode = this.toLocationCode;
@ -268,7 +268,7 @@
checkLocation() { checkLocation() {
var isPass = true; var isPass = true;
if (this.toLocationCode == ""||this.toLocationCode ==null) { if (this.toLocationCode == "" || this.toLocationCode == null) {
this.showMessageHint('请扫描收货库位', callback => { this.showMessageHint('请扫描收货库位', callback => {
this.$refs.comScanLocation.showLocation(); this.$refs.comScanLocation.showLocation();
}) })
@ -286,27 +286,27 @@
}); });
}, },
commit() { commit() {
this.scanCount = getScanCount(this.subList); this.scanCount = getScanCount(this.subList);
if (this.scanCount == 0) { if (this.scanCount == 0) {
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
// //
if (!this.checkLocation()) { if (!this.checkLocation()) {
return return
} }
// //
if(this.scanCount == this.subList.length){ if (this.scanCount == this.subList.length) {
this.submitJob(); this.submitJob();
}else if(this.scanCount <this.subList.length){ } else if (this.scanCount < this.subList.length) {
// //
if(this.jobContent.allowPartialComplete == "TRUE"){ if (this.jobContent.allowPartialComplete == "TRUE") {
// //
this.submitJob(); this.submitJob();
}else { } else {
// //
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
.length + .length +
@ -316,7 +316,7 @@
}, },
submitJob(){ submitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
@ -325,11 +325,11 @@
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
itemCodes.push(item.itemCode) itemCodes.push(item.itemCode)
}) })
getManagementPrecisions(itemCodes,this.toLocationCode, res => { getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams(); var params = this.setParams();
console.log("提交参数",JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
productReceiptJobsubmit(params).then(res => { productReceiptJobsubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
@ -357,27 +357,31 @@
if (detail.scaned) { if (detail.scaned) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch); detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber; detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch; detail.toBatch = info.batch;
detail.toContainerNumber = ''; detail.toContainerNumber = '';
detail.toInventoryStatus =detail.inventoryStatus detail.toInventoryStatus = detail.inventoryStatus
detail.toLocationCode = this.toLocationCode detail.toLocationCode = this.toLocationCode
subList.push(detail) subList.push(detail)
} }
}) })
}) })
this.jobContent.subList = subList this.jobContent.subList = subList
this.jobContent.creator =creator; this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
showMessage(message) { showMessage(message) {

78
pages/productReceipt/record/productReceiptRecord.vue

@ -8,8 +8,8 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-product-record :dataContent="item" :index="index" <com-product-record :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @updateData="updateData" @removePack="removePack">
</com-product-record> </com-product-record>
</view> </view>
<u-line /> <u-line />
@ -94,19 +94,19 @@
fromLocationTypeList: [], fromLocationTypeList: [],
fromLocationCode: "", fromLocationCode: "",
businessType: {}, businessType: {},
dataContent:{}, dataContent: {},
managementList:[], managementList: [],
show:false, show: false,
positionInfo:"请选择位置", positionInfo: "请选择位置",
positionList:[], positionList: [],
productionLineCode:'', productionLineCode: '',
rawLocationCode:"", rawLocationCode: "",
fgLocationCode:"", fgLocationCode: "",
workshopCode :"", workshopCode: "",
workStationCode :"", workStationCode: "",
workShopName :"", workShopName: "",
productionLineName :"", productionLineName: "",
workStationName :"", workStationName: "",
}; };
}, },
onLoad(option) { onLoad(option) {
@ -244,17 +244,17 @@
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams() var params = this.setParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
productionReceiptRecordSubmit(params).then(res => { productionReceiptRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
} else { } else {
uni.hideLoading(); uni.hideLoading();
@ -362,11 +362,15 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
afterCloseMessage() { afterCloseMessage() {
@ -379,14 +383,16 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.subList = []; this.clearData();
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo= "请选择位置";
this.fgLocationCode =""
}) })
},
clearData(){
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo = "请选择位置";
this.fgLocationCode = ""
}, },
removePack() { removePack() {
for (var i = 0; i < this.detailSource.length; i++) { for (var i = 0; i < this.detailSource.length; i++) {
@ -405,7 +411,7 @@
this.calcHandleQty(); this.calcHandleQty();
}, },
showSelect() { showSelect() {
this.show = !this.show this.show = !this.show
}, },
confirmSelect(e) { confirmSelect(e) {

13
pages/productionReceipt/record/productionReceiptRecord.vue

@ -115,7 +115,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message ); this.showErrorMessage(res.message)
} }
}); });
}, },
@ -130,8 +130,7 @@
onPullDownRefresh() {}, onPullDownRefresh() {},
mounted() { mounted() {},
},
methods: { methods: {
getScanResult(result) { getScanResult(result) {
let balance = result.balance; let balance = result.balance;
@ -207,11 +206,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

30
pages/productionReturn/coms/comReturn.vue

@ -8,8 +8,8 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comReturnRecord :dataContent="item" :index="index" <comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @updateData="updateData" @removePack="removePack">
</comReturnRecord> </comReturnRecord>
</view> </view>
<u-line /> <u-line />
@ -140,7 +140,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
getWorkShopLineStation().then(res => { getWorkShopLineStation().then(res => {
@ -415,24 +415,30 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.subList = []; this.clearData();
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo = "请选择位置";
this.fgLocationCode = ""
}) })
}, },
clearData(){
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo = "请选择位置";
this.fgLocationCode = ""
},
confirmSelect(e) { confirmSelect(e) {
this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
console.log("位置", this.positionInfo) console.log("位置", this.positionInfo)

3
pages/productionReturn/coms/comReturnCommonRequest.vue

@ -30,9 +30,6 @@
import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue' import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getProductionReturnRequestList, getProductionReturnRequestList,
productionReturnRequestHandle, productionReturnRequestHandle,

10
pages/productionReturn/job/returnDetail.vue

@ -497,15 +497,17 @@
// }, // },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
showQuestionMessage(message, callback) { showQuestionMessage(message, callback) {
setTimeout(r => { setTimeout(r => {
this.scanPopupLoseFocus(); this.scanPopupLoseFocus();

62
pages/productionReturn/record/returnToHold.vue

@ -4,19 +4,17 @@
<com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="page-header"> <view class="page-header">
<comReturnRecordTitle :workshopCode="workshopCode" <comReturnRecordTitle :workshopCode="workshopCode" :productionLineCode="productionLineCode"
:productionLineCode="productionLineCode" :workStationCode="workStationCode"></comReturnRecordTitle>
:workStationCode ="workStationCode" </view>
></comReturnRecordTitle> <u-line />
</view>
<u-line />
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comReturnRecord :dataContent="item" :index="index" <comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @updateData="updateData" @removePack="removePack">
</comReturnRecord> </comReturnRecord>
</view> </view>
<u-line /> <u-line />
@ -112,8 +110,8 @@
workShopName: "", workShopName: "",
productionLineName: "", productionLineName: "",
workStationName: "", workStationName: "",
businessTypeCode :"ReturnToHold", businessTypeCode: "ReturnToHold",
positionInfo:"", positionInfo: "",
recommendLocationList: [], // recommendLocationList: [], //
}; };
@ -153,11 +151,11 @@
this.$refs.scanPopup.openScanPopup(isEditPosition); this.$refs.scanPopup.openScanPopup(isEditPosition);
}, },
getScanResult(result,param) { getScanResult(result, param) {
this.positionInfo = param.positionInfo; this.positionInfo = param.positionInfo;
this.workshopCode = param.workshopCode; this.workshopCode = param.workshopCode;
this.productionLineCode = param.productionLineCode; this.productionLineCode = param.productionLineCode;
this.workStationCode = param.workStationCode ; this.workStationCode = param.workStationCode;
let label = result.label; let label = result.label;
let pack = result.package; let pack = result.package;
@ -169,11 +167,11 @@
}) })
if (item == undefined) { if (item == undefined) {
var itemp = this.createItemInfo(label, pack); var itemp = this.createItemInfo(label, pack);
let newDetail = this.createDetailInfo(label, pack); let newDetail = this.createDetailInfo(label, pack);
newDetail.toLocationCode = "HOLD"; newDetail.toLocationCode = "HOLD";
itemp.subList.push(newDetail); itemp.subList.push(newDetail);
this.detailSource.push(itemp) this.detailSource.push(itemp)
} else { } else {
var detail = item.subList.find(r => { var detail = item.subList.find(r => {
@ -184,9 +182,9 @@
}) })
if (detail == undefined) { if (detail == undefined) {
let newDetail = this.createDetailInfo(label, pack); let newDetail = this.createDetailInfo(label, pack);
newDetail.toLocationCode ="HOLD"; newDetail.toLocationCode = "HOLD";
item.subList.push(newDetail); item.subList.push(newDetail);
} else { } else {
if (detail.scaned == true) { if (detail.scaned == true) {
@ -405,23 +403,29 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.subList = []; this.clearData();
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo = "请选择位置";
}) })
}, },
clearData(){
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
this.positionInfo = "请选择位置";
}
} }
} }
</script> </script>

11
pages/productionReturn/record/returnToStore.vue

@ -456,12 +456,15 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.subList = []; this.clearData();
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
}) })
}, },
clearData(){
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {};
}
} }
} }
</script> </script>

8
pages/purchaseReceipt/job/receiptDetail.vue

@ -421,11 +421,15 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },

2
pages/purchaseReturn/job/returnDetail.vue

@ -428,7 +428,7 @@
showCommitSuccessMessage(number) { showCommitSuccessMessage(number) {
this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => { this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
navigateBack() navigateBack(1)
}) })
} }
} }

2
pages/purchaseReturn/record/returnRecord.vue

@ -108,7 +108,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
}, },

3
pages/purchaseReturn/request/returnRequest.vue

@ -30,9 +30,6 @@
import requestInfoPopup from '@/pages/purchaseReturn/coms/requestInfoPopup.vue' import requestInfoPopup from '@/pages/purchaseReturn/coms/requestInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import {
getBusinessType,
} from '@/common/record.js';
import { import {
goHome, goHome,
updateTitle, updateTitle,

2
pages/purchaseReturn/request/returnRequestCreate.vue

@ -101,7 +101,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
}, },

8
pages/putaway/record/putawayRecord.vue

@ -260,11 +260,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
// scanLocationCode(location, code) { // scanLocationCode(location, code) {

4
pages/putaway/request/putawayRequest.vue

@ -30,10 +30,6 @@
import requestInfoPopup from '@/pages/putaway/coms/requestInfoPopup.vue' import requestInfoPopup from '@/pages/putaway/coms/requestInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import {
getBusinessType,
} from '@/common/record.js';
import { import {
goHome, goHome,
updateTitle updateTitle

23
pages/query/container.vue

@ -7,7 +7,7 @@
<!-- 需要固定在顶部不滚动的view放在slot="top"的view中如果需要跟着滚动则不要设置slot="top" --> <!-- 需要固定在顶部不滚动的view放在slot="top"的view中如果需要跟着滚动则不要设置slot="top" -->
<template #top> <template #top>
<view v-if="containerNumber!=''"> <view v-if="containerNumber!=''">
<containerInfo :itemDetail="containerInfo" v-if="containerNumber"></containerInfo> <containerInfo :itemDetail="containerInfo" v-if="containerNumber"></containerInfo>
<u-line /> <u-line />
<z-tabs :list="tabList" @change="tabChange" /> <z-tabs :list="tabList" @change="tabChange" />
</view> </view>
@ -95,8 +95,7 @@
goHome(); goHome();
} }
}, },
filters: { filters: {},
},
mounted() { mounted() {
this.openScanPopup() this.openScanPopup()
}, },
@ -139,7 +138,7 @@
}) })
}, },
getSummary(pageNo,pageSize) { getSummary(pageNo, pageSize) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中...", title: "加载中...",
@ -154,7 +153,7 @@
uni.hideLoading(); uni.hideLoading();
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.summarysList = this.setShowList(res.data.list) this.summarysList = this.setShowList(res.data.list)
this.$refs.paging.complete(this.summarysList); this.$refs.paging.complete(this.summarysList);
} else { } else {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
this.showMessage('未查找到器具【' + this.containerNumber + '】'); this.showMessage('未查找到器具【' + this.containerNumber + '】');
@ -167,7 +166,7 @@
}, },
getDetailList(pageNo,pageSize) { getDetailList(pageNo, pageSize) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中...", title: "加载中...",
@ -231,17 +230,15 @@
return resultlist; return resultlist;
}, },
getContentByTab(index,pageNo, pageSize) { getContentByTab(index, pageNo, pageSize) {
if (index === 0) { if (index === 0) {
this.getSummary(pageNo, pageSize); this.getSummary(pageNo, pageSize);
} else if (index === 1) this.getDetailList(pageNo, pageSize) } else if (index === 1) this.getDetailList(pageNo, pageSize)
}, },
upper: function(e) { upper: function(e) {},
}, lower: function(e) {},
lower: function(e) {
},
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;
this.$refs.paging.reload(true); this.$refs.paging.reload(true);
@ -254,7 +251,9 @@
}); });
}, },
afterCloseMessage() { afterCloseMessage() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
queryList(pageNo, pageSize) { queryList(pageNo, pageSize) {
console.log("加载", pageNo) console.log("加载", pageNo)

4
pages/query/item.vue

@ -244,7 +244,9 @@
}); });
}, },
afterCloseMessage() { afterCloseMessage() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;

18
pages/query/item_copy.vue

@ -17,26 +17,26 @@
<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" <scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
@scroll="scroll"> @scroll="scroll">
<!-- 汇总 --> <!-- 汇总 -->
<comItemDetailCard v-if="tabIndex == 0" :itemList="summarys" :isShowPack="false" <comItemDetailCard v-if="tabIndex == 0" :itemList="summarys" :isShowPack="false" style='margin: 10rpx;'>
style='margin: 10rpx;'></comItemDetailCard> </comItemDetailCard>
</scroll-view> </scroll-view>
<!-- 明细 --> <!-- 明细 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" <scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
@scroll="scroll"> @scroll="scroll">
<comItemDetailCard v-if="tabIndex == 1" :itemList="balances" style='margin: 10rpx;'> <comItemDetailCard v-if="tabIndex == 1" :itemList="balances" style='margin: 10rpx;'>
</comItemDetailCard> </comItemDetailCard>
</scroll-view> </scroll-view>
<!-- 预计入 --> <!-- 预计入 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" <scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
@scroll="scroll"> @scroll="scroll">
<comItemDetailCard v-if="tabIndex == 2" :itemList="dataIn" <comItemDetailCard v-if="tabIndex == 2" :itemList="dataIn" :isShowLocation="false"
:isShowLocation="false" :isShowBusiness="true"></comItemDetailCard>
:isShowBusiness="true"></comItemDetailCard>
</scroll-view> </scroll-view>
<!-- 预计出 --> <!-- 预计出 -->
<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" <scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
@scroll="scroll"> @scroll="scroll">
<comItemDetailCard v-if="tabIndex == 3" :itemList="dataOut" :isShowLocation="false" :isShowBusiness="true"> <comItemDetailCard v-if="tabIndex == 3" :itemList="dataOut" :isShowLocation="false"
:isShowBusiness="true">
</comItemDetailCard> </comItemDetailCard>
</scroll-view> </scroll-view>
</view> </view>
@ -303,7 +303,9 @@
}); });
}, },
afterCloseMessage() { afterCloseMessage() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
} }
} }
}; };

13
pages/query/location.vue

@ -35,7 +35,6 @@
</template> </template>
<script> <script>
import { import {
getBalanceByLocationcode, getBalanceByLocationcode,
getBalanceByLocationcodeGroup getBalanceByLocationcodeGroup
@ -113,7 +112,7 @@
// this.getContentByTab(this.tabIndex); // this.getContentByTab(this.tabIndex);
}, },
getSummary(pageNo,pageSize) { getSummary(pageNo, pageSize) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中...", title: "加载中...",
@ -143,7 +142,7 @@
}, },
getDetailList(pageNo,pageSize) { getDetailList(pageNo, pageSize) {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中...", title: "加载中...",
@ -159,7 +158,7 @@
uni.hideLoading(); uni.hideLoading();
if (res.data.list.length > 0) { if (res.data.list.length > 0) {
this.detailList = this.setShowList(res.data.list) this.detailList = this.setShowList(res.data.list)
this.$refs.paging.complete(this.detailList); this.$refs.paging.complete(this.detailList);
} else { } else {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
this.showMessage('未查找到库位w【' + this.locationCode + '】'); this.showMessage('未查找到库位w【' + this.locationCode + '】');
@ -213,7 +212,7 @@
this.getContentByTab(this.tabIndex); this.getContentByTab(this.tabIndex);
}, },
getContentByTab(index,pageNo, pageSize) { getContentByTab(index, pageNo, pageSize) {
if (index === 0) { if (index === 0) {
this.getSummary(pageNo, pageSize); this.getSummary(pageNo, pageSize);
} else if (index === 1) this.getDetailList(pageNo, pageSize) } else if (index === 1) this.getDetailList(pageNo, pageSize)
@ -232,7 +231,9 @@
}); });
}, },
afterCloseMessage() { afterCloseMessage() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;

5
pages/query/location_copy.vue

@ -56,7 +56,6 @@
</template> </template>
<script> <script>
import { import {
getBalanceByLocationcode, getBalanceByLocationcode,
getBalanceByLocationcodeGroup getBalanceByLocationcodeGroup
@ -263,7 +262,9 @@
}); });
}, },
afterCloseMessage() { afterCloseMessage() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
} }
} }
}; };

32
pages/repleinsh/record/repleinshRecord.vue

@ -40,7 +40,6 @@
</template> </template>
<script> <script>
import { import {
repleinshRequestSubmit, repleinshRequestSubmit,
repleinshRecordSubmit repleinshRecordSubmit
@ -119,7 +118,11 @@
}, },
onLoad(option) { onLoad(option) {
this.fromType = option.fromType this.fromType = option.fromType
if(this.fromType=="requestType"){ updateTitle("补料申请") }else { updateTitle("补料记录") } if (this.fromType == "requestType") {
updateTitle("补料申请")
} else {
updateTitle("补料记录")
}
var typeCode = "Repleinment" var typeCode = "Repleinment"
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {
@ -128,7 +131,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message ); this.showErrorMessage(res.message)
} }
}); });
}, },
@ -143,8 +146,7 @@
onPullDownRefresh() {}, onPullDownRefresh() {},
mounted() { mounted() {},
},
methods: { methods: {
getScanResult(result) { getScanResult(result) {
let balance = result.balance; let balance = result.balance;
@ -237,7 +239,9 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
@ -258,7 +262,7 @@
if(this.fromType=="requestType"){ if (this.fromType == "requestType") {
var params = this.setRequestParams(); var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
@ -273,7 +277,7 @@
// uni.hideLoading() // uni.hideLoading()
// this.showErrorMessage(error) // this.showErrorMessage(error)
// }) // })
}else { } else {
// repleinshRecordSubmit(params).then(res => { // repleinshRecordSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
@ -306,13 +310,13 @@
return subList; return subList;
}, },
setRequestParams(){ setRequestParams() {
var subList = [] var subList = []
var supplierCode="" var supplierCode = ""
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
if(supplierCode==""){ if (supplierCode == "") {
supplierCode = detail.package.supplierCode supplierCode = detail.package.supplierCode
} }
subList.push(detail) subList.push(detail)
@ -323,9 +327,9 @@
this.dataContent.subList = subList this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway" this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门"; this.dataContent.departmentCode = "研发部门";
this.dataContent.status= 1 ; this.dataContent.status = 1;
this.dataContent.autoCommit = "FALSE"; this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE"; this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE"; this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE"; this.dataContent.directCreateRecord = "FALSE";

36
pages/scrap/record/scrapRecord.vue

@ -55,7 +55,6 @@
import { import {
goHome, goHome,
updateTitle,
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -232,17 +231,20 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if(this.$refs.scanPopup!=undefined){
this.$refs.scanPopup.getfocus();
}
}, },
commit() { commit() {
if(this.reasonText==""){ if(this.reasonText==""){
this.showMessage("请先选择报废原因") this.showErrorMessage("请先选择报废原因")
return; return;
} }
// //
@ -302,14 +304,6 @@
}, },
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {}
});
},
showErrorMessage(message) { showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, res => {
if (res) { if (res) {
@ -339,15 +333,17 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.reasonCode = "" this.clearData();
this.reasonText = "";
this.detailSource = [];
this.subList =[];
this.managementList =[];
this.dataContent ={}
}) })
}, },
clearData(){
this.reasonCode = ""
this.reasonText = "";
this.detailSource = [];
this.subList =[];
this.managementList =[];
this.dataContent ={}
},
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();

10
pages/scrap/request/scrapRequestCreate.vue

@ -128,7 +128,7 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });
@ -228,11 +228,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },

2
pages/setter/index.vue

@ -56,11 +56,11 @@
onLoad onLoad
} from "@dcloudio/uni-app"; } from "@dcloudio/uni-app";
const userName = ref(store.state.user.name); const userName = ref(store.state.user.name);
let test = ref("123"); let test = ref("123");
let userInfo = ref(null); let userInfo = ref(null);
onLoad(() => { onLoad(() => {
console.log(11)
getUserProfile().then(res => { getUserProfile().then(res => {
userInfo.value = res.data userInfo.value = res.data
// nextTick(()=>{ // nextTick(()=>{

30
pages/transfer/coms/comTransferRecord.vue

@ -107,7 +107,7 @@
businessType: {}, businessType: {},
managementList: [], managementList: [],
dataContent: {}, dataContent: {},
toWarehouseCode:'' toWarehouseCode: ''
}; };
}, },
@ -155,7 +155,7 @@
if (item == undefined) { if (item == undefined) {
var itemp = createItemInfo(balance, pack); var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); // let newDetail = createDetailInfo(balance, pack); //
newDetail.inventoryStatus ="OK" newDetail.inventoryStatus = "OK"
itemp.subList.push(newDetail); itemp.subList.push(newDetail);
this.detailSource.push(itemp) this.detailSource.push(itemp)
} else { } else {
@ -221,11 +221,15 @@
}, },
closeScanPopup() { closeScanPopup() {
this.$refs.scanPopup.closeScanPopup(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup();
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
@ -399,7 +403,7 @@
this.openScanPopup(); this.openScanPopup();
}, },
getToLocationCode(location, code) { getToLocationCode(location, code) {
this.toWarehouseCode =location.warehouseCode this.toWarehouseCode = location.warehouseCode
// if (this.fromLocationCode == code) { // if (this.fromLocationCode == code) {
// uni.showToast({ // uni.showToast({
// title: "[" + this.fromLocationCode + "][" + code + "]", // title: "[" + this.fromLocationCode + "][" + code + "]",
@ -412,15 +416,17 @@
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.clearData();
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
}) })
}, },
clearData(){
this.fromLocationCode = '';
this.subList = [];
this.detailSource = [];
this.toLocationCode = '';
this.dataContent = {}
this.toWarehouseCode = ""
},
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();

30
pages/unPlanned/job/receiptJobDetail.vue

@ -243,16 +243,16 @@
} }
}, },
commit() { commit() {
this.scanCount = getScanCount(this.subList); this.scanCount = getScanCount(this.subList);
if( this.scanCount==0){ if (this.scanCount == 0) {
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
// //
if (!this.checkLocation()) { if (!this.checkLocation()) {
return return
} }
// //
if (this.scanCount == this.subList.length) { if (this.scanCount == this.subList.length) {
this.submitJob(); this.submitJob();
@ -295,7 +295,7 @@
}, },
submitJob() { submitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
@ -385,11 +385,15 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
this.$refs.scanPopup.getfocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus();
}
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
this.$refs.scanPopup.losefocus(); if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.losefocus();
}
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {

17
pages/unPlanned/record/issueRecord.vue

@ -54,10 +54,6 @@
unPlannedIssueRecordSubmit unPlannedIssueRecordSubmit
} from '@/api/request2.js'; } from '@/api/request2.js';
import {
getBalanceByUniquecode,
} from '@/api/request.js';
import { import {
getBusinessType, getBusinessType,
} from '@/common/record.js'; } from '@/common/record.js';
@ -278,13 +274,16 @@
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.reasonCode = ""
this.reasonText = "";
this.detailSource = [];
this.managementList =[];
this.dataContent ={}
}) })
}, },
clearData(){
this.reasonCode = ""
this.reasonText = "";
this.detailSource = [];
this.managementList =[];
this.dataContent ={}
}
} }
} }

15
pages/unPlanned/record/receiptRecord.vue

@ -351,14 +351,17 @@
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.reasonCode = "" this.clearData();
this.reasonText = "";
this.detailSource = [];
this.managementList=[];
this.dataContent ={}
this.toLocationCode =""
}) })
}, },
clearData(){
this.reasonCode = ""
this.reasonText = "";
this.detailSource = [];
this.managementList=[];
this.dataContent ={}
this.toLocationCode =""
}
} }

4
pages/unPlanned/request/issueRequest.vue

@ -36,9 +36,7 @@
updateTitle, updateTitle,
clearTirmAndWrap clearTirmAndWrap
} from '@/common/basic.js'; } from '@/common/basic.js';
import {
getBusinessType,
} from '@/common/record.js';
import { import {
getUnPlannedIssueRequestList, getUnPlannedIssueRequestList,
unPlannedIssueRequestApprove, unPlannedIssueRequestApprove,

6
pages/unPlanned/request/issueRequestCreate.vue

@ -60,10 +60,6 @@
unPlannedIssueRequestCreate, unPlannedIssueRequestCreate,
} from '@/api/request2.js'; } from '@/api/request2.js';
import {
getBalanceByUniquecode,
} from '@/api/request.js';
import { import {
getBusinessType, getBusinessType,
} from '@/common/record.js'; } from '@/common/record.js';
@ -128,7 +124,7 @@
this.fromLocationTypeArray = res.fromlocationTypeList; this.fromLocationTypeArray = res.fromlocationTypeList;
this.showFromLocationPopup(); this.showFromLocationPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message); this.showErrorMessage(res.message)
} }
}); });

3
pages/unPlanned/request/receiptRequest.vue

@ -30,9 +30,6 @@
import requestRecInfoPopup from '@/pages/unPlanned/coms/requestRecInfoPopup.vue' import requestRecInfoPopup from '@/pages/unPlanned/coms/requestRecInfoPopup.vue'
import requestButton from '@/mycomponents/button/requestButton.vue' import requestButton from '@/mycomponents/button/requestButton.vue'
import {
getBusinessType,
} from '@/common/record.js';
import { import {
goHome, goHome,
updateTitle, updateTitle,

Loading…
Cancel
Save