Browse Source

修改任务详细显示 到货检验全检

wms3.0_pda
lijuncheng 12 months ago
parent
commit
746e0c0631
  1. 8
      pages.json
  2. 5
      pages/inspect/coms/inspectComDetailCard.vue
  3. 1
      pages/inspect/coms/inspectEdit.vue
  4. 36
      pages/inspect/job/inspectDetail.vue
  5. 517
      pages/inspect/job/inspectFullDetail.vue
  6. 2
      pages/inspect/job/inspectJob.vue
  7. 5
      pages/issue/job/issueDetail.vue
  8. 14
      pages/productDismantle/job/productDismantleDetail.vue
  9. 14
      pages/productPutaway/job/productPutawayDetail.vue
  10. 13
      pages/productReceipt/job/productReceiptDetail.vue
  11. 4
      pages/productionReceipt/job/productionReceiptDetail.vue
  12. 11
      pages/productionReturn/job/returnDetail.vue
  13. 3
      pages/purchaseReceipt/job/receiptDetail.vue
  14. 3
      pages/purchaseReturn/job/returnDetail.vue
  15. 9
      pages/putaway/job/putawayDetail.vue
  16. 13
      pages/repleinsh/job/repleinshDetail.vue
  17. 14
      pages/scrap/job/scrapJobDetail.vue
  18. 14
      pages/transfer/job/issueDetail.vue
  19. 13
      pages/transfer/job/receiptDetail.vue
  20. 16
      pages/transfer/job/transferDetail.vue
  21. 13
      pages/unPlanned/job/issueJobDetail.vue
  22. 11
      pages/unPlanned/job/receiptJobDetail.vue

8
pages.json

@ -218,6 +218,14 @@
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{
"path": "pages/inspect/job/inspectFullDetail",
"style": {
"navigationBarTitleText": "到货检验(全检)详情",
"enablePullDownRefresh": true
}
},
{ {
"path": "pages/putaway/job/putawayJob", "path": "pages/putaway/job/putawayJob",

5
pages/inspect/coms/inspectComDetailCard.vue

@ -17,11 +17,12 @@
</view> </view>
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">不合格数</view> <view class="text_lightblue">不合格数</view>
<view>{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view> <view style="color: #F56C6C;">{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view> </view>
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">报废数</view> <view class="text_lightblue">报废数</view>
<view>{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view> <view style="color: #EC9C00">{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
</view> </view>
</view> </view>
<!-- <u-line /> --> <!-- <u-line /> -->

1
pages/inspect/coms/inspectEdit.vue

@ -138,7 +138,6 @@
this.dataContent.failedQty = failedQty; this.dataContent.failedQty = failedQty;
this.dataContent.crackQty = crackQty this.dataContent.crackQty = crackQty
this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty
debugger
this.afterSave() this.afterSave()

36
pages/inspect/job/inspectDetail.vue

@ -97,26 +97,15 @@
selectedItem: {}, selectedItem: {},
failedQty: 0, failedQty: 0,
crackQty: 0, crackQty: 0,
inspectType: "",
}; };
}, },
onLoad(option) { onLoad(option) {
this.id = option.id; this.id = option.id;
this.failedQty = option.failedQty; this.failedQty = option.failedQty;
this.crackQty = option.crackQty; this.crackQty = option.crackQty;
this.inspectType = option.inspectType;
if (this.id != undefined && this.inspectType == "FULL") { if (this.id != undefined ) {
// // // //
if (option.status == "1") {
this.receive((callback => {
this.received = true;
this.getDetail();
}));
} else {
this.getDetail();
}
} else {
this.getDetail(); this.getDetail();
} }
@ -295,7 +284,7 @@
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
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)
@ -326,21 +315,6 @@
this.showErrorMessage("扫描数为0,请先扫描") this.showErrorMessage("扫描数为0,请先扫描")
return; return;
} }
//
if (this.inspectType == "FULL") {
if (this.scanCount == this.subList.length) {
this.submitJob();
} else {
//
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
"]箱总共[" + this
.subList.length + "]箱", res => {
if (res) {
this.openScanPopup();
}
});
}
} else {
// //
if (this.scanCount == this.subList.length) { if (this.scanCount == this.subList.length) {
this.submitJob(); this.submitJob();
@ -360,7 +334,7 @@
}); });
} }
} }
}
}, },
@ -440,7 +414,7 @@
detail.sampleQty = detail.qty; detail.sampleQty = detail.qty;
detail.failedQty = detail.failedQty; detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty; detail.crackQty = detail.crackQty;
detail.notPassedQty = Number(detail.receiveQty)-Number(detail.crackQty); detail.notPassedQty = detail.failedQty;
// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty; // detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id detail.inspectUser = this.$store.state.user.id
@ -461,7 +435,7 @@
detail.sampleQty = detail.qty; detail.sampleQty = detail.qty;
detail.failedQty = 0; detail.failedQty = 0;
detail.crackQty = 0; detail.crackQty = 0;
detail.notPassedQty = Number(detail.receiveQty)-Number(detail.crackQty);; detail.notPassedQty = 0;
detail.goodQty = detail.qty; detail.goodQty = detail.qty;
detail.inspectUser = this.$store.state.user.id detail.inspectUser = this.$store.state.user.id
detail.toInventoryStatus = "OK" detail.toInventoryStatus = "OK"

517
pages/inspect/job/inspectFullDetail.vue

@ -0,0 +1,517 @@
<template>
<view class="page-wraper">
<view style="margin: 5px;">
<job-top :dataContent="jobContent"></job-top>
<view>
<view class="card_content"> 检验类型 : {{getInspectType(jobContent.inspectType)}}</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">
<inspect-com-detail-card :dataContent="item" :jobContent="jobContent" @remove="updateData"
:isShowBatch="false" @updateData='updateData'>
</inspect-com-detail-card>
</view>
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
</view>
</view>
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<com-message ref="comMessage"></com-message>
</view>
</template>
<script>
import {
takeInspectJob,
cancleTakeInspectJob,
getInspectJobDetail,
getBasicLocationByCode,
inspectJobSubmit
} from '@/api/request2.js';
import {
goHome,
getCurrDateTime,
getPackingNumberAndBatch,
navigateBack
} from '@/common/basic.js';
import {
getInventoryStatusName,
getDirectoryItemArray,
getInspectType
} from '@/common/directory.js';
import {
getManagementPrecisions
} from '@/common/balance.js';
import {
getDataSource,
createRecordInfo,
calcHandleQty,
getScanCount
} from '@/common/detail.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comMessage from '@/mycomponents/common/comMessage.vue'
import inspectComDetailCard from "@/pages/inspect/coms/inspectComDetailCard.vue"
import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'returnDetail',
components: {
winScanButton,
winScanPack,
requiredLocation,
winScanPackAndLocation,
comMessage,
inspectComDetailCard,
jobTop
},
data() {
return {
id: '',
received: false,
scanCount: 0,
jobContent: {}, //
subList: [], //subList
detailSource: [], //
businessTypeInfo: {},
fromInventoryStatuses: "",
managementList: [],
selectedItem: {},
};
},
onLoad(option) {
this.id = option.id;
if (this.id != undefined) {
// //
if (option.status == "1") {
this.receive((callback => {
this.received = true;
this.getDetail();
}));
} else {
this.getDetail();
}
}
},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}
},
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.received) {
//
cancleTakeInspectJob(this.id).then(res => {
uni.navigateBack();
}).catch(error => {
uni.navigateBack();
})
} else {
uni.navigateBack();
}
return true;
}
},
onPullDownRefresh() {
this.getDetail();
uni.stopPullDownRefresh();
},
mounted() {
},
methods: {
//
receive(callback) {
uni.showLoading({
title: "加载中....",
mask: true
});
if (this.id != null) {
takeInspectJob(this.id).then(res => {
uni.hideLoading();
callback();
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error)
})
}
},
getDetail() {
var that = this;
uni.showLoading({
title: "加载中....",
mask: true
});
getInspectJobDetail(that.id).then(res => {
uni.hideLoading();
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
if (res.data.subList.length > 0) {
that.jobContent = res.data;
this.jobContent.failedQty = 0;
this.jobContent.crackQty = 0;
this.jobContent.notPassedQty = 0;
that.subList = res.data.subList;
that.subList.forEach(res => {
res.batch = that.jobContent.batch
res.goodQty = 0;
res.failedQty = 0;
res.crackQty = 0;
res.sampleQty = 0;
res.notPassedQty = 0;
res.failedReason = "";
res.photos = ""
res.inspectResult = ""
})
that.fromInventoryStatuses = that.jobContent.outInventoryStatuses
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
},
calcScanCount(closeScan) {
let items = this.subList.filter(r => {
if (r.scaned) {
return r;
}
})
this.scanCount = items != null ? items.length : 0;
if (this.scanCount == this.subList.length) {
this.closeScanPopup();
}
},
calcHandleQty() {
calcHandleQty(this.detailSource)
this.calcJobQty();
this.continueScan()
this.$forceUpdate();
},
calcJobQty() {
var failedQty = 0;
var crackQty = 0;
for (let item of this.detailSource) {
for (let detail of item.subList) {
if (detail != undefined && detail.scaned) {
failedQty += Number(detail.failedQty)
crackQty += Number(detail.crackQty)
}
}
}
this.jobContent.failedQty = failedQty;
this.jobContent.crackQty = crackQty;
},
//
continueScan() {
this.scanCount = getScanCount(this.subList);
if (this.scanCount == this.subList.length) {
this.closeScanPopup();
} else {
this.scanPopupGetFocus();
}
},
updateData() {
this.calcHandleQty();
},
openScanPopup() {
let fromlocationCode = '';
let fromlocationList = [];
for (var i = 0; i < this.detailSource.length; i++) {
let item = this.detailSource[i];
item.subList.forEach(l => {
//
var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
if (location.length == 0) {
fromlocationList.push(l.fromLocationCode);
}
//
if (fromlocationCode == '') {
if (!l.scaned) {
fromlocationCode = l.fromLocationCode;
}
}
})
}
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
},
getScanResult(result) {
try {
var packingNumber = result.label.packingNumber;
var batch = result.label.batch;
var qty = result.label.qty;
var itemCode = result.label.itemCode;
var detail = this.detailSource.find(r => r.itemCode == itemCode);
if (detail == undefined) {
this.showMessage("物料号【" + itemCode + "】不在列表中")
} else {
var itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber &&
r.batch == batch
})
if (itemDetail == undefined) {
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
} else {
if (itemDetail.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续检验?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance;
this.calcHandleQty();
} else {
this.scanPopupGetFocus();
}
});
} else {
itemDetail.scaned = true;
itemDetail.balance = result.balance;
itemDetail.handleQty = Number(result.balance.qty)
this.calcHandleQty();
}
}
}
}
this.scanPopupGetFocus();
} catch (e) {
this.showErrorMessage(e.message);
}
},
commit() {
this.scanCount = getScanCount(this.subList);
if (this.scanCount == 0) {
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
//
if (this.inspectType == "FULL") {
if (this.scanCount == this.subList.length) {
this.submitJob();
} else {
//
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
"]箱总共[" + this
.subList.length + "]箱", res => {
if (res) {
this.openScanPopup();
}
});
}
}
},
submitJob() {
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams();
console.log("提交参数", JSON.stringify(params));
inspectJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error);
})
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.afterCloseMessage()
}
});
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.afterCloseMessage()
}
});
},
showQuestionMessage(message, callback) {
setTimeout(r => {
this.scanPopupLoseFocus();
this.$refs.comMessage.showQuestionMessage(message, res => {
if (res) {
callback(res);
}
});
})
},
scanPopupGetFocus() {
this.$refs.scanPopup.packGetFocus();
},
scanPopupLoseFocus() {
this.$refs.scanPopup.packLoseFocus();
},
closeScanPopup() {
this.$refs.scanPopup.closeScanPopup();
},
afterCloseMessage() {
this.scanPopupGetFocus();
},
closeScanMessage() {
this.scanPopupGetFocus();
},
setParams() {
var list = []
this.detailSource.forEach(res => {
res.subList.forEach(detail => {
if (detail.scaned) {
detail.sampleQty = detail.qty;
detail.failedQty = detail.failedQty;
detail.crackQty = detail.crackQty;
detail.notPassedQty = detail.failedQty;
// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
detail.inspectUser = this.$store.state.user.id
//==
if (detail.goodQty == detail.handleQty) {
detail.toInventoryStatus = "OK"
} else {
//=
//>0
if (detail.crackQty > 0) {
detail.toInventoryStatus = "SCRAP"
} else {
detail.toInventoryStatus = "NOK"
}
}
} else {
detail.sampleQty = detail.qty;
detail.failedQty = 0;
detail.crackQty = 0;
detail.notPassedQty = 0;
detail.goodQty = detail.qty;
detail.inspectUser = this.$store.state.user.id
detail.toInventoryStatus = "OK"
}
list.push(detail)
})
})
this.jobContent.notPassedQty = Number(this.jobContent.failedQty)+ Number(this.jobContent.crackQty)
this.jobContent.subList = list
this.jobContent.nextAction = "PARTIAL_OK";
return this.jobContent;
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1);
})
},
getInspectType(value) {
return getInspectType(value)
}
}
}
</script>
<style scoped lang="scss">
page {
width: 100%;
height: 100%;
background-color: #fff;
}
.page-wraper {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.page-main {
flex: 1;
position: relative;
}
.page-main-scroll {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
.page-main-list {
/* height: 80rpx;
line-height: 80rpx; */
text-align: center;
background: #e0e0e0;
}
</style>

2
pages/inspect/job/inspectJob.vue

@ -180,7 +180,7 @@
if(item.inspectType=="FULL"){ if(item.inspectType=="FULL"){
uni.navigateTo({ uni.navigateTo({
url: './inspectDetail?id=' + item.id + '&status=' + item.status+'&inspectType=' + item.inspectType url: './inspectFullDetail?id=' + item.id + '&status=' + item.status
}); });
}else { }else {
uni.navigateTo({ uni.navigateTo({

5
pages/issue/job/issueDetail.vue

@ -1,6 +1,5 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-main">
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
@ -8,9 +7,9 @@
<view class="header_item"> <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
</view> </view>
<scroll-view scroll-y="true" class=""> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource"> <view v-for="(toLocation, index) in detailSource">
<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation"> <com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
</com-issue-request-info> </com-issue-request-info>

14
pages/productDismantle/job/productDismantleDetail.vue

@ -1,6 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -74,6 +82,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/productDismantle/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/productDismantle/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
components: { components: {
@ -82,7 +91,8 @@
requiredLocation, requiredLocation,
comMessage, comMessage,
comDetailCard, comDetailCard,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {

14
pages/productPutaway/job/productPutawayDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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">
@ -74,6 +83,8 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
components: { components: {
@ -82,7 +93,8 @@
requiredLocation, requiredLocation,
comMessage, comMessage,
comDetailCard, comDetailCard,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {

13
pages/productReceipt/job/productReceiptDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -71,6 +80,7 @@
import winScanPack from "@/mycomponents/scan/winScanPack.vue" import winScanPack from "@/mycomponents/scan/winScanPack.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/productReceipt/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/productReceipt/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'receipt_detail', name: 'receipt_detail',
@ -80,7 +90,8 @@
requiredLocation, requiredLocation,
winScanPack, winScanPack,
comMessage, comMessage,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {

4
pages/productionReceipt/job/productionReceiptDetail.vue

@ -8,9 +8,9 @@
<view class="header_item"> <view class="header_item">
发料任务单号 : {{jobContent.issueJobNumber}} 发料任务单号 : {{jobContent.issueJobNumber}}
</view> </view>
<u-line /> <u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view> </view>
<scroll-view scroll-y="true" class=""> <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" <com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"

11
pages/productionReturn/job/returnDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -71,6 +80,7 @@
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'receipt_detail', name: 'receipt_detail',
@ -81,6 +91,7 @@
comDetailCard, comDetailCard,
detailInfoPopup, detailInfoPopup,
comMessage, comMessage,
jobTop
}, },
data() { data() {

3
pages/purchaseReceipt/job/receiptDetail.vue

@ -7,9 +7,8 @@
<view class="header_item"> <view class="header_item">
发货单号 : {{jobContent.asnNumber}} 发货单号 : {{jobContent.asnNumber}}
</view> </view>
<u-line /> <u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</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">

3
pages/purchaseReturn/job/returnDetail.vue

@ -7,9 +7,6 @@
<view class="header_item" > <view class="header_item" >
发货单{{jobContent.asnNumber}} 发货单{{jobContent.asnNumber}}
</view> </view>
<view class="header_item" >
供应商{{jobContent.supplierCode}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line> <u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view> </view>

9
pages/putaway/job/putawayDetail.vue

@ -1,12 +1,15 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view style="margin: 5px;"> <view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
<view class="card_content"> </view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
<u-line /> <u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</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">

13
pages/repleinsh/job/repleinshDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class=""> <scroll-view scroll-y="true" class="">
<view v-for="(toLocation, index) in detailSource"> <view v-for="(toLocation, index) in detailSource">
@ -62,6 +71,7 @@
import comRepleishDetailCard from '@/pages/repleinsh/coms/comRepleishDetailCard.vue' import comRepleishDetailCard from '@/pages/repleinsh/coms/comRepleishDetailCard.vue'
import comScanReplishPack from '@/pages/repleinsh/coms/comScanReplishPack.vue' import comScanReplishPack from '@/pages/repleinsh/coms/comScanReplishPack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'issueDetail', name: 'issueDetail',
@ -71,7 +81,8 @@
comRepleishDetailCard, comRepleishDetailCard,
comScanReplishPack, comScanReplishPack,
comMessage, comMessage,
requiredLocation requiredLocation,
jobTop
}, },
data() { data() {
return { return {

14
pages/scrap/job/scrapJobDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -60,6 +69,8 @@
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue' import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'receipt_detail', name: 'receipt_detail',
components: { components: {
@ -67,7 +78,8 @@
winScanPack, winScanPack,
comScrapDetailCard, comScrapDetailCard,
comMessage, comMessage,
winScanPackAndLocation winScanPackAndLocation,
jobTop
}, },
data() { data() {
return { return {

14
pages/transfer/job/issueDetail.vue

@ -1,5 +1,13 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</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">
@ -68,6 +76,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
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'
export default { export default {
name: 'returnDetail', name: 'returnDetail',
@ -77,7 +86,8 @@
comMessage, comMessage,
winScanPackAndLocation, winScanPackAndLocation,
comDetailCard, comDetailCard,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {
@ -172,7 +182,7 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.jobContent = res.data; that.jobContent = res.data;
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.toLocationCode = that.subList[0].toLocationCode that.toLocationCode = that.subList[0].toLocationCode

13
pages/transfer/job/receiptDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -68,6 +77,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
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'
export default { export default {
name: 'returnDetail', name: 'returnDetail',
@ -77,7 +87,8 @@
comMessage, comMessage,
winScanPackAndLocation, winScanPackAndLocation,
comDetailCard, comDetailCard,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {

16
pages/transfer/job/transferDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -58,6 +67,7 @@
import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue' import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'returnDetail', name: 'returnDetail',
@ -67,7 +77,8 @@
comInventoryDetailCard, comInventoryDetailCard,
requiredLocation, requiredLocation,
comMessage, comMessage,
winScanPackAndLocation winScanPackAndLocation,
jobTop
}, },
data() { data() {
return { return {
@ -80,7 +91,8 @@
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
locationTypeList: [], locationTypeList: [],
managementList: [] managementList: [],
}; };
}, },
onLoad(option) { onLoad(option) {

13
pages/unPlanned/job/issueJobDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -62,6 +71,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'receipt_detail', name: 'receipt_detail',
@ -70,7 +80,8 @@
winScanPackAndLocation, winScanPackAndLocation,
comMessage, comMessage,
comDetailCard, comDetailCard,
detailInfoPopup detailInfoPopup,
jobTop
}, },
data() { data() {
return { return {

11
pages/unPlanned/job/receiptJobDetail.vue

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-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="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -63,6 +72,7 @@
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue' import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default { export default {
name: 'receipt_detail', name: 'receipt_detail',
@ -72,6 +82,7 @@
comMessage, comMessage,
comReceiptDetailCard, comReceiptDetailCard,
requiredLocation, requiredLocation,
jobTop
}, },
data() { data() {
return { return {

Loading…
Cancel
Save