Browse Source

修改标题

wms3.0_pda
lijuncheng 1 year ago
parent
commit
3fee180576
  1. 2
      pages/count/job/countDetail.vue
  2. 2
      pages/customerReturn/job/returnDetail.vue
  3. 881
      pages/customerReturn/record/returnRecord.vue
  4. 2
      pages/customerReturn/request/customerReturnRequestDetail.vue
  5. 2
      pages/deliver/job/deliverDetail.vue
  6. 901
      pages/deliver/record/deliverRecord.vue
  7. 2
      pages/deliver/request/deliverRequestDetail.vue
  8. 8
      pages/inspect/coms/inspectComDetailCard.vue
  9. 12
      pages/inspect/job/inspectDetail.vue
  10. 1
      pages/inspect/request/inspectRequest.vue
  11. 2
      pages/inspect/request/inspectRequestDetail.vue
  12. 1
      pages/inventoryMove/job/inventoryMoveJob.vue
  13. 356
      pages/issue/record/issueRecord.vue
  14. 2
      pages/productPutaway/job/productPutawayDetail.vue
  15. 2
      pages/productPutaway/request/putawayRequestDetail.vue
  16. 2
      pages/productReceipt/job/productReceiptDetail.vue
  17. 2
      pages/productionReturn/job/returnDetail.vue
  18. 2
      pages/productionReturn/request/requestDetail.vue
  19. 1
      pages/purchaseReceipt/job/receiptDetail.vue
  20. 1
      pages/purchaseReturn/job/returnDetail.vue
  21. 6
      pages/purchaseReturn/record/returnRecord.vue
  22. 2
      pages/purchaseReturn/request/returnRequestDetail.vue
  23. 2
      pages/putaway/job/putawayDetail.vue
  24. 875
      pages/putaway/record/putawayRecord.vue
  25. 2
      pages/putaway/request/putawayRequestDetail.vue
  26. 2
      pages/repleinsh/job/repleinshDetail.vue
  27. 869
      pages/repleinsh/record/repleinshRecord.vue
  28. 855
      pages/scrap/record/scrapRecord.vue
  29. 2
      pages/scrap/request/scrapRequestDetail.vue
  30. 2
      pages/transfer/job/transferDetail.vue
  31. 2
      pages/unPlanned/job/receiptJobDetail.vue
  32. 10
      pages/unPlanned/record/issueRecord.vue
  33. 20
      pages/unPlanned/record/receiptRecord.vue
  34. 2
      pages/unPlanned/request/issueRequestDetail.vue
  35. 2
      pages/unPlanned/request/receiptRequestDetail.vue

2
pages/count/job/countDetail.vue

@ -47,7 +47,6 @@
import { import {
goHome, goHome,
updateTitle,
getPackingNumberAndBatch getPackingNumberAndBatch
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -164,7 +163,6 @@
that.fromLocationCode = that.jobContent.locationCode; that.fromLocationCode = that.jobContent.locationCode;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = that.getDataSource(that.detailList) that.detailSource = that.getDataSource(that.detailList)
updateTitle(that.jobContent.number);
} else { } else {
that.showErrorMessage('列表数据为0'); that.showErrorMessage('列表数据为0');
} }

2
pages/customerReturn/job/returnDetail.vue

@ -52,7 +52,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName, getInventoryStatusName,
@ -181,7 +180,6 @@
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
updateTitle(that.jobContent.number)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

881
pages/customerReturn/record/returnRecord.vue

@ -1,441 +1,440 @@
<!-- 收货任务详情 --> <!-- 收货任务详情 -->
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="page-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="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationTypeList="tolocationTypeList"></requiredLocation>
<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="">
</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>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
getBasicCustomerList getBasicCustomerList
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray getDirectoryItemArray
} from '@/common/directory.js'; } from '@/common/directory.js';
import { import {
goHome goHome,
} from '@/common/basic.js'; updateTitle
} from '@/common/basic.js';
import {
getBusinessType, import {
createItemInfo, getBusinessType,
createDetailInfo, createItemInfo,
calcHandleQty createDetailInfo,
} from '@/common/record.js'; calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: { export default {
winScanButton, components: {
winScanPack, winScanButton,
comReturnRecord, winScanPack,
requiredLocation, comReturnRecord,
comBlankView, requiredLocation,
winScanLocation, comBlankView,
comMessage, winScanLocation,
winScanPackAndLocation, comMessage,
recordComDetailCard winScanPackAndLocation,
}, recordComDetailCard
data() { },
return { data() {
id: '', return {
receiptJob: {}, id: '',
received: false, receiptJob: {},
isShowPackingCode: true, received: false,
scanCount: 0, isShowPackingCode: true,
jobContent: {}, // scanCount: 0,
detailList: [], //details jobContent: {}, //
detailSource: [], // detailList: [], //details
scrollTop: 0, detailSource: [], //
old: { scrollTop: 0,
scrollTop: 0 locationTypeList: [],
}, toLocationInfo: {},
locationTypeList: [], businessType: {},
toLocationInfo: {}, fromLocationInfo: {},
businessType: {}, fromLocationCode: "",
fromLocationInfo: {}, toLocationInfo: {},
fromLocationCode: "", toLocationCode: "",
toLocationInfo: {}, isShowLocation: false,
toLocationCode: "", fromlocationTypeList: [],
isShowLocation: false, tolocationTypeList: [],
fromlocationTypeList: [], allowModifyLocation: false,
tolocationTypeList: [], inInventoryStatus: "", //
allowModifyLocation: false, outInventoryStatus: "", //
inInventoryStatus: "", // fromType :""
outInventoryStatus: "", // };
fromType :"" },
}; onLoad(option) {
}, this.fromType = option.fromType
onLoad(option) { if(this.fromType=="requestType"){ updateTitle("客户退货申请") }else { updateTitle("客户退货记录") }
this.fromType = option.fromType var typeCode = "Customerreturn"
var typeCode = "Customerreturn" getBusinessType(typeCode, res => {
getBusinessType(typeCode, res => { if (res.success) {
if (res.success) { this.businessType = res.businessType;
this.businessType = res.businessType; this.fromlocationTypeList = res.fromlocationTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup();
this.showFromLocationPopup(); } else {
} else { this.$refs.comMessage.showBreakMessage(res.message );
this.$refs.comMessage.showBreakMessage(res.message ); }
} });
});
getBasicCustomerList().then(res => {
getBasicCustomerList().then(res => { if (res.data.length > 0) {
if (res.data.length > 0) { var list = res.data;
var list = res.data; list.forEach(item => {
list.forEach(item => { item.text = item.Name
item.text = item.Name item.value = item.Code
item.value = item.Code })
}) this.customerList = list;
this.customerList = list; }
} }).catch(error => {
}).catch(error => { this.showErrorMessage(error)
this.showErrorMessage(error) })
}) },
}, //
// onNavigationBarButtonTap(e) {
onNavigationBarButtonTap(e) { if (e.index === 0) {
if (e.index === 0) { goHome();
goHome(); }
} },
}, //
// onBackPress(e) {},
onBackPress(e) {},
onPullDownRefresh() {},
onPullDownRefresh() {},
mounted() {
mounted() {
},
}, methods: {
methods: { getScanResult(result) {
getScanResult(result) { let balance = result.balance;
let balance = result.balance; let label = result.label;
let label = result.label; let pack = result.package;
let pack = result.package; var item = this.detailSource.find(res => {
var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) {
if (res.itemCode == balance.itemCode) { return res
return res }
} })
}) if (item == undefined) {
if (item == undefined) { var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); //
let newDetail = createDetailInfo(balance, pack); // itemp.details.push(newDetail);
itemp.details.push(newDetail); this.detailSource.push(itemp)
this.detailSource.push(itemp) } else {
} else { var detail = item.details.find(r => {
var detail = item.details.find(r => { if (r.packingNumber == balance.packingNumber &&
if (r.packingNumber == balance.packingNumber && r.batch == balance.batch &&
r.batch == balance.batch && r.locationCode == balance.locationCode &&
r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
r.inventoryStatus == balance.inventoryStatus) { return r;
return r; }
} })
}) if (detail == undefined) {
if (detail == undefined) { let newDetail = createDetailInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); item.details.push(newDetail);
item.details.push(newDetail); } else {
} else { if (detail.scaned == true) {
if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") }
} }
} }
} this.calcHandleQty();
this.calcHandleQty();
},
},
showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
}, calcHandleQty() {
calcHandleQty() { calcHandleQty(this.detailSource)
calcHandleQty(this.detailSource) this.$forceUpdate();
this.$forceUpdate(); },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); },
}, removeItem(index, item) {
removeItem(index, item) { this.detailSource.splice(index, 1)
this.detailSource.splice(index, 1) },
}, removePack() {
removePack() { for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { var item = this.detailSource[i];
var item = this.detailSource[i]; if (item.details.length == 0) {
if (item.details.length == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} this.updateData();
this.updateData(); },
},
openScanPopup() {
openScanPopup() {
if (this.fromLocationCode == "") {
if (this.fromLocationCode == "") { this.showFromLocationPopup();
this.showFromLocationPopup(); return
return }
} this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); },
}, showFromLocationPopup() {
showFromLocationPopup() { this.$nextTick(() => {
this.$nextTick(() => { this.$refs.scanLocationCode.openScanPopup();
this.$refs.scanLocationCode.openScanPopup(); })
}) },
},
closeScanPopup() {
closeScanPopup() { this.$refs.scanPopup.closeScanPopup();
this.$refs.scanPopup.closeScanPopup(); },
},
scanPopupGetFocus() {
scanPopupGetFocus() { this.$refs.scanPopup.getfocus();
this.$refs.scanPopup.getfocus(); },
},
scanLocationCode(location, code) {
scanLocationCode(location, code) { this.toLocationCode = code
this.toLocationCode = code this.toLocationCode = location;
this.toLocationCode = location;
},
},
commit() {
commit() { if (this.toLocationCode == "") {
if (this.toLocationCode == "") { this.showMessage("请先选择目标库位")
this.showMessage("请先选择目标库位") return;
return; }
} //
// 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)) // (this.id, params).then(res => {
// (this.id, params).then(res => { // uni.hideLoading()
// uni.hideLoading() // if (res.data) {
// if (res.data) { // var hint = res.data.Number;
// var hint = res.data.Number; // this.showCommitSuccessMessage("" + hint, )
// this.showCommitSuccessMessage("" + hint, )
// } else {
// } else { // this.showErrorMessage("")
// this.showErrorMessage("") // }
// } // }).catch(error => {
// }).catch(error => { // uni.hideLoading()
// uni.hideLoading() // this.showErrorMessage(error)
// this.showErrorMessage(error) // })
// })
},
},
setParams() {
setParams() { var params = {
var params = { requestNumber: this.jobContent.requestNumber,
requestNumber: this.jobContent.requestNumber, jobNumber: "",
jobNumber: "", asnNumber: this.jobContent.asnNumber,
asnNumber: this.jobContent.asnNumber, ppNumber: this.jobContent.ppNumber,
ppNumber: this.jobContent.ppNumber, supplierCode: this.jobContent.supplierCode,
supplierCode: this.jobContent.supplierCode, ReceiptDock: this.jobContent.ReceiptDock,
ReceiptDock: this.jobContent.ReceiptDock, carrierCode: this.jobContent.carrierCode,
carrierCode: this.jobContent.carrierCode, transferMode: this.jobContent.transferMode,
transferMode: this.jobContent.transferMode, vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, fromWarehouseCode: this.toLocationInfo.WarehouseCode,
fromWarehouseCode: this.toLocationInfo.WarehouseCode, toWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode, OutTransaction: this.businessType.OutTransactionType, //
OutTransaction: this.businessType.OutTransactionType, // InTransaction: this.businessType.InTransactionType, //
InTransaction: this.businessType.InTransactionType, // executeTime: "2023-08-4 16:30:11", //
executeTime: "2023-08-4 16:30:11", // activeDate: "2023-08-4 16:30:11", //
activeDate: "2023-08-4 16:30:11", // available: "1", // 0,1
available: "1", // 0,1 requestTime: this.jobContent.requestTime,
requestTime: this.jobContent.requestTime, dueTime: "2023-08-4 16:30:11", //
dueTime: "2023-08-4 16:30:11", // departmentCode: this.jobContent.departmentCode,
departmentCode: this.jobContent.departmentCode, UserPositionCode: "", //
UserPositionCode: "", // interfaceType: "jklxPURCHASE_RECEIPT", //
interfaceType: "jklxPURCHASE_RECEIPT", // Number: this.jobContent.Number,
Number: this.jobContent.Number, businessType: this.jobContent.businessType,
businessType: this.jobContent.businessType, remark: this.jobContent.remark,
remark: this.jobContent.remark, creationTime: this.jobContent.creationTime,
creationTime: this.jobContent.creationTime, Creatorld: this.jobContent.Creatorld,
Creatorld: this.jobContent.Creatorld, creatorName: this.jobContent.creatorName,
creatorName: this.jobContent.creatorName, extraProperties: this.jobContent.extraProperties,
extraProperties: this.jobContent.extraProperties, Siteld: this.jobContent.Siteld,
Siteld: this.jobContent.Siteld, Code: "",
Code: "", details: [
details: [
],
], }
}
this.detailSource.forEach(res => {
this.detailSource.forEach(res => { res.details.forEach(res1 => {
res.details.forEach(res1 => { if (res1.scaned) {
if (res1.scaned) { res1.record.FromLocationGroupCode = "";
res1.record.FromLocationGroupCode = ""; res1.record.FromAreaCode = "";
res1.record.FromAreaCode = ""; res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; res1.record.VisualInspectResult = ""; //
res1.record.VisualInspectResult = ""; // res1.record.VisualInspectPhotos = ""; //
res1.record.VisualInspectPhotos = ""; // res1.record.FailedReason = ""; //
res1.record.FailedReason = ""; // res1.record.MassDefect = ""; //
res1.record.MassDefect = ""; // res1.record.SinglePrice = ""; //
res1.record.SinglePrice = ""; // res1.record.Amount = ""; //
res1.record.Amount = ""; // res1.record.Code = "";
res1.record.Code = ""; res1.record.JobDetailID = res1.record.id;
res1.record.JobDetailID = res1.record.id; res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; params.details.push(res1.record)
params.details.push(res1.record) }
} })
}) })
})
return params;
return params; },
},
showMessage(message) {
showMessage(message) { this.$refs.comMessage.showMessage(message, res => {
this.$refs.comMessage.showMessage(message, res => { if (res) {}
if (res) {} });
}); },
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
},
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(); },
}, getLocation(location, code) {
getLocation(location, code) { this.getFromLocationCode(location, code)
this.getFromLocationCode(location, code) },
}, getFromLocationCode(location, code) {
getFromLocationCode(location, code) { this.fromLocationInfo = location;
this.fromLocationInfo = location; this.fromLocationCode = code;
this.fromLocationCode = code; this.openScanPopup();
this.openScanPopup(); },
}, getToLocationCode(location, code) {
getToLocationCode(location, code) { if (this.fromLocationCode == code) {
if (this.fromLocationCode == code) { uni.showToast({
uni.showToast({ title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致", duration: 2000
duration: 2000 })
}) return
return }
} this.toLocationCodeInfo = location;
this.toLocationCodeInfo = location; this.toLocationCode = code;
this.toLocationCode = code; },
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.fromLocationCode = '';
this.fromLocationCode = '';
})
}) },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i];
let item = this.detailSource[i]; if (item.qty == 0) {
if (item.qty == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} }
} }
} }
} </script>
</script>
<style scoped lang="scss">
<style scoped lang="scss"> page {
page { width: 100%;
width: 100%; height: 100%;
height: 100%; background-color: #fff;
background-color: #fff; }
}
.page-wraper {
.page-wraper { display: flex;
display: flex; flex-direction: column;
flex-direction: column; width: 100%;
width: 100%; height: 100%;
height: 100%; }
}
.page-main {
.page-main { flex: 1;
flex: 1; position: relative;
position: relative; }
}
.page-main-scroll {
.page-main-scroll { position: absolute;
position: absolute; left: 0;
left: 0; right: 0;
right: 0; top: 0;
top: 0; bottom: 0;
bottom: 0; }
}
.page-main-list {
.page-main-list { /* height: 80rpx;
/* height: 80rpx; line-height: 80rpx; */
line-height: 80rpx; */ text-align: center;
text-align: center; background: #e0e0e0;
background: #e0e0e0;
}
} </style>
</style>

2
pages/customerReturn/request/customerReturnRequestDetail.vue

@ -26,7 +26,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -88,7 +87,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/deliver/job/deliverDetail.vue

@ -58,7 +58,6 @@
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch getPackingNumberAndBatch
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -180,7 +179,6 @@
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.detailList) that.detailSource = getDataSource(that.detailList)
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
updateTitle(that.jobContent.number)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

901
pages/deliver/record/deliverRecord.vue

@ -1,451 +1,450 @@
<!-- 收货任务详情 --> <!-- 收货任务详情 -->
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="page-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="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="uni-flex uni-row u-col-center" style="width: 100%;"> <view class="uni-flex uni-row u-col-center" style="width: 100%;">
<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 10rpx;"> <view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 10rpx;">
客户 : 客户 :
</view> </view>
<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;" <uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
class='uni-data-picker' placeholder="请选择客户" popup-title="选择客户" :localdata="customerList" class='uni-data-picker' placeholder="请选择客户" popup-title="选择客户" :localdata="customerList"
v-model="customer"> v-model="customer">
</uni-data-picker> </uni-data-picker>
</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="">
</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>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
getBasicCustomerList getBasicCustomerList
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
getInventoryStatusDesc, updateTitle,
getDirectoryItemArray getInventoryStatusDesc,
} from '@/common/basic.js'; getDirectoryItemArray
} from '@/common/basic.js';
import {
getBusinessType, import {
createItemInfo, getBusinessType,
createDetailInfo, createItemInfo,
calcHandleQty createDetailInfo,
} from '@/common/record.js'; calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: { export default {
winScanButton, components: {
winScanPack, winScanButton,
requiredLocation, winScanPack,
comBlankView, requiredLocation,
winScanLocation, comBlankView,
comMessage, winScanLocation,
winScanPackAndLocation, comMessage,
recordComDetailCard winScanPackAndLocation,
}, recordComDetailCard
data() { },
return { data() {
id: '', return {
receiptJob: {}, id: '',
received: false, receiptJob: {},
isShowPackingCode: true, received: false,
scanCount: 0, isShowPackingCode: true,
jobContent: {}, // scanCount: 0,
detailList: [], //details jobContent: {}, //
detailSource: [], // detailList: [], //details
scrollTop: 0, detailSource: [], //
old: { scrollTop: 0,
scrollTop: 0 locationTypeList: [],
}, toLocationInfo: {},
locationTypeList: [], businessTypeInfo: {},
toLocationInfo: {}, fromLocationInfo: {},
businessTypeInfo: {}, fromLocationCode: "",
fromLocationInfo: {}, toLocationInfo: {},
fromLocationCode: "", toLocationCode: "",
toLocationInfo: {}, isShowLocation: false,
toLocationCode: "", fromlocationTypeList: [],
isShowLocation: false, tolocationTypeList: [],
fromlocationTypeList: [], allowModifyLocation: false,
tolocationTypeList: [], inInventoryStatus: "", //
allowModifyLocation: false, outInventoryStatus: "", //
inInventoryStatus: "", // businessType: {},
outInventoryStatus: "", // customerList: [],
businessType: {}, customer: "",
customerList: [], fromType:""
customer: "", };
fromType:"" },
}; onLoad(option) {
}, this.fromType = option.fromType
onLoad(option) { if(this.fromType=="requestType"){ updateTitle("制品发货申请") }else { updateTitle("制品发货记录") }
this.fromType = option.fromType var typeCode = "Deliver"
var typeCode = "Deliver" getBusinessType(typeCode, res => {
getBusinessType(typeCode, res => { if (res.success) {
if (res.success) { this.businessType = res.businessType;
this.businessType = res.businessType; this.fromlocationTypeList = res.fromlocationTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup();
this.showFromLocationPopup(); } else {
} else { this.$refs.comMessage.showBreakMessage(res.message );
this.$refs.comMessage.showBreakMessage(res.message ); }
} });
});
getBasicCustomerList().then(res => {
getBasicCustomerList().then(res => { if (res.data.length > 0) {
if (res.data.length > 0) { var list = res.data;
var list = res.data; list.forEach(item => {
list.forEach(item => { item.text = item.name
item.text = item.name item.value = item.code
item.value = item.code })
}) this.customerList = list;
this.customerList = list; }
} }).catch(error => {
}).catch(error => { this.showErrorMessage(error)
this.showErrorMessage(error) })
}) },
}, //
// onNavigationBarButtonTap(e) {
onNavigationBarButtonTap(e) { if (e.index === 0) {
if (e.index === 0) { goHome();
goHome(); }
} },
}, //
// onBackPress(e) {},
onBackPress(e) {},
onPullDownRefresh() {},
onPullDownRefresh() {},
mounted() {
mounted() { },
}, methods: {
methods: { getScanResult(result) {
getScanResult(result) { let balance = result.balance;
let balance = result.balance; let label = result.label;
let label = result.label; let pack = result.package;
let pack = result.package; var item = this.detailSource.find(res => {
var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) {
if (res.itemCode == balance.itemCode) { return res
return res }
} })
}) if (item == undefined) {
if (item == undefined) { var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); //
let newDetail = createDetailInfo(balance, pack); // itemp.details.push(newDetail);
itemp.details.push(newDetail); this.detailSource.push(itemp)
this.detailSource.push(itemp) } else {
} else { var detail = item.details.find(r => {
var detail = item.details.find(r => { if (r.packingNumber == balance.packingNumber &&
if (r.packingNumber == balance.packingNumber && r.batch == balance.batch &&
r.batch == balance.batch && r.locationCode == balance.locationCode &&
r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
r.inventoryStatus == balance.inventoryStatus) { return r;
return r; }
} })
}) if (detail == undefined) {
if (detail == undefined) { let newDetail =createDetailInfo(balance, pack);
let newDetail =createDetailInfo(balance, pack); item.details.push(newDetail);
item.details.push(newDetail); } else {
} else { if (detail.scaned == true) {
if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") }
} }
} }
} this.calcHandleQty();
this.calcHandleQty();
},
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
}, calcHandleQty() {
calcHandleQty() { calcHandleQty(this.detailSource);
calcHandleQty(this.detailSource); this.$forceUpdate();
this.$forceUpdate(); },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); },
}, removeItem(index, item) {
removeItem(index, item) { this.detailSource.splice(index, 1)
this.detailSource.splice(index, 1) },
}, removePack() {
removePack() { for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { var item = this.detailSource[i];
var item = this.detailSource[i]; if (item.details.length == 0) {
if (item.details.length == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} this.updateData();
this.updateData(); },
},
openScanPopup() {
openScanPopup() {
if (this.fromLocationCode == "") {
if (this.fromLocationCode == "") { this.showFromLocationPopup();
this.showFromLocationPopup(); return
return }
} this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); },
}, showFromLocationPopup() {
showFromLocationPopup() { this.$nextTick(() => {
this.$nextTick(() => { this.$refs.scanLocationCode.openScanPopup();
this.$refs.scanLocationCode.openScanPopup(); })
}) },
},
closeScanPopup() {
closeScanPopup() { this.$refs.scanPopup.closeScanPopup();
this.$refs.scanPopup.closeScanPopup(); },
},
scanPopupGetFocus() {
scanPopupGetFocus() { this.$refs.scanPopup.getfocus();
this.$refs.scanPopup.getfocus(); },
},
scanLocationCode(location, code) {
scanLocationCode(location, code) { this.toLocationCode = code
this.toLocationCode = code this.toLocationCode = location;
this.toLocationCode = location;
},
},
commit() {
commit() { if (this.customer == "") {
if (this.customer == "") { this.showMessage("请先选择客户")
this.showMessage("请先选择客户") return;
return; }
} console.log("客户", this.customer)
console.log("客户", this.customer) if (this.toLocationCode == "") {
if (this.toLocationCode == "") { this.showMessage("请先选择目标库位")
this.showMessage("请先选择目标库位") return;
return; }
} //
// 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)) // (this.id, params).then(res => {
// (this.id, params).then(res => { // uni.hideLoading()
// uni.hideLoading() // if (res.data) {
// if (res.data) { // var hint = res.data.Number;
// var hint = res.data.Number; // this.showCommitSuccessMessage("" + hint, )
// this.showCommitSuccessMessage("" + hint, )
// } else {
// } else { // this.showErrorMessage("")
// this.showErrorMessage("") // }
// } // }).catch(error => {
// }).catch(error => { // uni.hideLoading()
// uni.hideLoading() // this.showErrorMessage(error)
// this.showErrorMessage(error) // })
// })
},
},
setParams() {
setParams() { var params = {
var params = { requestNumber: this.jobContent.requestNumber,
requestNumber: this.jobContent.requestNumber, jobNumber: "",
jobNumber: "", asnNumber: this.jobContent.asnNumber,
asnNumber: this.jobContent.asnNumber, ppNumber: this.jobContent.ppNumber,
ppNumber: this.jobContent.ppNumber, supplierCode: this.jobContent.supplierCode,
supplierCode: this.jobContent.supplierCode, receiptDock: this.jobContent.receiptDock,
receiptDock: this.jobContent.receiptDock, carrierCode: this.jobContent.carrierCode,
carrierCode: this.jobContent.carrierCode, transferMode: this.jobContent.transferMode,
transferMode: this.jobContent.transferMode, vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, fromWarehouseCode: this.toLocationInfo.WarehouseCode,
fromWarehouseCode: this.toLocationInfo.WarehouseCode, toWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode, OutTransaction: this.businessTypeInfo.OutTransactionType, //
OutTransaction: this.businessTypeInfo.OutTransactionType, // InTransaction: this.businessTypeInfo.InTransactionType, //
InTransaction: this.businessTypeInfo.InTransactionType, // executeTime: "2023-08-4 16:30:11", //
executeTime: "2023-08-4 16:30:11", // activeDate: "2023-08-4 16:30:11", //
activeDate: "2023-08-4 16:30:11", // available: "1", // 0,1
available: "1", // 0,1 requestTime: this.jobContent.requestTime,
requestTime: this.jobContent.requestTime, dueTime: "2023-08-4 16:30:11", //
dueTime: "2023-08-4 16:30:11", // departmentCode: this.jobContent.departmentCode,
departmentCode: this.jobContent.departmentCode, UserPositionCode: "", //
UserPositionCode: "", // interfaceType: "jklxPURCHASE_RECEIPT", //
interfaceType: "jklxPURCHASE_RECEIPT", // Number: this.jobContent.Number,
Number: this.jobContent.Number, businessType: this.jobContent.businessType,
businessType: this.jobContent.businessType, remark: this.jobContent.remark,
remark: this.jobContent.remark, creationTime: this.jobContent.creationTime,
creationTime: this.jobContent.creationTime, Creatorld: this.jobContent.Creatorld,
Creatorld: this.jobContent.Creatorld, creatorName: this.jobContent.creatorName,
creatorName: this.jobContent.creatorName, extraProperties: this.jobContent.extraProperties,
extraProperties: this.jobContent.extraProperties, Siteld: this.jobContent.Siteld,
Siteld: this.jobContent.Siteld, Code: "",
Code: "", details: [
details: [
],
], }
}
this.detailSource.forEach(res => {
this.detailSource.forEach(res => { res.details.forEach(res1 => {
res.details.forEach(res1 => { if (res1.scaned) {
if (res1.scaned) { res1.record.FromLocationGroupCode = "";
res1.record.FromLocationGroupCode = ""; res1.record.FromAreaCode = "";
res1.record.FromAreaCode = ""; res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; res1.record.VisualInspectResult = ""; //
res1.record.VisualInspectResult = ""; // res1.record.VisualInspectPhotos = ""; //
res1.record.VisualInspectPhotos = ""; // res1.record.FailedReason = ""; //
res1.record.FailedReason = ""; // res1.record.MassDefect = ""; //
res1.record.MassDefect = ""; // res1.record.SinglePrice = ""; //
res1.record.SinglePrice = ""; // res1.record.Amount = ""; //
res1.record.Amount = ""; // res1.record.Code = "";
res1.record.Code = ""; res1.record.JobDetailID = res1.record.id;
res1.record.JobDetailID = res1.record.id; res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; params.details.push(res1.record)
params.details.push(res1.record) }
} })
}) })
})
return params;
return params; },
},
showMessage(message) {
showMessage(message) { this.$refs.comMessage.showMessage(message, res => {
this.$refs.comMessage.showMessage(message, res => { if (res) {}
if (res) {} });
}); },
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
},
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(); },
}, getLocation(location, code) {
getLocation(location, code) { this.getFromLocationCode(location, code)
this.getFromLocationCode(location, code) },
}, getFromLocationCode(location, code) {
getFromLocationCode(location, code) { this.fromLocationInfo = location;
this.fromLocationInfo = location; this.fromLocationCode = code;
this.fromLocationCode = code; this.openScanPopup();
this.openScanPopup(); },
}, getToLocationCode(location, code) {
getToLocationCode(location, code) { if (this.fromLocationCode == code) {
if (this.fromLocationCode == code) { uni.showToast({
uni.showToast({ title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致", duration: 2000
duration: 2000 })
}) return
return }
} this.ToLocationCodeInfo = location;
this.ToLocationCodeInfo = location; this.toLocationCode = code;
this.toLocationCode = code; },
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.fromLocationCode = '';
this.fromLocationCode = '';
})
}) },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i];
let item = this.detailSource[i]; if (item.qty == 0) {
if (item.qty == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} }
} }
} }
} </script>
</script>
<style scoped lang="scss">
<style scoped lang="scss"> page {
page { width: 100%;
width: 100%; height: 100%;
height: 100%; background-color: #fff;
background-color: #fff; }
}
.page-wraper {
.page-wraper { display: flex;
display: flex; flex-direction: column;
flex-direction: column; width: 100%;
width: 100%; height: 100%;
height: 100%; }
}
.page-main {
.page-main { flex: 1;
flex: 1; position: relative;
position: relative; }
}
.page-main-scroll {
.page-main-scroll { position: absolute;
position: absolute; left: 0;
left: 0; right: 0;
right: 0; top: 0;
top: 0; bottom: 0;
bottom: 0; }
}
.page-main-list {
.page-main-list { /* height: 80rpx;
/* height: 80rpx; line-height: 80rpx; */
line-height: 80rpx; */ text-align: center;
text-align: center; background: #e0e0e0;
background: #e0e0e0;
}
} </style>
</style>

2
pages/deliver/request/deliverRequestDetail.vue

@ -25,7 +25,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -90,7 +89,6 @@
res.fromLocationCode = res.toLocationCode res.fromLocationCode = res.toLocationCode
}) })
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

8
pages/inspect/coms/inspectComDetailCard.vue

@ -16,7 +16,7 @@
:right-options="item.scaned?scanOptions:detailOptions"> :right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :record="item.record" :isShowPack="isShowPack" <recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
:isShowBatch="isShowBatch" :isShowLocation="isShowLocation"></recommend> :isShowBatch="isShowBatch" :isShowLocation="isShowLocation"></recommend>
<view :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;"> <view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
<view class="" > <view class="" >
不合格数量 {{item.failedQty}} 不合格数量 {{item.failedQty}}
</view> </view>
@ -149,6 +149,7 @@
item.notPassedQty = 0; item.notPassedQty = 0;
item.inspectResult ="" item.inspectResult =""
item.failedReason ="" item.failedReason =""
item.photos =""
this.$forceUpdate() this.$forceUpdate()
this.$emit('remove', item) this.$emit('remove', item)
} }
@ -159,6 +160,11 @@
}, },
getInspectResult(result){ getInspectResult(result){
this.dataContent.details[this.editIndex]= result; this.dataContent.details[this.editIndex]= result;
if (this.$refs.collapse1 != undefined) {
this.$nextTick(res => {
this.$refs.collapse1.resize()
})
}
this.$emit('updateData',) this.$emit('updateData',)
} }

12
pages/inspect/job/inspectDetail.vue

@ -83,10 +83,6 @@
jobContent: {}, // jobContent: {}, //
detailList: [], //details detailList: [], //details
detailSource: [], // detailSource: [], //
scrollTop: 0,
old: {
scrollTop: 0
},
toLocationInfo: {}, toLocationInfo: {},
businessTypeInfo: {}, businessTypeInfo: {},
locationTypeList: [], locationTypeList: [],
@ -177,13 +173,14 @@
that.jobContent = res.data; that.jobContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailList.forEach(res => { that.detailList.forEach(res => {
res.batch =that.jobContent.batch
res.goodQty = 0; res.goodQty = 0;
res.failedQty = 0; res.failedQty = 0;
res.crackQty = 0; res.crackQty = 0;
res.sampleQty = 0; res.sampleQty = 0;
res.notPassedQty = 0; res.notPassedQty = 0;
res.failedReason =""; res.failedReason ="";
res.photos="" res.photos = ""
res.inspectResult ="" res.inspectResult =""
}) })
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
@ -401,11 +398,6 @@
}, },
scroll: function(e) {
// console.log(e)
this.old.scrollTop = e.datacontent.scrollTop;
},
closeCommitMessage() { closeCommitMessage() {
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateTo({

1
pages/inspect/request/inspectRequest.vue

@ -180,6 +180,7 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
this.loadingType = ""; this.loadingType = "";
updateTitle("检验单申请");
uni.hideLoading(); uni.hideLoading();
that.showMessage(error) that.showMessage(error)
}) })

2
pages/inspect/request/inspectRequestDetail.vue

@ -36,7 +36,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -102,7 +101,6 @@
// res.packingNumber =res.toPackingNumber // res.packingNumber =res.toPackingNumber
// res.batch =res.fromBatch // res.batch =res.fromBatch
// }) // })
updateTitle(this.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

1
pages/inventoryMove/job/inventoryMoveJob.vue

@ -159,6 +159,7 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
this.loadingType = ""; this.loadingType = "";
updateTitle("库存转移");
uni.hideLoading(); uni.hideLoading();
that.showMessage(error) that.showMessage(error)
}) })

356
pages/issue/record/issueRecord.vue

@ -1,178 +1,178 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="" v-if='detailSource.length==0'> <view class="" v-if='detailSource.length==0'>
<com-blank-view @goScan='goScan()'></com-blank-view> <com-blank-view @goScan='goScan()'></com-blank-view>
</view> </view>
<view v-else class="page-wraper"> <view v-else class="page-wraper">
<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">
<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" <com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
@updateData='updateData'> @updateData='updateData'>
</com-issue-detail-card> </com-issue-detail-card>
</view> </view>
</scroll-view> </scroll-view>
<button class="btn_add" @click="goScan()">+去添加</button> <button class="btn_add" @click="goScan()">+去添加</button>
</view> </view>
<div class="btn_bottom"> <div class="btn_bottom">
<view class="" style="display: flex;flex-direction: row;"> <view class="" style="display: flex;flex-direction: row;">
<view class=""> <view class="">
<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button> <button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
</view> </view>
</view> </view>
</div> </div>
<win-scan-button @goScan='openScanDetailPopup'></win-scan-button> <win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScanPopup' @updateData='updateData'> <com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScanPopup' @updateData='updateData'>
</com-scan-issue-pack> </com-scan-issue-pack>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</view> </view>
<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup> <com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
</template> </template>
<script> <script>
// import { // import {
// getIssueJobDetail, // getIssueJobDetail,
// } from '@/api/request.js'; // } from '@/api/request.js';
import { import {
goHome, goHome,
getRemoveOption, getRemoveOption,
getISODateTime getISODateTime
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getDataSource getDataSource
} from '@/pages/issue/js/issue.js'; } from '@/pages/issue/js/issue.js';
import comBlankView from '@/mycomponents/common/comBlankView.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue' import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
export default { export default {
name: 'issueDetail', name: 'issueDetail',
components: { components: {
comBlankView, comBlankView,
comIssueRequestPopup, comIssueRequestPopup,
jobDetailPopup, jobDetailPopup,
winScanButton, winScanButton,
comIssueDetailCard, comIssueDetailCard,
comScanIssuePack, comScanIssuePack,
comMessage comMessage
}, },
data() { data() {
return { return {
id: '1689889453461090304', id: '1689889453461090304',
jobContent: {}, // jobContent: {}, //
detailList: [], //details detailList: [], //details
detailSource: [], // detailSource: [], //
detailOptions: [], detailOptions: [],
scanOptions: [], scanOptions: [],
requestList: [] ,// requestList: [] ,//
fromType:"" fromType:""
} }
}, },
mounted() { mounted() {
this.goScan() this.goScan()
}, },
onLoad(option) { onLoad(option) {
debugger this.fromType = option.fromType
this.fromType = option.fromType if(this.fromType=="requestType"){ updateTitle("发料申请") }else { updateTitle("发料记录") }
}, },
methods: { methods: {
goScan() { goScan() {
this.$refs.comIssueRequestPopup.openRequestPopup(this.detailSource[0]); this.$refs.comIssueRequestPopup.openRequestPopup(this.detailSource[0]);
}, },
// //
requestConfirm(action, item) { requestConfirm(action, item) {
// //
this.getDetail(action, item); this.getDetail(action, item);
}, },
getDetail(action, item) { getDetail(action, item) {
var that = this; var that = this;
uni.showLoading({ uni.showLoading({
title: "加载中....", title: "加载中....",
mask: true mask: true
}); });
getIssueJobDetail(this.id).then(res => { getIssueJobDetail(this.id).then(res => {
if (res.data[0].details.length > 0) { if (res.data[0].details.length > 0) {
that.detailList = res.data[0].details; that.detailList = res.data[0].details;
if (action == 'update') //, if (action == 'update') //,
{ {
let index = that.detailSource[0].Items.findIndex(r => r.itemCode == item.itemCode); let index = that.detailSource[0].Items.findIndex(r => r.itemCode == item.itemCode);
if (index >= 0) { if (index >= 0) {
that.detailSource[0].Items.splice(index, 1); that.detailSource[0].Items.splice(index, 1);
} }
} }
that.detailSource = getDataSource(that.detailSource, that.detailList) that.detailSource = getDataSource(that.detailSource, that.detailList)
that.resizeCollapse(); that.resizeCollapse();
} }
uni.hideLoading(); uni.hideLoading();
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
}, },
updateData(record) { updateData(record) {
let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode); let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
let item = requestLocation.Items.find(r => r.itemCode == record.itemCode); let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
let itemHandleQty = 0; let itemHandleQty = 0;
if (item != undefined) { if (item != undefined) {
item.Locations.forEach(l => { item.Locations.forEach(l => {
let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
.packingNumber == '') && b.batch == .packingNumber == '') && b.batch ==
record.batch); record.batch);
let handleQty = 0; let handleQty = 0;
batch.Records.forEach(res => { batch.Records.forEach(res => {
handleQty += Number(res.qty) handleQty += Number(res.qty)
}) })
batch.handleQty = handleQty; batch.handleQty = handleQty;
itemHandleQty += handleQty; itemHandleQty += handleQty;
}) })
} }
// item.handleQty=itemHandleQty; // item.handleQty=itemHandleQty;
}, },
openScanDetailPopup() { openScanDetailPopup() {
var datacontent = {} var datacontent = {}
// //
// Object.assign(datacontent, this.detailSource); // Object.assign(datacontent, this.detailSource);
this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
}, },
closeScanPopup() { closeScanPopup() {
this.resizeCollapse(); this.resizeCollapse();
}, },
resizeCollapse() { resizeCollapse() {
this.$nextTick(r => { this.$nextTick(r => {
this.$refs.comIssueDetailCard.forEach(r => { this.$refs.comIssueDetailCard.forEach(r => {
r.resizeCollapse(); r.resizeCollapse();
}) })
}); });
}, },
submit(){ submit(){
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
}else { }else {
} }
} }
} }
} }
</script> </script>
<style> <style>
</style> </style>

2
pages/productPutaway/job/productPutawayDetail.vue

@ -54,7 +54,6 @@
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName, getInventoryStatusName,
@ -179,7 +178,6 @@
that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.detailList) that.detailSource = getDataSource(that.detailList)
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
updateTitle(that.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/productPutaway/request/putawayRequestDetail.vue

@ -25,7 +25,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -87,7 +86,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/productReceipt/job/productReceiptDetail.vue

@ -48,7 +48,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -181,7 +180,6 @@
that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes); that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes);
that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.detailList) that.detailSource = getDataSource(that.detailList)
updateTitle(that.jobContent.number)
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/productionReturn/job/returnDetail.vue

@ -45,7 +45,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch getPackingNumberAndBatch
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -184,7 +183,6 @@
that.fromLocationCode = that.detailList[0].fromLocationCode that.fromLocationCode = that.detailList[0].fromLocationCode
that.toLocationCode = that.detailList[0].toLocationCode that.toLocationCode = that.detailList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
updateTitle(that.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/productionReturn/request/requestDetail.vue

@ -24,7 +24,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -86,7 +85,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

1
pages/purchaseReceipt/job/receiptDetail.vue

@ -46,7 +46,6 @@
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
} from '@/common/basic.js'; } from '@/common/basic.js';

1
pages/purchaseReturn/job/returnDetail.vue

@ -54,7 +54,6 @@
goHome, goHome,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusName getInventoryStatusName

6
pages/purchaseReturn/record/returnRecord.vue

@ -45,6 +45,7 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -97,6 +98,11 @@
onLoad(option) { onLoad(option) {
this.fromType = option.fromType this.fromType = option.fromType
if(this.fromType=="requestType"){
updateTitle("采购退货申请")
}else {
updateTitle("采购退货记录")
}
var typeCode = "PurchaseReturn" var typeCode = "PurchaseReturn"
getBusinessType(typeCode, res => { getBusinessType(typeCode, res => {
if (res.success) { if (res.success) {

2
pages/purchaseReturn/request/returnRequestDetail.vue

@ -25,7 +25,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -90,7 +89,6 @@
res.fromLocationCode = res.toLocationCode res.fromLocationCode = res.toLocationCode
}) })
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/putaway/job/putawayDetail.vue

@ -51,7 +51,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -181,7 +180,6 @@
that.toLocationCode = that.detailList[0].toLocationCode that.toLocationCode = that.detailList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
updateTitle(this.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');

875
pages/putaway/record/putawayRecord.vue

@ -1,438 +1,437 @@
<!-- 收货任务详情 --> <!-- 收货任务详情 -->
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="page-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="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationTypeList="tolocationTypeList"></requiredLocation>
<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="">
</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>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
goHome, goHome,
} from '@/common/basic.js'; updateTitle
import { } from '@/common/basic.js';
getInventoryStatusDesc, import {
getDirectoryItemArray getInventoryStatusDesc,
} from '@/common/directory.js'; getDirectoryItemArray
} from '@/common/directory.js';
import {
getDetailOption, import {
getDetailRemoveOption, getDetailOption,
getDetailEditRemoveOption getDetailRemoveOption,
} from '@/common/array.js'; getDetailEditRemoveOption
} from '@/common/array.js';
import {
getBusinessType, import {
createItemInfo, getBusinessType,
createDetailInfo, createItemInfo,
calcHandleQty createDetailInfo,
} from '@/common/record.js'; calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: { export default {
winScanButton, components: {
winScanPack, winScanButton,
requiredLocation, winScanPack,
comBlankView, requiredLocation,
winScanLocation, comBlankView,
comMessage, winScanLocation,
winScanPackAndLocation, comMessage,
recordComDetailCard winScanPackAndLocation,
}, recordComDetailCard
data() { },
return { data() {
id: '', return {
receiptJob: {}, id: '',
received: false, receiptJob: {},
isShowPackingCode: true, received: false,
scanCount: 0, isShowPackingCode: true,
jobContent: {}, // scanCount: 0,
detailList: [], //details jobContent: {}, //
detailSource: [], // detailList: [], //details
scrollTop: 0, detailSource: [], //
old: { scrollTop: 0,
scrollTop: 0 locationTypeList: [],
}, toLocationInfo: {},
locationTypeList: [], businessTypeInfo: {},
toLocationInfo: {}, fromLocationInfo: {},
businessTypeInfo: {}, fromLocationCode: "",
fromLocationInfo: {}, toLocationInfo: {},
fromLocationCode: "", toLocationCode: "",
toLocationInfo: {}, isShowLocation: false,
toLocationCode: "", fromlocationTypeList: [],
isShowLocation: false, tolocationTypeList: [],
fromlocationTypeList: [], allowModifyLocation: false,
tolocationTypeList: [], inInventoryStatus: "", //
allowModifyLocation: false, outInventoryStatus: "", //
inInventoryStatus: "", // businessType: {},
outInventoryStatus: "", // fromType: ""
businessType: {}, };
fromType: "" },
}; onLoad(option) {
}, this.fromType = option.fromType
onLoad(option) { if(this.fromType=="requestType"){ updateTitle("采购上架申请") }else { updateTitle("采购上架记录") }
this.fromType = option.fromType var typeCode = "PurchasePutaway"
var typeCode = "PurchasePutaway" getBusinessType(typeCode, res => {
getBusinessType(typeCode, res => { if (res.success) {
if (res.success) { this.businessType = res.businessType;
this.businessType = res.businessType; this.fromlocationTypeList = res.fromlocationTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup();
this.showFromLocationPopup(); } else {
} else { this.$refs.comMessage.showBreakMessage(res.message );
this.$refs.comMessage.showBreakMessage(res.message ); }
} });
}); },
}, //
// onNavigationBarButtonTap(e) {
onNavigationBarButtonTap(e) { if (e.index === 0) {
if (e.index === 0) { goHome();
goHome(); }
} },
}, //
// onBackPress(e) {},
onBackPress(e) {},
onPullDownRefresh() {},
onPullDownRefresh() {},
mounted() {
mounted() { },
}, methods: {
methods: { getScanResult(result) {
getScanResult(result) { let balance = result.balance;
let balance = result.balance; let label = result.label;
let label = result.label; let pack = result.package;
let pack = result.package; var item = this.detailSource.find(res => {
var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) {
if (res.itemCode == balance.itemCode) { return res
return res }
} })
}) if (item == undefined) {
if (item == undefined) { var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); //
let newDetail = createDetailInfo(balance, pack); // itemp.details.push(newDetail);
itemp.details.push(newDetail); this.detailSource.push(itemp)
this.detailSource.push(itemp) } else {
} else { var detail = item.details.find(r => {
var detail = item.details.find(r => { if (r.packingNumber == balance.packingNumber &&
if (r.packingNumber == balance.packingNumber && r.batch == balance.batch &&
r.batch == balance.batch && r.locationCode == balance.locationCode &&
r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
r.inventoryStatus == balance.inventoryStatus) { return r;
return r; }
} })
}) if (detail == undefined) {
if (detail == undefined) { let newDetail = createDetailInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); item.details.push(newDetail);
item.details.push(newDetail); } else {
} else { if (detail.scaned == true) {
if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") }
} }
} }
} this.calcHandleQty();
this.calcHandleQty();
},
},
showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
}, calcHandleQty() {
calcHandleQty() { for (let item of this.detailSource) {
for (let item of this.detailSource) { item.qty = 0;
item.qty = 0; for (let detail of item.details) {
for (let detail of item.details) { if (detail != undefined) {
if (detail != undefined) { item.qty += Number(detail.qty)
item.qty += Number(detail.qty) }
} }
} }
} this.$forceUpdate();
this.$forceUpdate(); },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); },
}, removeItem(index, item) {
removeItem(index, item) { this.detailSource.splice(index, 1)
this.detailSource.splice(index, 1) },
},
removePack() {
removePack() { for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { var item = this.detailSource[i];
var item = this.detailSource[i]; if (item.details.length == 0) {
if (item.details.length == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} this.updateData();
this.updateData(); },
},
openScanPopup() {
openScanPopup() { if (this.fromLocationCode == "") {
if (this.fromLocationCode == "") { this.showFromLocationPopup();
this.showFromLocationPopup(); return
return }
} this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); },
}, showFromLocationPopup() {
showFromLocationPopup() { this.$nextTick(() => {
this.$nextTick(() => { this.$refs.scanLocationCode.openScanPopup();
this.$refs.scanLocationCode.openScanPopup(); })
})
},
}, closeScanPopup() {
closeScanPopup() { this.$refs.scanPopup.closeScanPopup();
this.$refs.scanPopup.closeScanPopup(); },
},
scanPopupGetFocus() {
scanPopupGetFocus() { this.$refs.scanPopup.getfocus();
this.$refs.scanPopup.getfocus(); },
},
scanLocationCode(location, code) {
scanLocationCode(location, code) { this.toLocationCode = code
this.toLocationCode = code this.toLocationCode = location;
this.toLocationCode = location;
},
},
commit() {
commit() { if (this.toLocationCode == "") {
if (this.toLocationCode == "") { this.showMessage("请先选择目标库位")
this.showMessage("请先选择目标库位") return;
return; }
} //
// 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)) if(this.fromType=="requestType"){
if(this.fromType=="requestType"){
}else {
}else {
}
} // (this.id, params).then(res => {
// (this.id, params).then(res => { // uni.hideLoading()
// uni.hideLoading() // if (res.data) {
// if (res.data) { // var hint = res.data.Number;
// var hint = res.data.Number; // this.showCommitSuccessMessage("" + hint, )
// this.showCommitSuccessMessage("" + hint, )
// } else {
// } else { // this.showErrorMessage("")
// this.showErrorMessage("") // }
// } // }).catch(error => {
// }).catch(error => { // uni.hideLoading()
// uni.hideLoading() // this.showErrorMessage(error)
// this.showErrorMessage(error) // })
// })
},
},
setParams() {
setParams() { var params = {
var params = { requestNumber: this.jobContent.requestNumber,
requestNumber: this.jobContent.requestNumber, jobNumber: "",
jobNumber: "", asnNumber: this.jobContent.asnNumber,
asnNumber: this.jobContent.asnNumber, ppNumber: this.jobContent.ppNumber,
ppNumber: this.jobContent.ppNumber, supplierCode: this.jobContent.supplierCode,
supplierCode: this.jobContent.supplierCode, ReceiptDock: this.jobContent.ReceiptDock,
ReceiptDock: this.jobContent.ReceiptDock, carrierCode: this.jobContent.carrierCode,
carrierCode: this.jobContent.carrierCode, transferMode: this.jobContent.transferMode,
transferMode: this.jobContent.transferMode, vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, fromWarehouseCode: this.toLocationInfo.WarehouseCode,
fromWarehouseCode: this.toLocationInfo.WarehouseCode, toWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode, OutTransaction: this.businessTypeInfo.OutTransactionType, //
OutTransaction: this.businessTypeInfo.OutTransactionType, // InTransaction: this.businessTypeInfo.InTransactionType, //
InTransaction: this.businessTypeInfo.InTransactionType, // executeTime: "2023-08-4 16:30:11", //
executeTime: "2023-08-4 16:30:11", // activeDate: "2023-08-4 16:30:11", //
activeDate: "2023-08-4 16:30:11", // available: "1", // 0,1
available: "1", // 0,1 requestTime: this.jobContent.requestTime,
requestTime: this.jobContent.requestTime, dueTime: "2023-08-4 16:30:11", //
dueTime: "2023-08-4 16:30:11", // departmentCode: this.jobContent.departmentCode,
departmentCode: this.jobContent.departmentCode, UserPositionCode: "", //
UserPositionCode: "", // interfaceType: "jklxPURCHASE_RECEIPT", //
interfaceType: "jklxPURCHASE_RECEIPT", // Number: this.jobContent.Number,
Number: this.jobContent.Number, businessType: this.jobContent.businessType,
businessType: this.jobContent.businessType, remark: this.jobContent.remark,
remark: this.jobContent.remark, creationTime: this.jobContent.creationTime,
creationTime: this.jobContent.creationTime, Creatorld: this.jobContent.Creatorld,
Creatorld: this.jobContent.Creatorld, creatorName: this.jobContent.creatorName,
creatorName: this.jobContent.creatorName, extraProperties: this.jobContent.extraProperties,
extraProperties: this.jobContent.extraProperties, Siteld: this.jobContent.Siteld,
Siteld: this.jobContent.Siteld, Code: "",
Code: "", details: [
details: [
],
], }
}
this.detailSource.forEach(res => {
this.detailSource.forEach(res => { res.details.forEach(res1 => {
res.details.forEach(res1 => { if (res1.scaned) {
if (res1.scaned) { res1.record.FromLocationGroupCode = "";
res1.record.FromLocationGroupCode = ""; res1.record.FromAreaCode = "";
res1.record.FromAreaCode = ""; res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; res1.record.VisualInspectResult = ""; //
res1.record.VisualInspectResult = ""; // res1.record.VisualInspectPhotos = ""; //
res1.record.VisualInspectPhotos = ""; // res1.record.FailedReason = ""; //
res1.record.FailedReason = ""; // res1.record.MassDefect = ""; //
res1.record.MassDefect = ""; // res1.record.SinglePrice = ""; //
res1.record.SinglePrice = ""; // res1.record.Amount = ""; //
res1.record.Amount = ""; // res1.record.Code = "";
res1.record.Code = ""; res1.record.JobDetailID = res1.record.id;
res1.record.JobDetailID = res1.record.id; res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; params.details.push(res1.record)
params.details.push(res1.record) }
} })
}) })
})
return params;
return params; },
},
showMessage(message) {
showMessage(message) { this.$refs.comMessage.showMessage(message, res => {
this.$refs.comMessage.showMessage(message, res => { if (res) {}
if (res) {} });
}); },
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
},
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(); },
}, getLocation(location, code) {
getLocation(location, code) { this.getFromLocationCode(location, code)
this.getFromLocationCode(location, code) },
}, getFromLocationCode(location, code) {
getFromLocationCode(location, code) { this.fromLocationInfo = location;
this.fromLocationInfo = location; this.fromLocationCode = code;
this.fromLocationCode = code; this.openScanPopup();
this.openScanPopup(); },
}, getToLocationCode(location, code) {
getToLocationCode(location, code) { if (this.fromLocationCode == code) {
if (this.fromLocationCode == code) { uni.showToast({
uni.showToast({ title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致", duration: 2000
duration: 2000 })
}) return
return }
} this.ToLocationCodeInfo = location;
this.ToLocationCodeInfo = location; this.toLocationCode = code;
this.toLocationCode = code; },
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.fromLocationCode = '';
this.fromLocationCode = '';
})
}) },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i];
let item = this.detailSource[i]; if (item.qty == 0) {
if (item.qty == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} }
} }
} }
} </script>
</script>
<style scoped lang="scss">
<style scoped lang="scss"> page {
page { width: 100%;
width: 100%; height: 100%;
height: 100%; background-color: #fff;
background-color: #fff; }
}
.page-wraper {
.page-wraper { display: flex;
display: flex; flex-direction: column;
flex-direction: column; width: 100%;
width: 100%; height: 100%;
height: 100%; }
}
.page-main {
.page-main { flex: 1;
flex: 1; position: relative;
position: relative; }
}
.page-main-scroll {
.page-main-scroll { position: absolute;
position: absolute; left: 0;
left: 0; right: 0;
right: 0; top: 0;
top: 0; bottom: 0;
bottom: 0; }
}
.page-main-list {
.page-main-list { /* height: 80rpx;
/* height: 80rpx; line-height: 80rpx; */
line-height: 80rpx; */ text-align: center;
text-align: center; background: #e0e0e0;
background: #e0e0e0;
}
} </style>
</style>

2
pages/putaway/request/putawayRequestDetail.vue

@ -26,7 +26,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -88,7 +87,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/repleinsh/job/repleinshDetail.vue

@ -52,7 +52,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName, getInventoryStatusName,
@ -178,7 +177,6 @@
that.fromLocationCode = that.detailList[0].fromLocationCode that.fromLocationCode = that.detailList[0].fromLocationCode
that.toLocationCode = that.detailList[0].toLocationCode that.toLocationCode = that.detailList[0].toLocationCode
that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
updateTitle(that.jobContent.number);
that.getLocationInfo(that.toLocationCode); that.getLocationInfo(that.toLocationCode);
} else { } else {

869
pages/repleinsh/record/repleinshRecord.vue

@ -1,435 +1,434 @@
<!-- 收货任务详情 --> <!-- 收货任务详情 -->
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<view class="page-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="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode' <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
:locationTypeList="tolocationTypeList"></requiredLocation> :locationTypeList="tolocationTypeList"></requiredLocation>
<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="">
</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>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
goHome, goHome,
getInventoryStatusDesc, updateTitle,
getDirectoryItemArray getInventoryStatusDesc,
} from '@/common/basic.js'; getDirectoryItemArray
import { } from '@/common/basic.js';
getDetailOption, import {
getDetailRemoveOption, getDetailOption,
getDetailEditRemoveOption getDetailRemoveOption,
} from '@/common/array.js'; getDetailEditRemoveOption
} from '@/common/array.js';
import {
getBusinessType, import {
createItemInfo, getBusinessType,
createDetailInfo, createItemInfo,
calcHandleQty createDetailInfo,
} from '@/common/record.js'; calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: { export default {
winScanButton, components: {
winScanPack, winScanButton,
requiredLocation, winScanPack,
comBlankView, requiredLocation,
winScanLocation, comBlankView,
comMessage, winScanLocation,
winScanPackAndLocation, comMessage,
recordComDetailCard winScanPackAndLocation,
}, recordComDetailCard
data() { },
return { data() {
id: '', return {
receiptJob: {}, id: '',
received: false, receiptJob: {},
isShowPackingCode: true, received: false,
scanCount: 0, isShowPackingCode: true,
jobContent: {}, // scanCount: 0,
detailList: [], //details jobContent: {}, //
detailSource: [], // detailList: [], //details
scrollTop: 0, detailSource: [], //
old: { scrollTop: 0,
scrollTop: 0 locationTypeList: [],
}, toLocationInfo: {},
locationTypeList: [], businessTypeInfo: {},
toLocationInfo: {}, fromLocationInfo: {},
businessTypeInfo: {}, fromLocationCode: "",
fromLocationInfo: {}, toLocationInfo: {},
fromLocationCode: "", toLocationCode: "",
toLocationInfo: {}, isShowLocation: false,
toLocationCode: "", fromlocationTypeList: [],
isShowLocation: false, tolocationTypeList: [],
fromlocationTypeList: [], allowModifyLocation: false,
tolocationTypeList: [], inInventoryStatus: "", //
allowModifyLocation: false, outInventoryStatus: "", //
inInventoryStatus: "", // businessType: {},
outInventoryStatus: "", // fromType: ""
businessType: {}, };
fromType: "" },
}; onLoad(option) {
}, this.fromType = option.fromType
onLoad(option) { if(this.fromType=="requestType"){ updateTitle("补料申请") }else { updateTitle("补料记录") }
this.fromType = option.fromType var typeCode = "Repleinment"
var typeCode = "Repleinment" getBusinessType(typeCode, res => {
getBusinessType(typeCode, res => { if (res.success) {
if (res.success) { this.businessType = res.businessType;
this.businessType = res.businessType; this.fromlocationTypeList = res.fromlocationTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup();
this.showFromLocationPopup(); } else {
} else { this.$refs.comMessage.showBreakMessage(res.message );
this.$refs.comMessage.showBreakMessage(res.message ); }
} });
}); },
}, //
// onNavigationBarButtonTap(e) {
onNavigationBarButtonTap(e) { if (e.index === 0) {
if (e.index === 0) { goHome();
goHome(); }
} },
}, //
// onBackPress(e) {},
onBackPress(e) {},
onPullDownRefresh() {},
onPullDownRefresh() {},
mounted() {
mounted() { },
}, methods: {
methods: { getScanResult(result) {
getScanResult(result) { let balance = result.balance;
let balance = result.balance; let label = result.label;
let label = result.label; let pack = result.package;
let pack = result.package; var item = this.detailSource.find(res => {
var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) {
if (res.itemCode == balance.itemCode) { return res
return res }
} })
}) if (item == undefined) {
if (item == undefined) { var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); //
let newDetail = createDetailInfo(balance, pack); // itemp.details.push(newDetail);
itemp.details.push(newDetail); this.detailSource.push(itemp)
this.detailSource.push(itemp) } else {
} else { var detail = item.details.find(r => {
var detail = item.details.find(r => { if (r.packingNumber == balance.packingNumber &&
if (r.packingNumber == balance.packingNumber && r.batch == balance.batch &&
r.batch == balance.batch && r.locationCode == balance.locationCode &&
r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
r.inventoryStatus == balance.inventoryStatus) { return r;
return r; }
} })
}) if (detail == undefined) {
if (detail == undefined) { let newDetail = createDetailInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); item.details.push(newDetail);
item.details.push(newDetail); } else {
} else { if (detail.scaned == true) {
if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") }
} }
} }
} this.calcHandleQty();
this.calcHandleQty();
},
},
showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
}, calcHandleQty() {
calcHandleQty() { for (let item of this.detailSource) {
for (let item of this.detailSource) { item.qty = 0;
item.qty = 0; for (let detail of item.details) {
for (let detail of item.details) { if (detail != undefined) {
if (detail != undefined) { item.qty += Number(detail.qty)
item.qty += Number(detail.qty) }
} }
} }
} this.$forceUpdate();
this.$forceUpdate(); },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); },
}, removeItem(index, item) {
removeItem(index, item) { this.detailSource.splice(index, 1)
this.detailSource.splice(index, 1) },
},
removePack() {
removePack() { for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { var item = this.detailSource[i];
var item = this.detailSource[i]; if (item.details.length == 0) {
if (item.details.length == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} this.updateData();
this.updateData(); },
},
openScanPopup() {
openScanPopup() { if (this.fromLocationCode == "") {
if (this.fromLocationCode == "") { this.showFromLocationPopup();
this.showFromLocationPopup(); return
return }
} this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); },
}, showFromLocationPopup() {
showFromLocationPopup() { this.$nextTick(() => {
this.$nextTick(() => { this.$refs.scanLocationCode.openScanPopup();
this.$refs.scanLocationCode.openScanPopup(); })
})
},
}, closeScanPopup() {
closeScanPopup() { this.$refs.scanPopup.closeScanPopup();
this.$refs.scanPopup.closeScanPopup(); },
},
scanPopupGetFocus() {
scanPopupGetFocus() { this.$refs.scanPopup.getfocus();
this.$refs.scanPopup.getfocus(); },
},
scanLocationCode(location, code) {
scanLocationCode(location, code) { this.toLocationCode = code
this.toLocationCode = code this.toLocationCode = location;
this.toLocationCode = location;
},
},
commit() {
commit() { if (this.toLocationCode == "") {
if (this.toLocationCode == "") { this.showMessage("请先选择目标库位")
this.showMessage("请先选择目标库位") return;
return; }
} //
// 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)) if(this.fromType=="requestType"){
if(this.fromType=="requestType"){
}else {
}else {
}
} // (this.id, params).then(res => {
// (this.id, params).then(res => { // uni.hideLoading()
// uni.hideLoading() // if (res.data) {
// if (res.data) { // var hint = res.data.Number;
// var hint = res.data.Number; // this.showCommitSuccessMessage("" + hint, )
// this.showCommitSuccessMessage("" + hint, )
// } else {
// } else { // this.showErrorMessage("")
// this.showErrorMessage("") // }
// } // }).catch(error => {
// }).catch(error => { // uni.hideLoading()
// uni.hideLoading() // this.showErrorMessage(error)
// this.showErrorMessage(error) // })
// })
},
},
setParams() {
setParams() { var params = {
var params = { requestNumber: this.jobContent.requestNumber,
requestNumber: this.jobContent.requestNumber, jobNumber: "",
jobNumber: "", asnNumber: this.jobContent.asnNumber,
asnNumber: this.jobContent.asnNumber, ppNumber: this.jobContent.ppNumber,
ppNumber: this.jobContent.ppNumber, supplierCode: this.jobContent.supplierCode,
supplierCode: this.jobContent.supplierCode, ReceiptDock: this.jobContent.ReceiptDock,
ReceiptDock: this.jobContent.ReceiptDock, carrierCode: this.jobContent.carrierCode,
carrierCode: this.jobContent.carrierCode, transferMode: this.jobContent.transferMode,
transferMode: this.jobContent.transferMode, vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, fromWarehouseCode: this.toLocationInfo.WarehouseCode,
fromWarehouseCode: this.toLocationInfo.WarehouseCode, toWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode, OutTransaction: this.businessTypeInfo.OutTransactionType, //
OutTransaction: this.businessTypeInfo.OutTransactionType, // InTransaction: this.businessTypeInfo.InTransactionType, //
InTransaction: this.businessTypeInfo.InTransactionType, // executeTime: "2023-08-4 16:30:11", //
executeTime: "2023-08-4 16:30:11", // activeDate: "2023-08-4 16:30:11", //
activeDate: "2023-08-4 16:30:11", // available: "1", // 0,1
available: "1", // 0,1 requestTime: this.jobContent.requestTime,
requestTime: this.jobContent.requestTime, dueTime: "2023-08-4 16:30:11", //
dueTime: "2023-08-4 16:30:11", // departmentCode: this.jobContent.departmentCode,
departmentCode: this.jobContent.departmentCode, UserPositionCode: "", //
UserPositionCode: "", // interfaceType: "jklxPURCHASE_RECEIPT", //
interfaceType: "jklxPURCHASE_RECEIPT", // Number: this.jobContent.Number,
Number: this.jobContent.Number, businessType: this.jobContent.businessType,
businessType: this.jobContent.businessType, remark: this.jobContent.remark,
remark: this.jobContent.remark, creationTime: this.jobContent.creationTime,
creationTime: this.jobContent.creationTime, Creatorld: this.jobContent.Creatorld,
Creatorld: this.jobContent.Creatorld, creatorName: this.jobContent.creatorName,
creatorName: this.jobContent.creatorName, extraProperties: this.jobContent.extraProperties,
extraProperties: this.jobContent.extraProperties, Siteld: this.jobContent.Siteld,
Siteld: this.jobContent.Siteld, Code: "",
Code: "", details: [
details: [
],
], }
}
this.detailSource.forEach(res => {
this.detailSource.forEach(res => { res.details.forEach(res1 => {
res.details.forEach(res1 => { if (res1.scaned) {
if (res1.scaned) { res1.record.FromLocationGroupCode = "";
res1.record.FromLocationGroupCode = ""; res1.record.FromAreaCode = "";
res1.record.FromAreaCode = ""; res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; res1.record.VisualInspectResult = ""; //
res1.record.VisualInspectResult = ""; // res1.record.VisualInspectPhotos = ""; //
res1.record.VisualInspectPhotos = ""; // res1.record.FailedReason = ""; //
res1.record.FailedReason = ""; // res1.record.MassDefect = ""; //
res1.record.MassDefect = ""; // res1.record.SinglePrice = ""; //
res1.record.SinglePrice = ""; // res1.record.Amount = ""; //
res1.record.Amount = ""; // res1.record.Code = "";
res1.record.Code = ""; res1.record.JobDetailID = res1.record.id;
res1.record.JobDetailID = res1.record.id; res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; params.details.push(res1.record)
params.details.push(res1.record) }
} })
}) })
})
return params;
return params; },
},
showMessage(message) {
showMessage(message) { this.$refs.comMessage.showMessage(message, res => {
this.$refs.comMessage.showMessage(message, res => { if (res) {}
if (res) {} });
}); },
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
},
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(); },
}, getLocation(location, code) {
getLocation(location, code) { this.getFromLocationCode(location, code)
this.getFromLocationCode(location, code) },
}, getFromLocationCode(location, code) {
getFromLocationCode(location, code) { this.fromLocationInfo = location;
this.fromLocationInfo = location; this.fromLocationCode = code;
this.fromLocationCode = code; this.openScanPopup();
this.openScanPopup(); },
}, getToLocationCode(location, code) {
getToLocationCode(location, code) { if (this.fromLocationCode == code) {
if (this.fromLocationCode == code) { uni.showToast({
uni.showToast({ title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致", duration: 2000
duration: 2000 })
}) return
return }
} this.ToLocationCodeInfo = location;
this.ToLocationCodeInfo = location; this.toLocationCode = code;
this.toLocationCode = code; },
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.fromLocationCode = '';
this.fromLocationCode = '';
})
}) },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i];
let item = this.detailSource[i]; if (item.qty == 0) {
if (item.qty == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} }
} }
} }
} </script>
</script>
<style scoped lang="scss">
<style scoped lang="scss"> page {
page { width: 100%;
width: 100%; height: 100%;
height: 100%; background-color: #fff;
background-color: #fff; }
}
.page-wraper {
.page-wraper { display: flex;
display: flex; flex-direction: column;
flex-direction: column; width: 100%;
width: 100%; height: 100%;
height: 100%; }
}
.page-main {
.page-main { flex: 1;
flex: 1; position: relative;
position: relative; }
}
.page-main-scroll {
.page-main-scroll { position: absolute;
position: absolute; left: 0;
left: 0; right: 0;
right: 0; top: 0;
top: 0; bottom: 0;
bottom: 0; }
}
.page-main-list {
.page-main-list { /* height: 80rpx;
/* height: 80rpx; line-height: 80rpx; */
line-height: 80rpx; */ text-align: center;
text-align: center; background: #e0e0e0;
background: #e0e0e0;
}
} </style>
</style>

855
pages/scrap/record/scrapRecord.vue

@ -1,428 +1,427 @@
<!-- 收货任务详情 --> <!-- 收货任务详情 -->
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view> <com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="fromLocationCode!=''"> <view class="page-wraper" v-if="fromLocationCode!=''">
<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0"> <view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;"> <view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
报废原因 : 报废原因 :
</view> </view>
<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;" <uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList" class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList"
v-model="reason"> v-model="reason">
</uni-data-picker> </uni-data-picker>
</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="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <u-line />
</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="">
</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>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
:locationTypeList="fromlocationTypeList"></win-scan-location> :locationTypeList="fromlocationTypeList"></win-scan-location>
</view> </view>
</template> </template>
<script> <script>
import { import {
goHome, goHome,
getInventoryStatusDesc, updateTitle,
getDirectoryItemArray, getInventoryStatusDesc,
getScarpReasonList getDirectoryItemArray,
} from '@/common/basic.js'; getScarpReasonList
} from '@/common/basic.js';
import {
getBusinessType, import {
createItemInfo, getBusinessType,
createDetailInfo, createItemInfo,
calcHandleQty createDetailInfo,
} from '@/common/record.js'; calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import comMessage from '@/mycomponents/common/comMessage.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: { export default {
winScanButton, components: {
winScanPack, winScanButton,
requiredLocation, winScanPack,
comBlankView, requiredLocation,
winScanLocation, comBlankView,
comMessage, winScanLocation,
winScanPackAndLocation, comMessage,
recordComDetailCard winScanPackAndLocation,
}, recordComDetailCard
data() { },
return { data() {
id: '', return {
receiptJob: {}, id: '',
received: false, receiptJob: {},
isShowPackingCode: true, received: false,
scanCount: 0, isShowPackingCode: true,
jobContent: {}, // scanCount: 0,
detailList: [], //details jobContent: {}, //
detailSource: [], // detailList: [], //details
scrollTop: 0, detailSource: [], //
old: { scrollTop: 0,
scrollTop: 0 locationTypeList: [],
}, toLocationInfo: {},
locationTypeList: [], businessTypeInfo: {},
toLocationInfo: {}, fromLocationInfo: {},
businessTypeInfo: {}, fromLocationCode: "",
fromLocationInfo: {}, isShowLocation: false,
fromLocationCode: "", fromlocationTypeList: [],
isShowLocation: false, tolocationTypeList: [],
fromlocationTypeList: [], allowModifyLocation: false,
tolocationTypeList: [], inInventoryStatus: "", //
allowModifyLocation: false, outInventoryStatus: "", //
inInventoryStatus: "", // businessType: {},
outInventoryStatus: "", // reasonList: [],
businessType: {}, reason: "",
reasonList: [], fromType:""
reason: "", };
fromType:"" },
}; onLoad(option) {
}, this.fromType = option.fromType
onLoad(option) { if(this.fromType=="requestType"){ updateTitle("报废申请") }else { updateTitle("报废记录") }
this.fromType = option.fromType this.reasonList = getScarpReasonList();
this.reasonList = getScarpReasonList(); var typeCode = "Scrap"
var typeCode = "Scrap" getBusinessType(typeCode, res => {
getBusinessType(typeCode, res => { if (res.success) {
if (res.success) { this.businessType = res.businessType;
this.businessType = res.businessType; this.fromlocationTypeList = res.fromlocationTypeList;
this.fromlocationTypeList = res.fromlocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup();
this.showFromLocationPopup(); } else {
} else { this.$refs.comMessage.showBreakMessage(res.message );
this.$refs.comMessage.showBreakMessage(res.message ); }
} });
});
},
}, //
// onNavigationBarButtonTap(e) {
onNavigationBarButtonTap(e) { if (e.index === 0) {
if (e.index === 0) { goHome();
goHome(); }
} },
}, //
// onBackPress(e) {},
onBackPress(e) {},
onPullDownRefresh() {},
onPullDownRefresh() {},
mounted() {
mounted() {
},
}, methods: {
methods: { getScanResult(result) {
getScanResult(result) { let balance = result.balance;
let balance = result.balance; let label = result.label;
let label = result.label; let pack = result.package;
let pack = result.package; var item = this.detailSource.find(res => {
var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) {
if (res.itemCode == balance.itemCode) { return res
return res }
} })
}) if (item == undefined) {
if (item == undefined) { var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); //
let newDetail = createDetailInfo(balance, pack); // itemp.details.push(newDetail);
itemp.details.push(newDetail); this.detailSource.push(itemp)
this.detailSource.push(itemp) } else {
} else { var detail = item.details.find(r => {
var detail = item.details.find(r => { if (r.packingNumber == balance.packingNumber &&
if (r.packingNumber == balance.packingNumber && r.batch == balance.batch &&
r.batch == balance.batch && r.locationCode == balance.locationCode &&
r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
r.inventoryStatus == balance.inventoryStatus) { return r;
return r; }
} })
}) if (detail == undefined) {
if (detail == undefined) { let newDetail = createDetailInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); item.details.push(newDetail);
item.details.push(newDetail); } else {
} else { if (detail.scaned == true) {
if (detail.scaned == true) { this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") }
} }
} }
} this.calcHandleQty();
this.calcHandleQty();
},
},
createItemInfo(balance, pack) {
createItemInfo(balance, pack) { let item = {
let item = { itemCode: balance.itemCode,
itemCode: balance.itemCode, itemName: pack.itemName,
itemName: pack.itemName, stdPackQty: pack.stdPackQty,
stdPackQty: pack.stdPackQty, stdPackUnit: pack.stdPackUnit,
stdPackUnit: pack.stdPackUnit, qty: Number(balance.qty),
qty: Number(balance.qty), handleQty: 0,
handleQty: 0, uom: pack.uom,
uom: pack.uom, details: []
details: [] }
} return item;
return item; },
},
showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
}, calcHandleQty() {
calcHandleQty() { calcHandleQty(this.detailSource)
calcHandleQty(this.detailSource) this.$forceUpdate();
this.$forceUpdate(); },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); },
}, removeItem(index, item) {
removeItem(index, item) { this.detailSource.splice(index, 1)
this.detailSource.splice(index, 1) },
}, removePack() {
removePack() { for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { var item = this.detailSource[i];
var item = this.detailSource[i]; if (item.details.length == 0) {
if (item.details.length == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} this.updateData();
this.updateData(); },
},
openScanPopup() {
openScanPopup() {
if (this.fromLocationCode == "") {
if (this.fromLocationCode == "") { this.showFromLocationPopup();
this.showFromLocationPopup(); return
return }
} this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); },
}, showFromLocationPopup() {
showFromLocationPopup() { this.$nextTick(() => {
this.$nextTick(() => { this.$refs.scanLocationCode.openScanPopup();
this.$refs.scanLocationCode.openScanPopup(); })
}) },
},
closeScanPopup() {
closeScanPopup() { this.$refs.scanPopup.closeScanPopup();
this.$refs.scanPopup.closeScanPopup(); },
},
scanPopupGetFocus() {
scanPopupGetFocus() { this.$refs.scanPopup.getfocus();
this.$refs.scanPopup.getfocus(); },
},
commit() {
commit() { if(this.reason==""){
if(this.reason==""){ this.showMessage("请先选择报废原因")
this.showMessage("请先选择报废原因") return;
return; }
} //
// 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)) // (this.id, params).then(res => {
// (this.id, params).then(res => { // uni.hideLoading()
// uni.hideLoading() // if (res.data) {
// if (res.data) { // var hint = res.data.Number;
// var hint = res.data.Number; // this.showCommitSuccessMessage("" + hint, )
// this.showCommitSuccessMessage("" + hint, )
// } else {
// } else { // this.showErrorMessage("")
// this.showErrorMessage("") // }
// } // }).catch(error => {
// }).catch(error => { // uni.hideLoading()
// uni.hideLoading() // this.showErrorMessage(error)
// this.showErrorMessage(error) // })
// })
},
},
setParams() {
setParams() { var params = {
var params = { requestNumber: this.jobContent.requestNumber,
requestNumber: this.jobContent.requestNumber, jobNumber: "",
jobNumber: "", asnNumber: this.jobContent.asnNumber,
asnNumber: this.jobContent.asnNumber, ppNumber: this.jobContent.ppNumber,
ppNumber: this.jobContent.ppNumber, supplierCode: this.jobContent.supplierCode,
supplierCode: this.jobContent.supplierCode, ReceiptDock: this.jobContent.ReceiptDock,
ReceiptDock: this.jobContent.ReceiptDock, carrierCode: this.jobContent.carrierCode,
carrierCode: this.jobContent.carrierCode, transferMode: this.jobContent.transferMode,
transferMode: this.jobContent.transferMode, vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, fromWarehouseCode: this.toLocationInfo.WarehouseCode,
fromWarehouseCode: this.toLocationInfo.WarehouseCode, toWarehouseCode: this.toLocationInfo.WarehouseCode,
toWarehouseCode: this.toLocationInfo.WarehouseCode, OutTransaction: this.businessTypeInfo.OutTransactionType, //
OutTransaction: this.businessTypeInfo.OutTransactionType, // InTransaction: this.businessTypeInfo.InTransactionType, //
InTransaction: this.businessTypeInfo.InTransactionType, // executeTime: "2023-08-4 16:30:11", //
executeTime: "2023-08-4 16:30:11", // activeDate: "2023-08-4 16:30:11", //
activeDate: "2023-08-4 16:30:11", // available: "1", // 0,1
available: "1", // 0,1 requestTime: this.jobContent.requestTime,
requestTime: this.jobContent.requestTime, dueTime: "2023-08-4 16:30:11", //
dueTime: "2023-08-4 16:30:11", // departmentCode: this.jobContent.departmentCode,
departmentCode: this.jobContent.departmentCode, UserPositionCode: "", //
UserPositionCode: "", // interfaceType: "jklxPURCHASE_RECEIPT", //
interfaceType: "jklxPURCHASE_RECEIPT", // Number: this.jobContent.Number,
Number: this.jobContent.Number, businessType: this.jobContent.businessType,
businessType: this.jobContent.businessType, remark: this.jobContent.remark,
remark: this.jobContent.remark, creationTime: this.jobContent.creationTime,
creationTime: this.jobContent.creationTime, Creatorld: this.jobContent.Creatorld,
Creatorld: this.jobContent.Creatorld, creatorName: this.jobContent.creatorName,
creatorName: this.jobContent.creatorName, extraProperties: this.jobContent.extraProperties,
extraProperties: this.jobContent.extraProperties, Siteld: this.jobContent.Siteld,
Siteld: this.jobContent.Siteld, Code: "",
Code: "", details: [
details: [
],
], }
}
this.detailSource.forEach(res => {
this.detailSource.forEach(res => { res.details.forEach(res1 => {
res.details.forEach(res1 => { if (res1.scaned) {
if (res1.scaned) { res1.record.FromLocationGroupCode = "";
res1.record.FromLocationGroupCode = ""; res1.record.FromAreaCode = "";
res1.record.FromAreaCode = ""; res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; res1.record.VisualInspectResult = ""; //
res1.record.VisualInspectResult = ""; // res1.record.VisualInspectPhotos = ""; //
res1.record.VisualInspectPhotos = ""; // res1.record.FailedReason = ""; //
res1.record.FailedReason = ""; // res1.record.MassDefect = ""; //
res1.record.MassDefect = ""; // res1.record.SinglePrice = ""; //
res1.record.SinglePrice = ""; // res1.record.Amount = ""; //
res1.record.Amount = ""; // res1.record.Code = "";
res1.record.Code = ""; res1.record.JobDetailID = res1.record.id;
res1.record.JobDetailID = res1.record.id; res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; params.details.push(res1.record)
params.details.push(res1.record) }
} })
}) })
})
return params;
return params; },
},
showMessage(message) {
showMessage(message) { this.$refs.comMessage.showMessage(message, res => {
this.$refs.comMessage.showMessage(message, res => { if (res) {}
if (res) {} });
}); },
}, showErrorMessage(message) {
showErrorMessage(message) { this.$refs.comMessage.showErrorMessage(message, res => {
this.$refs.comMessage.showErrorMessage(message, res => { if (res) {
if (res) {
}
} });
}); },
},
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(); },
}, getLocation(location, code) {
getLocation(location, code) { this.getFromLocationCode(location, code)
this.getFromLocationCode(location, code) },
}, getFromLocationCode(location, code) {
getFromLocationCode(location, code) { this.fromLocationInfo = location;
this.fromLocationInfo = location; this.fromLocationCode = code;
this.fromLocationCode = code; this.openScanPopup();
this.openScanPopup(); },
},
showCommitSuccessMessage(hint) {
showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.fromLocationCode = '';
this.fromLocationCode = '';
})
}) },
},
updateData() {
updateData() { this.calcHandleQty();
this.calcHandleQty(); for (var i = 0; i < this.detailSource.length; i++) {
for (var i = 0; i < this.detailSource.length; i++) { let item = this.detailSource[i];
let item = this.detailSource[i]; if (item.qty == 0) {
if (item.qty == 0) { this.detailSource.splice(i, 1)
this.detailSource.splice(i, 1) }
} }
} }
} }
} }
} </script>
</script>
<style scoped lang="scss">
<style scoped lang="scss"> page {
page { width: 100%;
width: 100%; height: 100%;
height: 100%; background-color: #fff;
background-color: #fff; }
}
.page-wraper {
.page-wraper { display: flex;
display: flex; flex-direction: column;
flex-direction: column; width: 100%;
width: 100%; height: 100%;
height: 100%; }
}
.page-main {
.page-main { flex: 1;
flex: 1; position: relative;
position: relative; }
}
.page-main-scroll {
.page-main-scroll { position: absolute;
position: absolute; left: 0;
left: 0; right: 0;
right: 0; top: 0;
top: 0; bottom: 0;
bottom: 0; }
}
.page-main-list {
.page-main-list { /* height: 80rpx;
/* height: 80rpx; line-height: 80rpx; */
line-height: 80rpx; */ text-align: center;
text-align: center; background: #e0e0e0;
background: #e0e0e0;
}
} </style>
</style>

2
pages/scrap/request/scrapRequestDetail.vue

@ -26,7 +26,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -87,7 +86,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
}} }}

2
pages/transfer/job/transferDetail.vue

@ -41,7 +41,6 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
goHome, goHome,
updateTitle,
getCurrDateTime, getCurrDateTime,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getInventoryStatusName getInventoryStatusName
@ -166,7 +165,6 @@
that.jobContent = res.data[0]; that.jobContent = res.data[0];
that.detailList = res.data[0].details; that.detailList = res.data[0].details;
that.detailSource = that.getDataSource(that.detailList) that.detailSource = that.getDataSource(that.detailList)
updateTitle(this.jobContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/unPlanned/job/receiptJobDetail.vue

@ -45,7 +45,6 @@
import { import {
goHome, goHome,
getCurrDateTime, getCurrDateTime,
updateTitle,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getDirectoryItemArray getDirectoryItemArray
} from '@/common/basic.js'; } from '@/common/basic.js';
@ -155,7 +154,6 @@
that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = that.getDataSource(that.detailList) that.detailSource = that.getDataSource(that.detailList)
updateTitle(this.jobContent.number);
} else { } else {
that.showErrorMessage('列表数据为0'); that.showErrorMessage('列表数据为0');
} }

10
pages/unPlanned/record/issueRecord.vue

@ -66,6 +66,11 @@
createDetailInfo, createDetailInfo,
calcHandleQty calcHandleQty
} from '@/common/record.js'; } from '@/common/record.js';
import {
goHome,
updateTitle
} from '@/common/basic.js';
export default { export default {
components: { components: {
@ -109,6 +114,11 @@
onLoad(option) { onLoad(option) {
this.fromType = option.fromType this.fromType = option.fromType
if (this.fromType == "requestType") {
updateTitle("计划外出库申请")
} else {
updateTitle("计划外出库记录")
}
}, },
methods: { methods: {

20
pages/unPlanned/record/receiptRecord.vue

@ -59,10 +59,15 @@
getDirectoryItemArray, getDirectoryItemArray,
getUnPlannedReceiptReasonList getUnPlannedReceiptReasonList
} from '@/common/directory.js'; } from '@/common/directory.js';
import { import {
getBusinessType, getBusinessType,
} from '@/common/record.js'; } from '@/common/record.js';
import {
goHome,
updateTitle,
} from '@/common/basic.js';
export default { export default {
components: { components: {
@ -88,7 +93,7 @@
businessTypeCode: "UnplannedReceipt", businessTypeCode: "UnplannedReceipt",
reason: "", reason: "",
reasonList: [], reasonList: [],
fromType:"" fromType: ""
} }
}, },
@ -101,13 +106,18 @@
this.tolocationTypeList = res.tolocationTypeList; this.tolocationTypeList = res.tolocationTypeList;
this.openScanPopup(); this.openScanPopup();
} else { } else {
this.$refs.comMessage.showBreakMessage(res.message ); this.$refs.comMessage.showBreakMessage(res.message);
} }
}); });
}, },
onLoad(option) { onLoad(option) {
this.fromType = option.fromType this.fromType = option.fromType
if (this.fromType == "requestType") {
updateTitle("计划外入库申请")
} else {
updateTitle("计划外入库记录")
}
}, },
methods: { methods: {
@ -175,7 +185,7 @@
detail.inventoryStatus = "kcztOK" detail.inventoryStatus = "kcztOK"
detail.stdPackQty = pack.stdPackQty; detail.stdPackQty = pack.stdPackQty;
detail.stdPackUnit = pack.stdPackUnit; detail.stdPackUnit = pack.stdPackUnit;
label.inventoryStatus="kcztOK"; label.inventoryStatus = "kcztOK";
detail.package = pack; detail.package = pack;
detail.label = label; detail.label = label;
return detail; return detail;

2
pages/unPlanned/request/issueRequestDetail.vue

@ -25,7 +25,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -87,7 +86,6 @@
that.requestContent = res.data; that.requestContent = res.data;
that.detailList = res.data.subList; that.detailList = res.data.subList;
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
}else { }else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

2
pages/unPlanned/request/receiptRequestDetail.vue

@ -26,7 +26,6 @@
import { import {
goHome, goHome,
updateTitle
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
@ -91,7 +90,6 @@
res.fromLocationCode = res.toLocationCode res.fromLocationCode = res.toLocationCode
}) })
that.detailSource = getDataSource(that.detailList); that.detailSource = getDataSource(that.detailList);
updateTitle(this.requestContent.number);
} else { } else {
that.showMessage('列表数据为0'); that.showMessage('列表数据为0');
} }

Loading…
Cancel
Save