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. 28
      src/pages/count/job/countBlindDetail.vue
  4. 10
      src/pages/count/job/countDetail.vue
  5. 7
      src/pages/count/job/fuzzyCountDetail.vue
  6. 43
      src/pages/customerReturn/job/returnDetail.vue
  7. 13
      src/pages/deliver/job/deliverDetail.vue
  8. 24
      src/pages/inspect/request/inspectRequestDetail.vue
  9. 24
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  10. 1
      src/pages/issue/coms/comIssueRequestPopup.vue
  11. 35
      src/pages/package/job/overPackageJobDetail.vue
  12. 40
      src/pages/productPutaway/job/productPutawayDetail.vue
  13. 16
      src/pages/productReceipt/job/ccProductReceiptDetail.vue
  14. 33
      src/pages/productReceipt/job/productReceiptDetail.vue
  15. 6
      src/pages/productReceipt/job/scrapReceiptDetail.vue
  16. 27
      src/pages/productRecycle/job/productRecycleJobDetail.vue
  17. 11
      src/pages/productionReceipt/coms/comProductionJobCard.vue
  18. 7
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  19. 1
      src/pages/productionReturn/coms/comReturnRequestPopup.vue
  20. 8
      src/pages/productionReturn/job/returnDetail.vue
  21. 14
      src/pages/repleinsh/job/repleinshDetail.vue
  22. 22
      src/pages/stockUp/job/stockUpJobDetail.vue
  23. 17
      src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
  24. 43
      src/pages/transfer/job/issueDetail.vue
  25. 21
      src/pages/transfer/job/receiptDetail.vue
  26. 8
      src/pages/transfer/job/transferDetail.vue
  27. 3
      src/pages/unPlanned/coms/comReceiptRequestPopup.vue
  28. 10
      src/pages/unPlanned/job/issueJobDetail.vue
  29. 29
      src/pages/unPlanned/job/receiptJobDetail.vue
  30. 9
      src/pages/unPlanned/request/issueRequestDetail.vue
  31. 3
      src/pages/unPlanned/request/receiptRequestDetail.vue

4
src/mycomponents/scan/winComScanBalanceLocation.vue

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

4
src/mycomponents/scan/winScanItem.vue

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

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

@ -1,7 +1,8 @@
<template>
<view class="page-wraper">
<view class="header">
<view class="">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
@ -25,6 +26,7 @@
</view>
</view>
</view>
</view>
<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
<view style="margin-top: 160rpx; margin-bottom: 50rpx;">
<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
@ -40,8 +42,7 @@
</view>
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
@editItem="editItem" :settingParam="jobContent" @remove="updateData"
:isShowRecommendQty ="false"
@updateData="updateData">
:isShowRecommendQty="false" @updateData="updateData">
</comCountDetailcards>
</view>
<view class='split_line'></view>
@ -67,9 +68,8 @@
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location
:allowModifyLocation="false"
ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true" @getResult='getScanResult'>
<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
:queryBalance="true" @getResult='getScanResult'>
</win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
@ -158,7 +158,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -253,7 +253,7 @@
item.recommendQty = item.qty
item.handleQty = 0
item.countTime = new Date()
item.fromLocationCode =that.fromLocationCode;
item.fromLocationCode = that.fromLocationCode;
})
that.allDetails = res.data.subList;
that.allCount = res.data.subList.length;
@ -357,7 +357,7 @@
res => {
//
if (res) {
var detail = this.createAddDetailInfo(pack,qty)
var detail = this.createAddDetailInfo(pack, qty)
detail.countTime = new Date();
this.allDetails.push(detail)
this.updateList();
@ -386,7 +386,7 @@
} else {
//
selectItem.scaned = true;
selectItem.balanceQty= Number(qty)
selectItem.balanceQty = Number(qty)
selectItem.handleQty = Number(qty)
selectItem.packQty = pack.packQty
selectItem.packUnit = pack.packUnit
@ -436,7 +436,7 @@
//
createAddDetailInfo(pack,qty) {
createAddDetailInfo(pack, qty) {
var detail = {
masterId: this.jobContent.id, //
scaned: true,
@ -453,7 +453,7 @@
packQty: pack.packQty,
packUnit: pack.packUnit,
projectCode: "",
recommendQty:Number(qty),
recommendQty: Number(qty),
qty: Number(qty),
handleQty: Number(qty),
uom: pack.uom,
@ -462,7 +462,7 @@
countQty: 0,
balanceQty: 0,
fromLocationCode: this.fromLocationCode,
locationCode:this.fromLocationCode,
locationCode: this.fromLocationCode,
creator: this.$store.state.user.id,
countTime: new Date()
}

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

@ -1,6 +1,7 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
@ -21,6 +22,7 @@
</view>
</view>
</view>
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;"></u-line>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -48,15 +50,11 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location
ref="scanPopup" :noShowBalanceMessage="true"
:isCount="true"
<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :isCount="true"
@getCountScanResult='getScanResult'>
</win-scan-pack-and-location>
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
:allowEditStatus="editInventoryStatus"
:isShowBalance="jobContent.isOpenCount=='TRUE'">
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
</count-qty-edit>
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
<comMessage ref="comMessage"></comMessage>

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

@ -2,6 +2,7 @@
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<view class="header-view">
<job-top :dataContent="jobContent"></job-top>
<uni-collapse ref="collapse">
<uni-collapse-item :open="true">
@ -19,6 +20,7 @@
</uni-collapse-item>
</uni-collapse>
</view>
</view>
<view class="card_view" v-if="fromLocationCode!=''">
<text class="card_location">盘点库位</text>
<text class="card_content ">{{fromLocationCode}}</text>
@ -326,10 +328,9 @@
if (this.itemRangeValue != '') {
let index = this.itemRangeValue.indexOf(packInfo.itemCode)
if (index < 0) {
this.showErrorMessage("物料代码【"+ packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
this.showErrorMessage("物料代码【" + packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
return;
}
else {
} else {
this.onScan(packInfo);
}
} else {

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

@ -1,5 +1,17 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -9,7 +21,6 @@
:locationAreaTypeList="toLocationAreaTypeList">
</com-detail-card>
</view>
<view class='split_line'></view>
</view>
</scroll-view>
</view>
@ -18,9 +29,10 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
</locationCompare>
</view>
<view class=" uni-flex uni-row">
<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 comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
components: {
jobTop,
winScanButton,
winScanPackAndLocation,
locationCompare,
@ -87,13 +101,13 @@
fromLocationCode: "",
toLocationCode: "",
toLocationAreaTypeList: [],
jobStatus:"",
jobToLocationCode:""
jobStatus: "",
jobToLocationCode: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -117,7 +131,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeCustomerReturnJob(this.id).then(res => {
uni.navigateBack();
@ -171,7 +185,7 @@
that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){
if (that.jobContent.allowModifyLocation == 'FALSE') {
that.toLocationCode = that.subList[0].toLocationCode
}
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
@ -264,7 +278,7 @@
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续退货?', res => {
if (res) {
@ -280,8 +294,9 @@
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});
@ -456,13 +471,13 @@
},
scanPopupGetFocus() {
if(this.$refs.scanPopup!=undefined){
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packGetFocus();
}
},
scanPopupLoseFocus() {
if(this.$refs.scanPopup!=undefined){
if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.packLoseFocus();
}
},

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

@ -1,13 +1,10 @@
<template>
<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">
申请单号{{jobContent.requestNumber}}
</view>
-->
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -25,7 +22,7 @@
<view>{{toLocationCode}}</view>
</view>
</view>
<view class='split_line'></view>
</view>
</view>
</view>
@ -117,7 +114,7 @@
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -249,7 +246,7 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
if(params.subList.length==0){
if (params.subList.length == 0) {
uni.hideLoading()
this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
return
@ -305,7 +302,7 @@
.packingNumber;
record.toBatch = info.batch;
}
record.fromPackingNumber =r.packingNumber
record.fromPackingNumber = r.packingNumber
subItem.recordList.push(record);
})
subList.push(subItem);

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

@ -1,22 +1,22 @@
<template>
<view class="page-wraper">
<view class="page-main">
<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;">
<view class="page-header">
<view class="header-view">
<view class="header_item" >
单据号 : {{requestContent.number}}
</view>
<view class="" style="font-size: 35rpx;">
<view class="header_item" >
<text>供应商代码 : {{requestContent.supplierCode}} </text>
</view>
</view>
</view>
<view class='split_line'></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="">
<comRequestDetailCard :dataContent="item"
:isShowBatch ="false"
@openDetail="openDetail">
<comRequestDetailCard :dataContent="item" :isShowBatch="false" @openDetail="openDetail">
</comRequestDetailCard>
</view>
</view>
@ -29,7 +29,6 @@
</template>
<script>
import {
getInspectRequestDetail,
} from '@/api/request2.js';
@ -62,7 +61,7 @@
onLoad(option) {
this.id = option.id;
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.getDetail();
},
@ -115,8 +114,7 @@
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
}
if (res) {}
});
},

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

@ -1,13 +1,11 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -96,8 +94,8 @@
businessTypeCode: '',
toLocationCode: '',
toInventoryStatus: '',
jobStatus:"",
title:''
jobStatus: "",
title: ''
};
},
props: {
@ -130,7 +128,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeInventoryMoveJob(this.id).then(res => {
uni.navigateBack();
@ -175,8 +173,7 @@
name = "不合格转隔离";
this.toLocationCode = 'HOLD';
this.toInventoryStatus = 'HOLD';
}
else if (this.businessTypeCode == "OktoScrap") {
} else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废";
this.toLocationCode = 'SCRAP';
this.toInventoryStatus = 'SCRAP';
@ -454,13 +451,10 @@
detail.toBatch = info.batch;
detail.toContainerNumber = '';
// detail.toLocationCode = this.toLocationCode;
if(this.businessTypeCode == "Move")
{
detail.toInventoryStatus=detail.inventoryStatus;
}
else
{
detail.toInventoryStatus=this.toInventoryStatus;
if (this.businessTypeCode == "Move") {
detail.toInventoryStatus = detail.inventoryStatus;
} else {
detail.toInventoryStatus = this.toInventoryStatus;
}
subList.push(detail)
}

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

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

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

@ -1,44 +1,51 @@
<template>
<view class="page-wraper">
<div style="background: white;">
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</div>
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource" :key="index">
<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)}}
{{getPackUnitName(subList[0].fromPackUnit)}}/{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})
</view>
</view>
<view class="cell_info">
<view class="text_lightblue">翻包后包装规格</view>
<view>
{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}}
{{getPackUnitName(subList[0].toPackUnit)}}/{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})
</view>
</view>
</view>
</view>
<view class="split_line"></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"
@updateData='updateData'>
</comOverPackJobDetailCard>
</view>
</scroll-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="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">

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

@ -1,20 +1,21 @@
<template>
<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 class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
</view>
<view class='split_line'></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="">
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
@remove="updateData" @updateData="updateData" @openDetail="openDetail"
<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
:isShowStatus="false" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
:locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card>
</view>
@ -36,7 +37,8 @@
</view>
<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>
<comMessage ref="comMessage"></comMessage>
@ -114,15 +116,15 @@
isCheckLocation: false,
switchCode: "",
scanMessage: '',
hintTitle:"",
status:''
hintTitle: "",
status: ''
};
},
onLoad(option) {
this.id = option.id;
this.type = option.type;
this.scanMessage = option.scanMessage ;
this.scanMessage = option.scanMessage;
this.status = option.status || ''
if (this.type == 'predict') {
this.switchCode = "SemiPutawayLocationCodeValidate"
@ -134,13 +136,13 @@
// updateTitle("");
}
this.hintTitle=option.title
this.hintTitle = option.title
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
},
onShow(){
onShow() {
if (this.id != undefined) {
//
if (this.status == "1") {
@ -219,7 +221,7 @@
} else {
that.toLocationCode = that.jobToLocationCode;
}
if(this.scanMessage){
if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage)
}
@ -273,7 +275,8 @@
}
})
}
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,scanMessage);
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
scanMessage);
},
openScanPopup() {
@ -326,7 +329,7 @@
.fromLocationCode + "】不在列表中")
} else {
if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
@ -341,14 +344,14 @@
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => {
if (res) {
itemDetail.cancleScanedHiht=false;
itemDetail.cancleScanedHiht = false;
this.addDetail(itemDetail, result);
} else {
this.scanPopupGetFocus();
}
});
}else {
itemDetail.cancleScanedHiht=false;
} else {
itemDetail.cancleScanedHiht = false;
this.addDetail(itemDetail, result);
}
// } else {
@ -453,7 +456,8 @@
productPutawayJobSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成"+this.hintTitle+"记录<br>" + res.data)
this.showCommitSuccessMessage("提交成功<br>生成" + this.hintTitle + "记录<br>" +
res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}

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

@ -1,14 +1,10 @@
<template>
<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>
<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="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -20,7 +16,7 @@
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{item.subList[0].productionLineCode}}
{{jobContent.subList[0].productionLineCode}}
</view>
</view>
<view class="cell_info">
@ -36,8 +32,14 @@
</view>
</view>
</view>
<view class="split_line"></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="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"

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

@ -1,14 +1,11 @@
<template>
<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>
<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="header_item">生产计划{{productionPlanNumber}}</view> -->
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
@ -20,7 +17,7 @@
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>
{{item.subList[0].productionLineCode}}
{{jobContent.subList[0].productionLineCode}}
</view>
</view>
<view class="cell_info">
@ -36,8 +33,13 @@
</view>
</view>
</view>
<view class="split_line"></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="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@ -53,7 +55,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<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'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
@ -134,21 +137,21 @@
managementList: [],
jobStatus: "",
jobToLocationCode: "",
status:'',
scanMessage:""
status: '',
scanMessage: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
this.scanMessage =option.scanMessage;
this.scanMessage = option.scanMessage;
this.status = option.status || ''
},
onShow(){
onShow() {
if (this.id != undefined) {
//
if (this.status == "1") {
@ -222,12 +225,12 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){
if (that.jobContent.allowModifyLocation == 'FALSE') {
that.toLocationCode = that.subList[0].toLocationCode
}
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
that.detailSource = getDataSource(that.subList)
if(that.scanMessage){
if (that.scanMessage) {
this.$refs.scanPopup.simulateScan(that.scanMessage);
}

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

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

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

@ -1,13 +1,11 @@
<template>
<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">
申请单号{{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -34,7 +32,8 @@
</view>
<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>
<comMessage ref="comMessage"></comMessage>
</view>
@ -98,7 +97,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -180,8 +179,8 @@
that.jobContent = res.data;
that.jobStatus = res.data.status
that.subList = res.data.subList;
that.subList.forEach(res=>{
res.fromLocationCode =res.toLocationCode
that.subList.forEach(res => {
res.fromLocationCode = res.toLocationCode
})
that.toLocationCode = that.jobContent.toLocationCode
that.detailSource = getDataSource(that.subList);
@ -243,11 +242,11 @@
itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber &&
r.batch == batch &&
r.fromLocationCode == result.fromLocationCode&&
r.fromLocationCode == result.fromLocationCode &&
r.inventoryStatus == result.balance.inventoryStatus
})
if(itemDetail){
if (itemDetail) {
//
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
@ -257,14 +256,14 @@
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.inventoryStatus =result.balance.inventoryStatus;
itemDetail.inventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
}
}else {
} else {
//
itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber &&
@ -272,7 +271,7 @@
r.fromLocationCode == result.fromLocationCode
})
if(itemDetail){
if (itemDetail) {
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
//
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
@ -282,7 +281,7 @@
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.inventoryStatus =result.balance.inventoryStatus;
itemDetail.inventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.packQty = result.package.packQty
@ -299,7 +298,7 @@
this.scanPopupGetFocus();
});
}
}else {
} else {
this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中")
}

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

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

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

@ -2,13 +2,14 @@
<view class="page-wraper">
<view class="page-main">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
发料任务单号 : {{jobContent.issueJobNumber}}
</view>
<view class="split_line"></view>
</view>
</view>
<scroll-view scroll-y="true">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -114,7 +115,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
this.scanMessage = option.scanMessage;
@ -195,7 +196,7 @@
} else {
that.toLocationCode = that.jobToLocationCode;
}
if(this.scanMessage){
if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage);
}
} else {

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

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

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

@ -1,21 +1,19 @@
<template>
<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">
申请单号 : {{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">
<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="split_line"></view>
<com-return-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
@ -116,7 +114,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {

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

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

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

@ -1,26 +1,11 @@
<template>
<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">
申请单号{{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 class='split_line'></view>
</view> -->
</view>
<view class="page-main">
@ -131,7 +116,7 @@
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -324,7 +309,8 @@
.packingNumber;
record.toBatch = r.batch;
} else {
var info = getPackingNumberAndBatch(
var info =
getPackingNumberAndBatch(
this.managementList, r
.itemCode,
r.packingNumber, r

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

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

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

@ -1,11 +1,10 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
</view>
<view class="page-main">
@ -26,8 +25,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -96,14 +95,14 @@
toLocationCode: "",
businessTypeInfo: {},
managementList: [],
toLocationAreaTypeList:[],
jobStatus:"",
jobToLocationCode:""
toLocationAreaTypeList: [],
jobStatus: "",
jobToLocationCode: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -127,7 +126,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeTransferIssueJob(this.id).then(res => {
uni.navigateBack();
@ -183,7 +182,7 @@
if (res.data.subList.length > 0) {
that.jobContent = res.data;
that.jobStatus = res.data.status
that.subList =res.data.subList
that.subList = res.data.subList
that.detailSource = getDataSource(that.subList)
that.fromLocationCode = that.subList[0].fromLocationCode
that.jobToLocationCode = that.subList[0].toLocationCode
@ -262,23 +261,26 @@
r.batch == batch && r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else {
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续出库?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty =Number(result.balance.qty) ;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus
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.packUnit = result.package.packUnit
this.calcHandleQty();
@ -286,8 +288,9 @@
this.scanPopupGetFocus();
}
});
}else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
} else {
this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
});
@ -295,10 +298,10 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus
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.packUnit = result.package.packUnit
this.calcHandleQty();

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

@ -1,24 +1,23 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class="header_item">
来源仓库 : {{jobContent.fromWarehouseCode}}
</view>
<view class='split_line'></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="">
<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>
</view>
</view>
@ -29,8 +28,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -106,13 +105,13 @@
businessTypeInfo: {},
managementList: [],
toLocationAreaTypeList: [],
jobStatus:"",
jobToLocationCode:""
jobStatus: "",
jobToLocationCode: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -136,7 +135,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeTransferReceiptJob(this.id).then(res => {
uni.navigateBack();

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

@ -1,13 +1,11 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -192,7 +190,7 @@
item.subList.push(newDetail);
items.push(item)
} else {
item.qty = calc.add(item.qty,detail.qty)
item.qty = calc.add(item.qty, detail.qty)
let newDetail = this.createDetailInfo(detail); //
item.subList.push(newDetail);
}
@ -240,7 +238,7 @@
item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) {
if (detail.record != undefined) {
item.handleQty = calc.add(item.handleQty,detail.record.qty)
item.handleQty = calc.add(item.handleQty, detail.record.qty)
}
}

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

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

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

@ -1,13 +1,11 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -90,12 +88,12 @@
detailSource: [], //
businessTypeInfo: {},
managementList: [],
jobStatus:""
jobStatus: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -119,7 +117,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeUnPlannedIssueJob(this.id).then(res => {
uni.navigateBack();

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

@ -1,13 +1,11 @@
<template>
<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">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
@ -15,7 +13,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<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>
</view>
<view class='split_line'></view>
@ -27,8 +26,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -95,13 +94,13 @@
toLocationInfo: {},
businessTypeInfo: {},
managementList: [],
jobStatus:"",
jobToLocationCode:""
jobStatus: "",
jobToLocationCode: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
if (this.id != undefined) {
@ -125,7 +124,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeUnPlannedReceiptJob(this.id).then(res => {
uni.navigateBack();
@ -221,17 +220,17 @@
this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
} 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) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"不在列表中")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" + "不在列表中")
} else {
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"已经扫描")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" + "已经扫描")
} else {
itemDetail.scaned = true;
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.labelQty = Number(result.label.qty);
calcHandleQty(this.detailSource);

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

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
从仓库代码 : {{requestContent.fromWarehouseCode}}
</view>
<view class='split_line'></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -59,7 +60,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
this.getDetail();
@ -92,11 +93,11 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
if(res.data.subList.length>0){
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList);
}else {
} else {
that.showMessage('列表数据为0');
}
}

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

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
到仓库代码 : {{requestContent.toWarehouseCode}}
</view>
<view class='split_line'></view>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">

Loading…
Cancel
Save