Browse Source

整理样式

hella_online_20240829
niexiting 4 months ago
parent
commit
aabb5b1df3
  1. 4
      src/mycomponents/scan/winComScanBalanceLocation.vue
  2. 4
      src/mycomponents/scan/winScanItem.vue
  3. 74
      src/pages/count/job/countBlindDetail.vue
  4. 44
      src/pages/count/job/countDetail.vue
  5. 417
      src/pages/count/job/fuzzyCountDetail.vue
  6. 57
      src/pages/customerReturn/job/returnDetail.vue
  7. 53
      src/pages/deliver/job/deliverDetail.vue
  8. 62
      src/pages/inspect/request/inspectRequestDetail.vue
  9. 34
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  10. 1
      src/pages/issue/coms/comIssueRequestPopup.vue
  11. 61
      src/pages/package/job/overPackageJobDetail.vue
  12. 116
      src/pages/productPutaway/job/productPutawayDetail.vue
  13. 64
      src/pages/productReceipt/job/ccProductReceiptDetail.vue
  14. 123
      src/pages/productReceipt/job/productReceiptDetail.vue
  15. 12
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  16. 41
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  17. 13
      src/pages/productionReceipt/coms/comProductionJobCard.vue
  18. 23
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  19. 1
      src/pages/productionReturn/coms/comReturnRequestPopup.vue
  20. 18
      src/pages/productionReturn/job/returnDetail.vue
  21. 26
      src/pages/repleinsh/job/repleinshDetail.vue
  22. 40
      src/pages/stockUp/job/stockUpJobDetail.vue
  23. 23
      src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
  24. 97
      src/pages/transfer/job/issueDetail.vue
  25. 35
      src/pages/transfer/job/receiptDetail.vue
  26. 18
      src/pages/transfer/job/transferDetail.vue
  27. 3
      src/pages/unPlanned/coms/comReceiptRequestPopup.vue
  28. 18
      src/pages/unPlanned/job/issueJobDetail.vue
  29. 39
      src/pages/unPlanned/job/receiptJobDetail.vue
  30. 23
      src/pages/unPlanned/request/issueRequestDetail.vue
  31. 15
      src/pages/unPlanned/request/receiptRequestDetail.vue

4
src/mycomponents/scan/winComScanBalanceLocation.vue

@ -238,9 +238,9 @@
getBasicItemByCode(itemCode).then(res => { getBasicItemByCode(itemCode).then(res => {
if (res.data != null && res.data.list.length > 0) { if (res.data != null && res.data.list.length > 0) {
var result = res.data.list[0]; var result = res.data.list[0];
var status = result.status; var status = result.available;
var type = result.type; var type = result.type;
if (status == "ENABLE") { if (status == "TRUE") {
if (checkDirectoryItemExist(this.itemTypesList, type)) { if (checkDirectoryItemExist(this.itemTypesList, type)) {
callBack() callBack()
} else { } else {

4
src/mycomponents/scan/winScanItem.vue

@ -110,14 +110,14 @@
uni.hideLoading(); uni.hideLoading();
if (res.data != null && res.data.list.length > 0) { if (res.data != null && res.data.list.length > 0) {
var result =res.data.list[0]; var result =res.data.list[0];
var status =result.status; var status =result.available;
var type = result.type; var type = result.type;
var itemCode = result.code var itemCode = result.code
var itemName =result.name var itemName =result.name
var uom = result.uom var uom = result.uom
var std = result.uom var std = result.uom
result.package = scanResult.package result.package = scanResult.package
if(status=="ENABLE"){ if(status=="TRUE"){
if(checkDirectoryItemExist(this.itemCodeTypeList,type)){ if(checkDirectoryItemExist(this.itemCodeTypeList,type)){
this.result =result; this.result =result;
this.callBack() this.callBack()

74
src/pages/count/job/countBlindDetail.vue

@ -1,26 +1,28 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="header"> <view class="page-header">
<view class=""> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;"> </view>
<view class="cell_box uni-flex uni-row" style=" font-weight: bold;"> <view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
<view class="cell_info" style="color: #000"> <view class="cell_box uni-flex uni-row" style=" font-weight: bold;">
<view class="text_lightblue" style="color: #000">阶段</view> <view class="cell_info" style="color: #000">
<view style="color: #000">{{getCountStageName(jobContent.stage)}}</view> <view class="text_lightblue" style="color: #000">阶段</view>
</view> <view style="color: #000">{{getCountStageName(jobContent.stage)}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue" style="color: #000">策略</view> <view class="cell_info">
<view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view> <view class="text_lightblue" style="color: #000">策略</view>
</view> <view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
<view class="cell_info"> </view>
<view class="text_lightblue" style="color: #000">库位</view> <view class="cell_info">
<view style="color: #000">{{fromLocationCode}}</view> <view class="text_lightblue" style="color: #000">库位</view>
</view> <view style="color: #000">{{fromLocationCode}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue" style="color: #000">已扫描</view> <view class="cell_info">
<view style="color: #000">{{scanCount}}</view> <view class="text_lightblue" style="color: #000">已扫描</view>
<view style="color: #000">{{scanCount}}</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -40,8 +42,7 @@
</view> </view>
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" <comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
@editItem="editItem" :settingParam="jobContent" @remove="updateData" @editItem="editItem" :settingParam="jobContent" @remove="updateData"
:isShowRecommendQty ="false" :isShowRecommendQty="false" @updateData="updateData">
@updateData="updateData">
</comCountDetailcards> </comCountDetailcards>
</view> </view>
<view class='split_line'></view> <view class='split_line'></view>
@ -67,9 +68,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location <win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
:allowModifyLocation="false" :queryBalance="true" @getResult='getScanResult'>
ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true" @getResult='getScanResult'>
</win-scan-pack-and-location> </win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'"> :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
@ -158,7 +158,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -253,7 +253,7 @@
item.recommendQty = item.qty item.recommendQty = item.qty
item.handleQty = 0 item.handleQty = 0
item.countTime = new Date() item.countTime = new Date()
item.fromLocationCode =that.fromLocationCode; item.fromLocationCode = that.fromLocationCode;
}) })
that.allDetails = res.data.subList; that.allDetails = res.data.subList;
that.allCount = res.data.subList.length; that.allCount = res.data.subList.length;
@ -343,7 +343,7 @@
var batch = result.label.batch var batch = result.label.batch
var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK" var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
var qty = result.balance ? result.balance.qty : 0; var qty = result.balance ? result.balance.qty : 0;
// //
let items = this.allDetails.filter(r => let items = this.allDetails.filter(r =>
r.itemCode === itemCode && r.itemCode === itemCode &&
@ -357,7 +357,7 @@
res => { res => {
// //
if (res) { if (res) {
var detail = this.createAddDetailInfo(pack,qty) var detail = this.createAddDetailInfo(pack, qty)
detail.countTime = new Date(); detail.countTime = new Date();
this.allDetails.push(detail) this.allDetails.push(detail)
this.updateList(); this.updateList();
@ -382,15 +382,15 @@
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}) })
} else { } else {
// //
selectItem.scaned = true; selectItem.scaned = true;
selectItem.balanceQty= Number(qty) selectItem.balanceQty = Number(qty)
selectItem.handleQty = Number(qty) selectItem.handleQty = Number(qty)
selectItem.packQty = pack.packQty selectItem.packQty = pack.packQty
selectItem.packUnit = pack.packUnit selectItem.packUnit = pack.packUnit
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
null); null);
selectItem.countTime = new Date(); selectItem.countTime = new Date();
@ -436,7 +436,7 @@
// //
createAddDetailInfo(pack,qty) { createAddDetailInfo(pack, qty) {
var detail = { var detail = {
masterId: this.jobContent.id, // masterId: this.jobContent.id, //
scaned: true, scaned: true,
@ -453,7 +453,7 @@
packQty: pack.packQty, packQty: pack.packQty,
packUnit: pack.packUnit, packUnit: pack.packUnit,
projectCode: "", projectCode: "",
recommendQty:Number(qty), recommendQty: Number(qty),
qty: Number(qty), qty: Number(qty),
handleQty: Number(qty), handleQty: Number(qty),
uom: pack.uom, uom: pack.uom,
@ -462,7 +462,7 @@
countQty: 0, countQty: 0,
balanceQty: 0, balanceQty: 0,
fromLocationCode: this.fromLocationCode, fromLocationCode: this.fromLocationCode,
locationCode:this.fromLocationCode, locationCode: this.fromLocationCode,
creator: this.$store.state.user.id, creator: this.$store.state.user.id,
countTime: new Date() countTime: new Date()
} }
@ -617,7 +617,7 @@
/* #ifdef H5 */ /* #ifdef H5 */
top: 88rpx; top: 88rpx;
/* #endif */ /* #endif */
left: 0; left: 0;
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;

44
src/pages/count/job/countDetail.vue

@ -1,22 +1,24 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;"> </view>
<view class="cell_box uni-flex uni-row"> <view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
<view class="cell_info"> <view class="cell_box uni-flex uni-row">
<view class="text_lightblue">阶段</view> <view class="cell_info">
<view>{{getCountStageName(jobContent.stage)}}</view> <view class="text_lightblue">阶段</view>
</view> <view>{{getCountStageName(jobContent.stage)}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue">策略</view> <view class="cell_info">
<view>{{ isOpenCount(jobContent.isOpenCount) }}</view> <view class="text_lightblue">策略</view>
</view> <view>{{ isOpenCount(jobContent.isOpenCount) }}</view>
<view class="cell_info"> </view>
<view class="text_lightblue">库位</view> <view class="cell_info">
<view>{{fromLocationCode}}</view> <view class="text_lightblue">库位</view>
<view>{{fromLocationCode}}</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -48,15 +50,11 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location <win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :isCount="true"
ref="scanPopup" :noShowBalanceMessage="true" @getCountScanResult='getScanResult'>
:isCount="true"
@getCountScanResult='getScanResult'>
</win-scan-pack-and-location> </win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
:isShowBalance="jobContent.isOpenCount=='TRUE'">
</count-qty-edit> </count-qty-edit>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select> <balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>

417
src/pages/count/job/fuzzyCountDetail.vue

@ -2,22 +2,24 @@
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <view class="header-view">
<uni-collapse ref="collapse"> <job-top :dataContent="jobContent"></job-top>
<uni-collapse-item :open="true"> <uni-collapse ref="collapse">
<template v-slot:title> <uni-collapse-item :open="true">
<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;"> <template v-slot:title>
盘点范围 <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
盘点范围
</view>
</template>
<view v-for="(range, index) in jobContent.countRange" :key="index">
<view class="card_view">
<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
<text class="card_content ">{{range.value}}</text>
</view>
</view> </view>
</template> </uni-collapse-item>
<view v-for="(range, index) in jobContent.countRange" :key="index"> </uni-collapse>
<view class="card_view"> </view>
<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
<text class="card_content ">{{range.value}}</text>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view> </view>
<view class="card_view" v-if="fromLocationCode!=''"> <view class="card_view" v-if="fromLocationCode!=''">
<text class="card_location">盘点库位</text> <text class="card_location">盘点库位</text>
@ -326,221 +328,220 @@
if (this.itemRangeValue != '') { if (this.itemRangeValue != '') {
let index = this.itemRangeValue.indexOf(packInfo.itemCode) let index = this.itemRangeValue.indexOf(packInfo.itemCode)
if (index < 0) { if (index < 0) {
this.showErrorMessage("物料代码【"+ packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内") this.showErrorMessage("物料代码【" + packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
return; return;
}
else {
this.onScan(packInfo);
}
} else { } else {
this.onScan(packInfo); this.onScan(packInfo);
} }
}, } else {
this.onScan(packInfo);
onScan(packInfo) { }
let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber == },
packInfo
.number && r.batch == packInfo.batch && r.inventoryStatus == "OK"); onScan(packInfo) {
if (detail == undefined) { let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
detail = this.createDetailInfo(packInfo); packInfo
this.detailSource.unshift(detail) .number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
this.scanPopupGetFocus(); if (detail == undefined) {
} else { detail = this.createDetailInfo(packInfo);
let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r this.detailSource.unshift(detail)
.packingNumber == this.scanPopupGetFocus();
packInfo } else {
.number && r.batch == packInfo.batch && r.inventoryStatus == "OK"); let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r
if (index >= 0) { .packingNumber ==
this.detailSource.unshift(this.detailSource.splice(index, 1)[0]); // packInfo
// .number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => { if (index >= 0) {
if (res) { this.detailSource.unshift(this.detailSource.splice(index, 1)[0]); //
this.closeScanPopup(); //
this.edit(detail); this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
} else {
this.scanPopupGetFocus();
}
});
}
}
},
//
createDetailInfo(packInfo) {
var detail = {
scaned: true,
// countDetailNumber: "",
number: this.jobContent.number,
packingNumber: packInfo.number,
batch: packInfo.batch,
inventoryStatus: "OK",
itemCode: packInfo.itemCode,
itemName: packInfo.itemName,
itemDesc1: packInfo.itemDesc1,
itemDesc2: packInfo.itemDesc2,
projectCode: "",
qty: packInfo.qty,
packUnit: packInfo.packUnit,
packQty: packInfo.packQty,
packUom: packInfo.packUom,
uom: packInfo.uom,
remark: "",
locationCode: this.fromLocationCode,
creator: this.$store.state.user.id,
warehouseCode: this.fromLocation.warehouseCode,
areaCode: this.fromLocation.areaCode,
locationGroupCode: this.fromLocation.locationGroupCode,
createTime: new Date().getTime(),
countTime: new Date().getTime(),
countUser: this.$store.state.user.id,
countDescription: '',
countQty: packInfo.qty
}
return detail;
},
editClose() {
this.$refs.countQtyEdit.closeEditPopup();
},
swipeClick(e, item, index) {
if (e.content.text == "编辑") {
this.edit(item)
} else if (e.content.text == "移除") {
this.remove(item)
}
},
//
edit(item) {
let that = this;
this.currentEditItem = item;
item.handleQty = item.qty;
this.$refs.countQtyEdit.openEditPopup(item, null);
},
editConfirm(qty, inventoryStatus, mode) {
let that = this;
this.currentEditItem.countQty = qty;
this.currentEditItem.qty = qty;
this.currentEditItem.inventoryStatus = inventoryStatus;
this.openScanPopup();
},
editClose() {
this.scanPopupGetFocus();
},
remove(item, index) {
this.showQuestionMessage("是否要移除扫描信息?", res => {
if (res) { if (res) {
this.detailSource.splice(index, 1) this.closeScanPopup();
this.edit(detail);
} else {
this.scanPopupGetFocus();
} }
}); });
}, }
}
},
//
createDetailInfo(packInfo) {
var detail = {
scaned: true,
// countDetailNumber: "",
number: this.jobContent.number,
packingNumber: packInfo.number,
batch: packInfo.batch,
inventoryStatus: "OK",
itemCode: packInfo.itemCode,
itemName: packInfo.itemName,
itemDesc1: packInfo.itemDesc1,
itemDesc2: packInfo.itemDesc2,
projectCode: "",
qty: packInfo.qty,
packUnit: packInfo.packUnit,
packQty: packInfo.packQty,
packUom: packInfo.packUom,
uom: packInfo.uom,
remark: "",
locationCode: this.fromLocationCode,
creator: this.$store.state.user.id,
warehouseCode: this.fromLocation.warehouseCode,
areaCode: this.fromLocation.areaCode,
locationGroupCode: this.fromLocation.locationGroupCode,
createTime: new Date().getTime(),
countTime: new Date().getTime(),
countUser: this.$store.state.user.id,
countDescription: '',
countQty: packInfo.qty
}
return detail;
},
editClose() {
this.$refs.countQtyEdit.closeEditPopup();
},
detail(item) { swipeClick(e, item, index) {
this.showItem = item; if (e.content.text == "编辑") {
this.$refs.detailInfoPopup.openPopup(item); this.edit(item)
}, } else if (e.content.text == "移除") {
this.remove(item)
}
},
commit() { //
if (this.detailSource.length == 0) { edit(item) {
this.$refs.comMessage.showMessage('还未扫描,是否要继续提交', res => { let that = this;
if (res) { this.currentEditItem = item;
this.commitJob(); item.handleQty = item.qty;
} this.$refs.countQtyEdit.openEditPopup(item, null);
}); },
} else {
editConfirm(qty, inventoryStatus, mode) {
let that = this;
this.currentEditItem.countQty = qty;
this.currentEditItem.qty = qty;
this.currentEditItem.inventoryStatus = inventoryStatus;
this.openScanPopup();
},
editClose() {
this.scanPopupGetFocus();
},
remove(item, index) {
this.showQuestionMessage("是否要移除扫描信息?", res => {
if (res) {
this.detailSource.splice(index, 1)
}
});
},
detail(item) {
this.showItem = item;
this.$refs.detailInfoPopup.openPopup(item);
},
commit() {
if (this.detailSource.length == 0) {
this.$refs.comMessage.showMessage('还未扫描,是否要继续提交', res => {
if (res) {
this.commitJob(); this.commitJob();
} }
}, });
} else {
this.commitJob();
}
},
commitJob() { commitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
}); });
var params = this.setParams() var params = this.setParams()
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
countJobSubmit(params).then(res => { countJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data == null) { if (res.data == null) {
this.showCommitSuccessMessage("提交成功") this.showCommitSuccessMessage("提交成功")
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
}, },
setParams() { setParams() {
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.jobContent.subList = this.detailSource this.jobContent.subList = this.detailSource
// this.jobContent.creator = creator; // this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {
this.afterCloseMessage() this.afterCloseMessage()
} }
}); });
}, },
showErrorMessage(message) { showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, res => {
if (res) { if (res) {
this.afterCloseMessage() this.afterCloseMessage()
} }
}); });
}, },
showScanMessage(message) { showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message); this.$refs.comMessage.showScanMessage(message);
}, },
afterCloseMessage() { afterCloseMessage() {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}, },
closeScanMessage() { closeScanMessage() {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = ''; this.fromLocationCode = '';
this.fromLocation = {}; this.fromLocation = {};
this.detailSource = []; this.detailSource = [];
this.showFromLocationPopup(); this.showFromLocationPopup();
}) })
}, },
getCountStageName(value) { getCountStageName(value) {
return getCountStageName(value) return getCountStageName(value)
}, },
isOpenCount(value) { isOpenCount(value) {
return value == "TRUE" ? "明盘" : "盲盘" return value == "TRUE" ? "明盘" : "盲盘"
}, },
getCountScopeName(value) { getCountScopeName(value) {
let item = getCountScopeType(value); let item = getCountScopeType(value);
return item.label; return item.label;
}, },
showQuestionMessage(message, callback) { showQuestionMessage(message, callback) {
this.$refs.comMessage.showQuestionMessage(message, res => { this.$refs.comMessage.showQuestionMessage(message, res => {
callback(res); callback(res);
}); });
}, },
}
} }
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

57
src/pages/customerReturn/job/returnDetail.vue

@ -1,5 +1,17 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
<view>客户代码:{{jobContent.customerCode}}</view>
</view>
</view>
</view>
<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">
@ -9,7 +21,6 @@
:locationAreaTypeList="toLocationAreaTypeList"> :locationAreaTypeList="toLocationAreaTypeList">
</com-detail-card> </com-detail-card>
</view> </view>
<view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -18,9 +29,10 @@
<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="">
<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
@getLocation='scanLocationCode' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> @getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
</locationCompare>
</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>
@ -67,9 +79,11 @@
import locationCompare from '@/mycomponents/location/locationCompare.vue' import locationCompare from '@/mycomponents/location/locationCompare.vue'
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
components: { components: {
jobTop,
winScanButton, winScanButton,
winScanPackAndLocation, winScanPackAndLocation,
locationCompare, locationCompare,
@ -87,13 +101,13 @@
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
toLocationAreaTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"" jobToLocationCode: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -117,7 +131,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeCustomerReturnJob(this.id).then(res => { cancleTakeCustomerReturnJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -167,11 +181,11 @@
that.jobContent = res.data; that.jobContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){ if (that.jobContent.allowModifyLocation == 'FALSE') {
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
} }
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
@ -261,10 +275,10 @@
} else { } else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续退货?', res => { ']不一致,是否继续退货?', res => {
if (res) { if (res) {
@ -272,7 +286,7 @@
itemDetail.handleQty = Number(result.balance.qty) itemDetail.handleQty = Number(result.balance.qty)
itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.inventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
@ -280,19 +294,20 @@
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
}else { } else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => { ']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}); });
} }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
@ -456,13 +471,13 @@
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
if(this.$refs.scanPopup!=undefined){ if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packGetFocus(); this.$refs.scanPopup.packGetFocus();
} }
}, },
scanPopupLoseFocus() { scanPopupLoseFocus() {
if(this.$refs.scanPopup!=undefined){ if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packLoseFocus(); this.$refs.scanPopup.packLoseFocus();
} }
}, },
@ -524,4 +539,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

53
src/pages/deliver/job/deliverDetail.vue

@ -1,31 +1,28 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<!-- <view class="header_item"> </view>
申请单号{{jobContent.requestNumber}} <view class="cen_card" style="padding: 5rpx;">
</view> <view class="cell_box uni-flex uni-row">
--> <view class="cell_info">
<view class="cen_card" style="padding: 5rpx;"> <view class="text_lightblue">发货类型</view>
<view class="cell_box uni-flex uni-row"> <view>{{jobContent.deliverType}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue">发货类型</view>
<view>{{jobContent.deliverType}}</view> <view class="cell_info">
</view> <view class="text_lightblue">客户代码</view>
<view>{{jobContent.customerCode}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue">客户代码</view>
<view>{{jobContent.customerCode}}</view> <view class="cell_info">
</view> <view class="text_lightblue">目标库位</view>
<view>{{toLocationCode}}</view>
<view class="cell_info"> </view>
<view class="text_lightblue">目标库位</view>
<view>{{toLocationCode}}</view>
</view> </view>
</view> </view>
<view class='split_line'></view>
</view> </view>
</view> </view>
@ -59,7 +56,7 @@
cancleTakeDeliverJob, cancleTakeDeliverJob,
deliverJobSubmit deliverJobSubmit
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
calc calc
@ -117,7 +114,7 @@
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -249,7 +246,7 @@
var params = this.setParams() var params = this.setParams()
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
if(params.subList.length==0){ if (params.subList.length == 0) {
uni.hideLoading() uni.hideLoading()
this.$refs.comMessage.showConfirmMessageModal('请扫描箱码') this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
return return
@ -305,7 +302,7 @@
.packingNumber; .packingNumber;
record.toBatch = info.batch; record.toBatch = info.batch;
} }
record.fromPackingNumber =r.packingNumber record.fromPackingNumber = r.packingNumber
subItem.recordList.push(record); subItem.recordList.push(record);
}) })
subList.push(subItem); subList.push(subItem);
@ -473,4 +470,4 @@
// border-bottom-width: 1px; // border-bottom-width: 1px;
// border-bottom-color: #ebeef5; // border-bottom-color: #ebeef5;
// } // }
</style> </style>

62
src/pages/inspect/request/inspectRequestDetail.vue

@ -1,22 +1,22 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_item" >
单据号 : {{requestContent.number}}
</view>
<view class="header_item" >
<text>供应商代码 : {{requestContent.supplierCode}} </text>
</view>
</view>
</view>
<view class='split_line'></view>
<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="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
<view class="" style="font-size: 35rpx;">
单据号 : {{requestContent.number}}
</view>
<view class="" style="font-size: 35rpx;">
<text>供应商代码 : {{requestContent.supplierCode}} </text>
</view>
</view>
<view class='split_line'></view>
<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="">
<comRequestDetailCard :dataContent="item" <comRequestDetailCard :dataContent="item" :isShowBatch="false" @openDetail="openDetail">
:isShowBatch ="false"
@openDetail="openDetail">
</comRequestDetailCard> </comRequestDetailCard>
</view> </view>
</view> </view>
@ -29,7 +29,6 @@
</template> </template>
<script> <script>
import { import {
getInspectRequestDetail, getInspectRequestDetail,
} from '@/api/request2.js'; } from '@/api/request2.js';
@ -62,11 +61,11 @@
onLoad(option) { onLoad(option) {
this.id = option.id; this.id = option.id;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.getDetail(); this.getDetail();
}, },
// //
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
@ -94,29 +93,28 @@
if (res.data == null) { if (res.data == null) {
that.showMessage('未获取到详情'); that.showMessage('未获取到详情');
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.requestContent = res.data; that.requestContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
// that.subList = res.data[0]; // that.subList = res.data[0];
// that.subList.forEach(res=>{ // that.subList.forEach(res=>{
// res.packingNumber =res.toPackingNumber // res.packingNumber =res.toPackingNumber
// res.batch =res.fromBatch // res.batch =res.fromBatch
// }) // })
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }
} }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showMessage(error) this.showMessage(error)
}) })
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {}
}
}); });
}, },
@ -131,4 +129,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

34
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -96,8 +94,8 @@
businessTypeCode: '', businessTypeCode: '',
toLocationCode: '', toLocationCode: '',
toInventoryStatus: '', toInventoryStatus: '',
jobStatus:"", jobStatus: "",
title:'' title: ''
}; };
}, },
props: { props: {
@ -105,7 +103,7 @@
}, },
onLoad(option) { onLoad(option) {
this.title = option.title this.title = option.title
this.id = option.id; this.id = option.id;
this.businessTypeCode = option.businessTypeCode; this.businessTypeCode = option.businessTypeCode;
if (this.id != undefined) { if (this.id != undefined) {
@ -130,7 +128,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeInventoryMoveJob(this.id).then(res => { cancleTakeInventoryMoveJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -175,8 +173,7 @@
name = "不合格转隔离"; name = "不合格转隔离";
this.toLocationCode = 'HOLD'; this.toLocationCode = 'HOLD';
this.toInventoryStatus = 'HOLD'; this.toInventoryStatus = 'HOLD';
} } else if (this.businessTypeCode == "OktoScrap") {
else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废"; name = "合格转报废";
this.toLocationCode = 'SCRAP'; this.toLocationCode = 'SCRAP';
this.toInventoryStatus = 'SCRAP'; this.toInventoryStatus = 'SCRAP';
@ -454,13 +451,10 @@
detail.toBatch = info.batch; detail.toBatch = info.batch;
detail.toContainerNumber = ''; detail.toContainerNumber = '';
// detail.toLocationCode = this.toLocationCode; // detail.toLocationCode = this.toLocationCode;
if(this.businessTypeCode == "Move") if (this.businessTypeCode == "Move") {
{ detail.toInventoryStatus = detail.inventoryStatus;
detail.toInventoryStatus=detail.inventoryStatus; } else {
} detail.toInventoryStatus = this.toInventoryStatus;
else
{
detail.toInventoryStatus=this.toInventoryStatus;
} }
subList.push(detail) subList.push(detail)
} }
@ -564,4 +558,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

1
src/pages/issue/coms/comIssueRequestPopup.vue

@ -99,7 +99,6 @@
<script> <script>
import { import {
getBasicItemByCode,
getProductionlineItem, getProductionlineItem,
getWorkShopLineStation, getWorkShopLineStation,
getWarehouseCodeList getWarehouseCodeList

61
src/pages/package/job/overPackageJobDetail.vue

@ -1,44 +1,51 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<div style="background: white;">
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</div>
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<!-- <view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}} <view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
</view> --> <view class="cell_box uni-flex uni-row">
</view> <view class="cell_info">
<view class="page-main"> <view class="text_lightblue">翻包前包装规格</view>
<scroll-view scroll-y="true" class="page-main-scroll"> <view>
<view v-for="(toLocation, index) in detailSource" :key="index"> {{getPackUnitName(subList[0].fromPackUnit)}}/{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})
<view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">翻包前包装规格</view>
<view>
{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].fromPackUnit)}}
</view>
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">翻包后包装规格</view> <view class="cell_info">
<view> <view class="text_lightblue">翻包后包装规格</view>
{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}} <view>
</view> {{getPackUnitName(subList[0].toPackUnit)}}/{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})
</view> </view>
</view> </view>
<view class="split_line"></view>
</view> </view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource" :key="index">
<comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation" <comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation"
@updateData='updateData'> @updateData='updateData'>
</comOverPackJobDetailCard> </comOverPackJobDetailCard>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<div style="background: white;">
<uni-collapse>
<uni-collapse-item>
<template v-slot:title>
<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
打印设置
</view>
</template>
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</uni-collapse-item>
</uni-collapse>
</div>
<view class="page-footer"> <view class="page-footer">
<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%; ">

116
src/pages/productPutaway/job/productPutawayDetail.vue

@ -1,20 +1,21 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> -->
</view> </view>
<view class='split_line'></view>
</view> </view>
<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="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false" <com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" @openDetail="openDetail" :isShowStatus="false" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationAreaTypeList='toLocationAreaTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card> </com-detail-card>
</view> </view>
@ -36,7 +37,8 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup"
@getResult='getScanResult'></win-scan-pack-and-location>
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
@ -114,15 +116,15 @@
isCheckLocation: false, isCheckLocation: false,
switchCode: "", switchCode: "",
scanMessage: '', scanMessage: '',
hintTitle:"", hintTitle: "",
status:'' status: ''
}; };
}, },
onLoad(option) { onLoad(option) {
this.id = option.id; this.id = option.id;
this.type = option.type; this.type = option.type;
this.scanMessage = option.scanMessage ; this.scanMessage = option.scanMessage;
this.status = option.status || '' this.status = option.status || ''
if (this.type == 'predict') { if (this.type == 'predict') {
this.switchCode = "SemiPutawayLocationCodeValidate" this.switchCode = "SemiPutawayLocationCodeValidate"
@ -132,25 +134,25 @@
this.switchCode = "FgPutawayLocationCodeValidate" this.switchCode = "FgPutawayLocationCodeValidate"
// this.hintTitle="" // this.hintTitle=""
// updateTitle(""); // updateTitle("");
} }
this.hintTitle=option.title this.hintTitle = option.title
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
}, },
onShow(){ onShow() {
if (this.id != undefined) { if (this.id != undefined) {
// //
if (this.status == "1") { if (this.status == "1") {
this.receive((callback => { this.receive((callback => {
this.getDetail(); this.getDetail();
})); }));
} else { } else {
this.getDetail(); this.getDetail();
} }
} }
}, },
// //
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -212,17 +214,17 @@
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.isCheckLocation = getSwitchInfoByCode(that.switchCode) that.isCheckLocation = getSwitchInfoByCode(that.switchCode)
if (that.isCheckLocation) { if (that.isCheckLocation) {
that.toLocationCode = "" that.toLocationCode = ""
} else { } else {
that.toLocationCode = that.jobToLocationCode; that.toLocationCode = that.jobToLocationCode;
} }
if(this.scanMessage){ if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage) this.openScanPopupSimulate(this.scanMessage)
} }
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }
@ -255,7 +257,7 @@
openDetail(item) { openDetail(item) {
this.$refs.detailInfoPopup.openPopup(item) this.$refs.detailInfoPopup.openPopup(item)
}, },
openScanPopupSimulate(scanMessage) { openScanPopupSimulate(scanMessage) {
let fromlocationCode = ''; let fromlocationCode = '';
let fromlocationList = []; let fromlocationList = [];
@ -273,7 +275,8 @@
} }
}) })
} }
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,scanMessage); this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
scanMessage);
}, },
openScanPopup() { openScanPopup() {
@ -302,8 +305,8 @@
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup();
}, },
getScanResult(result) { getScanResult(result) {
try { try {
var packingNumber = result.balance.packingNumber; var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch; var batch = result.balance.batch;
@ -324,33 +327,33 @@
if (itemDetail == undefined) { if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中") .fromLocationCode + "】不在列表中")
} else { } else {
if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) { if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描") .fromLocationCode + "】已经扫描")
} else { } else {
// this.addDetail(itemDetail, result); // this.addDetail(itemDetail, result);
// return; // return;
// //
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
// if (this.jobContent.allowModifyInventoryStatus == "TRUE") { // if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.cancleScanedHiht=false; itemDetail.cancleScanedHiht = false;
this.addDetail(itemDetail, result); this.addDetail(itemDetail, result);
} else { } else {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
}else { } else {
itemDetail.cancleScanedHiht=false; itemDetail.cancleScanedHiht = false;
this.addDetail(itemDetail, result); this.addDetail(itemDetail, result);
} }
// } else { // } else {
// this.addDetail(itemDetail, result); // this.addDetail(itemDetail, result);
// } // }
@ -453,7 +456,8 @@
productPutawayJobSubmit(params).then(res => { productPutawayJobSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成"+this.hintTitle+"记录<br>" + res.data) this.showCommitSuccessMessage("提交成功<br>生成" + this.hintTitle + "记录<br>" +
res.data)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage("提交失败[" + res.msg + "]")
} }

64
src/pages/productReceipt/job/ccProductReceiptDetail.vue

@ -1,43 +1,45 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<view class="cen_card" style="padding: 5rpx;">
<view class="page-main"> <view class="cell_box uni-flex uni-row">
<scroll-view scroll-y="true" class="page-main-scroll"> <view class="cell_info">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="text_lightblue">车间</view>
<view class="cen_card" style="padding: 5rpx;"> <view>
<view class="cell_box uni-flex uni-row"> {{jobContent.workShopCode}}
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>
{{jobContent.workShopCode}}
</view>
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">生产线</view> <view class="cell_info">
<view> <view class="text_lightblue">生产线</view>
{{item.subList[0].productionLineCode}} <view>
</view> {{jobContent.subList[0].productionLineCode}}
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">班组</view> <view class="cell_info">
<view> <view class="text_lightblue">班组</view>
{{jobContent.team}} <view>
</view> {{jobContent.team}}
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">班次</view> <view class="cell_info">
<view> <view class="text_lightblue">班次</view>
{{jobContent.shift}} <view>
</view> {{jobContent.shift}}
</view> </view>
</view> </view>
<view class="split_line"></view>
</view> </view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<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"

123
src/pages/productReceipt/job/productReceiptDetail.vue

@ -1,43 +1,45 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<!-- <view class="header_item">生产计划{{productionPlanNumber}}</view> -->
<view class="page-main"> <view class="cen_card" style="padding: 5rpx;">
<scroll-view scroll-y="true" class="page-main-scroll"> <view class="cell_box uni-flex uni-row">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="cell_info">
<view class="cen_card" style="padding: 5rpx;"> <view class="text_lightblue">车间</view>
<view class="cell_box uni-flex uni-row"> <view>
<view class="cell_info"> {{jobContent.workShopCode}}
<view class="text_lightblue">车间</view>
<view>
{{jobContent.workShopCode}}
</view>
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">生产线</view> <view class="cell_info">
<view> <view class="text_lightblue">生产线</view>
{{item.subList[0].productionLineCode}} <view>
</view> {{jobContent.subList[0].productionLineCode}}
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">班组</view> <view class="cell_info">
<view> <view class="text_lightblue">班组</view>
{{jobContent.team}} <view>
</view> {{jobContent.team}}
</view> </view>
<view class="cell_info"> </view>
<view class="text_lightblue">班次</view> <view class="cell_info">
<view> <view class="text_lightblue">班次</view>
{{jobContent.shift}} <view>
</view> {{jobContent.shift}}
</view> </view>
</view> </view>
<view class="split_line"></view>
</view> </view>
</view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<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"
@ -53,7 +55,8 @@
<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="">
<locationCompare ref="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode" <locationCompare ref="comScanLocation" title="收货库位"
:isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
@ -134,31 +137,31 @@
managementList: [], managementList: [],
jobStatus: "", jobStatus: "",
jobToLocationCode: "", jobToLocationCode: "",
status:'', status: '',
scanMessage:"" scanMessage: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.scanMessage =option.scanMessage; this.scanMessage = option.scanMessage;
this.status = option.status || '' this.status = option.status || ''
}, },
onShow(){ onShow() {
if (this.id != undefined) { if (this.id != undefined) {
// //
if (this.status == "1") { if (this.status == "1") {
this.receive((callback => { this.receive((callback => {
this.getDetail(); this.getDetail();
})); }));
} else { } else {
this.getDetail(); this.getDetail();
} }
} }
}, },
// //
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -221,16 +224,16 @@
that.jobContent = res.data; that.jobContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){ if (that.jobContent.allowModifyLocation == 'FALSE') {
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
} }
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
if(that.scanMessage){ if (that.scanMessage) {
this.$refs.scanPopup.simulateScan(that.scanMessage); this.$refs.scanPopup.simulateScan(that.scanMessage);
} }
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }
@ -241,8 +244,8 @@
}) })
}, },
getScanResult(result) { getScanResult(result) {
let label = result.label; let label = result.label;
var packingNumber = label.packingNumber; var packingNumber = label.packingNumber;
var batch = label.batch; var batch = label.batch;

12
src/pages/productReceipt/job/scrapReceiptDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -110,7 +108,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {

41
src/pages/productRecycle/job/productRecycleJobDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号{{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -34,7 +32,8 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" title="制品标签" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" title="制品标签"
@getResult='getScanResult'></win-scan-pack-and-location>
<recycleDetailInfoPopup ref="jobDetailPopup"></recycleDetailInfoPopup> <recycleDetailInfoPopup ref="jobDetailPopup"></recycleDetailInfoPopup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
@ -98,7 +97,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -180,8 +179,8 @@
that.jobContent = res.data; that.jobContent = res.data;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.subList = res.data.subList; that.subList = res.data.subList;
that.subList.forEach(res=>{ that.subList.forEach(res => {
res.fromLocationCode =res.toLocationCode res.fromLocationCode = res.toLocationCode
}) })
that.toLocationCode = that.jobContent.toLocationCode that.toLocationCode = that.jobContent.toLocationCode
that.detailSource = getDataSource(that.subList); that.detailSource = getDataSource(that.subList);
@ -243,11 +242,11 @@
itemDetail = detail.subList.find(r => { itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber && return r.packingNumber == packingNumber &&
r.batch == batch && r.batch == batch &&
r.fromLocationCode == result.fromLocationCode&& r.fromLocationCode == result.fromLocationCode &&
r.inventoryStatus == result.balance.inventoryStatus r.inventoryStatus == result.balance.inventoryStatus
}) })
if(itemDetail){ if (itemDetail) {
// //
if (itemDetail.scaned) { if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
@ -257,22 +256,22 @@
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty); itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.inventoryStatus =result.balance.inventoryStatus; itemDetail.inventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty); itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
} }
}else { } else {
// //
itemDetail = detail.subList.find(r => { itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber && return r.packingNumber == packingNumber &&
r.batch == batch && r.batch == batch &&
r.fromLocationCode == result.fromLocationCode r.fromLocationCode == result.fromLocationCode
}) })
if(itemDetail){ if (itemDetail) {
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
// //
if (this.jobContent.allowModifyInventoryStatus == "TRUE") { if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
@ -282,7 +281,7 @@
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty); itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.inventoryStatus =result.balance.inventoryStatus; itemDetail.inventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty; itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.packQty = result.package.packQty itemDetail.balance.packQty = result.package.packQty
@ -299,11 +298,11 @@
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}); });
} }
}else { } else {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中") .fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中")
} }
} }
} }
@ -461,4 +460,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

13
src/pages/productionReceipt/coms/comProductionJobCard.vue

@ -1,10 +1,13 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="" > <view class="task_item" style="margin-left: 15px;">
<text style="font-size: 32rpx; margin-left: 35rpx;">生产线</text> <view class="task_text">
<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold;" >{{dataContent.productionLineCode}}</text> <view class="card_view">
<text class="card_packing_code ">生产线</text>
<text class="card_content ">{{dataContent.productionLineCode}}</text>
</view>
</view>
</view> </view>
</job-com-main-card> </job-com-main-card>
</template> </template>

23
src/pages/productionReceipt/job/productionReceiptDetail.vue

@ -2,13 +2,14 @@
<view class="page-wraper"> <view class="page-wraper">
<view class="page-main"> <view class="page-main">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
发料任务单号 : {{jobContent.issueJobNumber}} <view class="header_item">
发料任务单号 : {{jobContent.issueJobNumber}}
</view>
</view> </view>
<view class="split_line"></view>
</view> </view>
<scroll-view scroll-y="true"> <scroll-view scroll-y="true">
<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">
@ -114,7 +115,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.scanMessage = option.scanMessage; this.scanMessage = option.scanMessage;
@ -195,7 +196,7 @@
} else { } else {
that.toLocationCode = that.jobToLocationCode; that.toLocationCode = that.jobToLocationCode;
} }
if(this.scanMessage){ if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage); this.openScanPopupSimulate(this.scanMessage);
} }
} else { } else {
@ -280,7 +281,7 @@
}) })
} }
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent, this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
scanMessage); scanMessage);
}, },
getScanResult(result) { getScanResult(result) {
@ -432,8 +433,8 @@
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
// var itemCodes = [] // var itemCodes = []
// this.detailSource.forEach(item => { // this.detailSource.forEach(item => {
// itemCodes.push(item.itemCode) // itemCodes.push(item.itemCode)

1
src/pages/productionReturn/coms/comReturnRequestPopup.vue

@ -74,7 +74,6 @@
<script> <script>
import { import {
getBasicItemByCode,
getProductionlineItem, getProductionlineItem,
getWorkShopLineStation getWorkShopLineStation
} from '@/api/request2.js'; } from '@/api/request2.js';

18
src/pages/productionReturn/job/returnDetail.vue

@ -1,21 +1,19 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
</work-station>
</view> </view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
</work-station>
</view> </view>
<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="">
<view class="split_line"></view>
<com-return-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-return-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
@ -116,7 +114,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {

26
src/pages/repleinsh/job/repleinshDetail.vue

@ -1,13 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}} <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
</view> </view>
<view class="split_line"></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -99,7 +100,7 @@
toLocationCode: '', toLocationCode: '',
toLocationAreaTypeList: [], toLocationAreaTypeList: [],
jobStatus: "", jobStatus: "",
scanMessage:"" scanMessage: ""
}; };
}, },
@ -109,10 +110,10 @@
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.scanMessage =option.scanMessage this.scanMessage = option.scanMessage
if (this.id != undefined) { if (this.id != undefined) {
// //
if (option.status == "1") { if (option.status == "1") {
@ -190,10 +191,11 @@
that.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.detailSource, that.subList) that.detailSource = getDataSource(that.detailSource, that.subList)
if(that.scanMessage){ if (that.scanMessage) {
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,that.scanMessage); this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this
.jobContent, that.scanMessage);
} }
setTimeout(r => { setTimeout(r => {
that.resizeCollapse(); that.resizeCollapse();
}, 100) }, 100)

40
src/pages/stockUp/job/stockUpJobDetail.vue

@ -1,26 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item">
申请单号{{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
<!-- <view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">客户代码</view>
<view>{{jobContent.customerCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">客户寄售库</view>
<view>{{toLocationCode}}</view>
</view>
</view> </view>
<view class='split_line'></view> </view>
</view> -->
</view> </view>
<view class="page-main"> <view class="page-main">
@ -131,7 +116,7 @@
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -317,18 +302,19 @@
record.toLocationCode = subItem record.toLocationCode = subItem
.toLocationCode; .toLocationCode;
record.supplierCode = r.supplierCode; record.supplierCode = r.supplierCode;
//使 //使
if (this.toLocationCode == null) { if (this.toLocationCode == null) {
record.toPackingNumber = r record.toPackingNumber = r
.packingNumber; .packingNumber;
record.toBatch = r.batch; record.toBatch = r.batch;
} else { } else {
var info = getPackingNumberAndBatch( var info =
this.managementList, r getPackingNumberAndBatch(
.itemCode, this.managementList, r
r.packingNumber, r .itemCode,
.batch); r.packingNumber, r
.batch);
record.toPackingNumber = info record.toPackingNumber = info
.packingNumber; .packingNumber;
record.toBatch = info.batch; record.toBatch = info.batch;
@ -338,7 +324,7 @@
subList.push(deepCopyData(subItem)); subList.push(deepCopyData(subItem));
} }
} }
}) })
}) })
}) })

23
src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@ -1,18 +1,17 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_item">
发货单号:{{dataContent.asnNumber}}
</view>
<view class="header_item">
供应商代码:{{dataContent.supplierCode}}
</view>
</view>
</view>
<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=""
style="padding:10rpx 30rpx ;font-size: 32rpx; ">
<!-- padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx -->
<view style="padding: 5rpx;">
发货单号:{{dataContent.asnNumber}}
</view>
<view style="padding: 5rpx;">
供应商代码:{{dataContent.supplierCode}}
</view>
</view>
<u-line />
<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-record-detail-card :dataContent="item" :index="index" @remove="updateData" <com-record-detail-card :dataContent="item" :index="index" @remove="updateData"
@ -88,7 +87,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.getDetail(); this.getDetail();

97
src/pages/transfer/job/issueDetail.vue

@ -1,11 +1,10 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -20,14 +19,14 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="page-footer"> <view class="page-footer">
<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="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -67,7 +66,7 @@
calcHandleQty, calcHandleQty,
getScanCount getScanCount
} from '@/common/detail.js'; } from '@/common/detail.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import locationCompare from '@/mycomponents/location/locationCompare.vue' import locationCompare from '@/mycomponents/location/locationCompare.vue'
@ -75,7 +74,7 @@
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue' import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'returnDetail', name: 'returnDetail',
components: { components: {
@ -96,14 +95,14 @@
toLocationCode: "", toLocationCode: "",
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
toLocationAreaTypeList:[], toLocationAreaTypeList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"" jobToLocationCode: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -127,7 +126,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeTransferIssueJob(this.id).then(res => { cancleTakeTransferIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -183,7 +182,7 @@
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.subList =res.data.subList that.subList = res.data.subList
that.detailSource = getDataSource(that.subList) that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode that.jobToLocationCode = that.subList[0].toLocationCode
@ -262,23 +261,26 @@
r.batch == batch && r.fromLocationCode == result.fromLocationCode r.batch == batch && r.fromLocationCode == result.fromLocationCode
}) })
if (itemDetail == undefined) { if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中") this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else { } else {
if (itemDetail.scaned) { if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描") this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else { } else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续出库?', res => { ']不一致,是否继续出库?', res => {
if (res) { if (res) {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty =Number(result.balance.qty) ; itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) ; itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
@ -286,19 +288,20 @@
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
}else { } else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => { ']不一致,不允许转移!', res => {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
}); });
} }
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ; itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.toInventoryStatus = result.balance.inventoryStatus
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty) ; itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
@ -312,17 +315,17 @@
} }
}, },
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();
@ -344,7 +347,7 @@
} }
}, },
submitJob() { submitJob() {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: "提交中....",
mask: true mask: true
@ -361,7 +364,7 @@
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));
transferIssueJobSubmit(params).then(res => { transferIssueJobSubmit(params).then(res => {
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data) this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data)
@ -379,11 +382,11 @@
} }
}); });
}, },
setParams() { setParams() {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
if (detail.scaned) { if (detail.scaned) {
@ -401,19 +404,19 @@
this.jobContent.creator = creator; this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
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();
}) })
return isPass = false; return isPass = false;
} }
return isPass; return isPass;
}, },
showMessageHint(hint, callback) { showMessageHint(hint, callback) {
this.$refs.comMessage.showErrorMessage(hint, res => { this.$refs.comMessage.showErrorMessage(hint, res => {
if (res) { if (res) {
@ -421,7 +424,7 @@
} }
}); });
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
this.toLocationCode = code this.toLocationCode = code
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
@ -523,4 +526,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

35
src/pages/transfer/job/receiptDetail.vue

@ -1,24 +1,23 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}} <view class="header_item">
</view> 来源仓库 : {{jobContent.fromWarehouseCode}}
<view class="header_item"> </view>
来源仓库 : {{jobContent.fromWarehouseCode}} <view class='split_line'></view>
</view> </view>
<view class='split_line'></view>
</view> </view>
<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="">
<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
</view> </view>
@ -29,8 +28,8 @@
<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="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -106,13 +105,13 @@
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
toLocationAreaTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"" jobToLocationCode: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -136,7 +135,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeTransferReceiptJob(this.id).then(res => { cancleTakeTransferReceiptJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -561,4 +560,4 @@
background: #e0e0e0; background: #e0e0e0;
} }
</style> </style>

18
src/pages/transfer/job/transferDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -192,7 +190,7 @@
item.subList.push(newDetail); item.subList.push(newDetail);
items.push(item) items.push(item)
} else { } else {
item.qty = calc.add(item.qty,detail.qty) item.qty = calc.add(item.qty, detail.qty)
let newDetail = this.createDetailInfo(detail); // let newDetail = this.createDetailInfo(detail); //
item.subList.push(newDetail); item.subList.push(newDetail);
} }
@ -240,9 +238,9 @@
item.handleQty = new Decimal(0).toNumber(); item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) { for (let detail of item.subList) {
if (detail.record != undefined) { if (detail.record != undefined) {
item.handleQty = calc.add(item.handleQty,detail.record.qty) item.handleQty = calc.add(item.handleQty, detail.record.qty)
} }
} }
} }
this.continueScan() this.continueScan()
@ -567,4 +565,4 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

3
src/pages/unPlanned/coms/comReceiptRequestPopup.vue

@ -76,9 +76,6 @@
</template> </template>
<script> <script>
import {
getBasicItemByCode,
} from '@/api/request2.js';
import { import {
getLocationTypeName, getLocationTypeName,
getListLocationTypeDesc, getListLocationTypeDesc,

18
src/pages/unPlanned/job/issueJobDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -90,12 +88,12 @@
detailSource: [], // detailSource: [], //
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
jobStatus:"" jobStatus: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -119,7 +117,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeUnPlannedIssueJob(this.id).then(res => { cancleTakeUnPlannedIssueJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -424,4 +422,4 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

39
src/pages/unPlanned/job/receiptJobDetail.vue

@ -1,13 +1,11 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<job-top :dataContent="jobContent"></job-top> <view class="header_job_top">
</view> <job-top :dataContent="jobContent"></job-top>
<view class="header_item"> </view>
申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
@ -15,7 +13,8 @@
<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-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-receipt-detail-card> </com-receipt-detail-card>
</view> </view>
<view class='split_line'></view> <view class='split_line'></view>
@ -27,8 +26,8 @@
<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="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -95,13 +94,13 @@
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
managementList: [], managementList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"" jobToLocationCode: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -125,7 +124,7 @@
onBackPress(e) { onBackPress(e) {
// //
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
// //
cancleTakeUnPlannedReceiptJob(this.id).then(res => { cancleTakeUnPlannedReceiptJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -221,17 +220,17 @@
this.showErrorMessage("物料号【" + itemCode + "】不在列表中") this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
} else { } else {
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
);
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? this.toLocationCode:itemDetail.toLocationCode ; itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
.toLocationCode;
itemDetail.packQty = result.package.packQty itemDetail.packQty = result.package.packQty
itemDetail.labelQty = Number(result.label.qty); itemDetail.labelQty = Number(result.label.qty);
calcHandleQty(this.detailSource); calcHandleQty(this.detailSource);
@ -408,5 +407,5 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

23
src/pages/unPlanned/request/issueRequestDetail.vue

@ -1,13 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<request-top :dataContent="requestContent"></request-top> <view class="header_job_top">
</view> <request-top :dataContent="requestContent"></request-top>
<view class="header_item"> </view>
从仓库代码 : {{requestContent.fromWarehouseCode}} <view class="header_item">
从仓库代码 : {{requestContent.fromWarehouseCode}}
</view>
</view> </view>
<view class='split_line'></view>
</view> </view>
<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">
@ -42,7 +43,7 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue' import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue'
import requestTop from "@/mycomponents/request/requestTop.vue" import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
@ -59,7 +60,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.getDetail(); this.getDetail();
@ -92,11 +93,11 @@
if (res.data == null) { if (res.data == null) {
that.showMessage('未获取到详情'); that.showMessage('未获取到详情');
} else { } else {
if(res.data.subList.length>0){ if (res.data.subList.length > 0) {
that.requestContent = res.data; that.requestContent = res.data;
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList); that.detailSource = getDataSource(that.subList);
}else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }
} }
@ -123,4 +124,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

15
src/pages/unPlanned/request/receiptRequestDetail.vue

@ -1,13 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header-view">
<request-top :dataContent="requestContent"></request-top> <view class="header_job_top">
</view> <request-top :dataContent="requestContent"></request-top>
<view class="header_item"> </view>
到仓库代码 : {{requestContent.toWarehouseCode}} <view class="header_item">
到仓库代码 : {{requestContent.toWarehouseCode}}
</view>
</view> </view>
<view class='split_line'></view>
</view> </view>
<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">
@ -123,4 +124,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>
Loading…
Cancel
Save