Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_vue3
lijuncheng 8 months ago
parent
commit
9582c1d183
  1. 15
      src/pages/inventoryMove/coms/comMoveRecord.vue
  2. 4
      src/pages/productPutaway/job/productPutawayDetail.vue
  3. 27
      src/pages/productReceipt/job/productReceiptDetail.vue
  4. 17
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  5. 52
      src/pages/putaway/job/putawayDetail.vue
  6. 6
      src/pages/repleinsh/job/repleinshDetail.vue

15
src/pages/inventoryMove/coms/comMoveRecord.vue

@ -22,8 +22,9 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<!-- :isShowEdit="isShowEditLocation" -->
<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit="isShowEditLocation"></requiredLocation>
:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true' ></requiredLocation>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -161,19 +162,23 @@
} else if (this.businessTypeCode == "HoldToScrap") {
this.title = "隔离转报废记录";
this.toInventoryStatus = "SCRAP"
this.toLocationCode = "SCRAP"
this.toLocationCode = ""
// this.toLocationCode = "SCRAP"
} else if (this.businessTypeCode == "OkToHold") {
this.title = "合格转隔离记录";
this.toInventoryStatus = "HOLD"
this.toLocationCode = "HOLD"
this.toLocationCode = ""
// this.toLocationCode = "HOLD"
} else if (this.businessTypeCode == "OkToScrap") {
this.title = "合格转报废记录";
this.toInventoryStatus = "SCRAP"
this.toLocationCode = "SCRAP"
this.toLocationCode = ""
// this.toLocationCode = "SCRAP"
} else if (this.businessTypeCode == "ScrapToHold") {
this.title = "报废转隔离记录";
this.toInventoryStatus = "HOLD"
this.toLocationCode = "HOLD"
// this.toLocationCode = "HOLD"
this.toLocationCode = ""
}
uni.setNavigationBarTitle({
title: this.title

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

@ -314,13 +314,13 @@
},
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
// this.$refs.comMessage.showQuestionMessage("[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
// })
})
},

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

@ -15,7 +15,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comProductDetailCard>
</view>
<u-line />
@ -27,8 +28,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -103,8 +104,8 @@
detailSource: [], //
toLocationAreaTypeList: [],
managementList: [],
jobStatus:"",
jobToLocationCode:""
jobStatus: "",
jobToLocationCode: ""
};
},
@ -132,7 +133,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakeProductReceiptJob(this.id).then(res => {
uni.navigateBack();
@ -255,14 +256,14 @@
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
// this.$refs.comMessage.showQuestionMessage("[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
// })
},
checkLocation() {
@ -415,4 +416,4 @@
</script>
<style scoped lang="scss">
</style>
</style>

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

@ -244,11 +244,11 @@
getScanResult(result) {
try {
var supplierCode = result.label.supplierCode;
if (supplierCode == '' || supplierCode == undefined) {
this.showErrorMessage("标签中未解析到供应商信息,请重新扫描")
return;
}
// var supplierCode = result.label.supplierCode;
// if (supplierCode == '' || supplierCode == undefined) {
// this.showErrorMessage(",")
// return;
// }
var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch;
var qty = result.balance.qty;
@ -282,7 +282,7 @@
']不一致,是否继续上架?', res => {
if (res) {
itemDetail.scaned = true;
itemDetail.supplierCode = supplierCode
// itemDetail.supplierCode = supplierCode
itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
@ -322,13 +322,14 @@
},
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
// this.$refs.comMessage.showQuestionMessage("[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
// })
})
},

52
src/pages/putaway/job/putawayDetail.vue

@ -15,7 +15,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
@remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard>
</view>
</view>
@ -26,8 +27,8 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode'
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
@ -37,7 +38,8 @@
</view>
<win-scan-button @goScan='openScanPopup'></win-scan-button>
<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance ="true"></winScanPackAndLocationNoBalance>
<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
</winScanPackAndLocationNoBalance>
<comMessage ref="comMessage"></comMessage>
</view>
@ -101,8 +103,8 @@
fromLocationCode: "",
toLocationCode: "",
toLocationAreaTypeList: [],
jobStatus:"",
jobToLocationCode:"",
jobStatus: "",
jobToLocationCode: "",
};
},
onLoad(option) {
@ -128,7 +130,7 @@
onBackPress(e) {
//
if (e.from == 'backbutton') {
if (this.jobStatus=="2") {
if (this.jobStatus == "2") {
//
cancleTakePutawayJob(this.id).then(res => {
uni.navigateBack();
@ -272,7 +274,7 @@
r.batch == batch &&
r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
var isExit;
for (let subItem of detail.subList) {
@ -288,13 +290,13 @@
if (item != undefined) {
subItem.scaned = true
subItem.handleQty = 0;
item=undefined
item = undefined
}
}
if(isExit == undefined){
if (isExit == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
}else {
} else {
if (isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
@ -306,13 +308,13 @@
calcTreeHandleQty(this.detailSource);
this.$forceUpdate()
} else {
var scanedLength =0;
itemDetail.packList.forEach(res=>{
if(res.scaned){
var scanedLength = 0;
itemDetail.packList.forEach(res => {
if (res.scaned) {
scanedLength++;
}
})
if (itemDetail.scaned&&scanedLength==itemDetail.packList.length) {
if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
@ -324,7 +326,7 @@
pac.handleQty = Number(pac.qty);
pac.toLocationCode = this.toLocationCode;
})
calcTreeHandleQty(this.detailSource);
this.continueScan()
this.$forceUpdate()
@ -338,12 +340,12 @@
scanLocationCode(location, code) {
// this.$refs.comMessage.showQuestionMessage("[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
// })
},
@ -448,14 +450,14 @@
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
detail.toContainerNumber = '';
detail.singlePrice = 1;
detail.amount = 11;
detail.arriveDate = getCurrDateTime();
detail.produceDate = getCurrDateTime();
detail.expireDate = getCurrDateTime();
// detail.singlePrice = detail.balance.singlePrice;
// detail.amount = detail.balance.singlePrice * detail.handleQty;
@ -530,4 +532,4 @@
<style scoped lang="scss">
</style>
</style>

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

@ -312,15 +312,15 @@
.toLocationCode;
record.supplierCode = r.supplierCode;
if(record.parentPackingNumber!='')
if(r.parentPackingNumber!='')
{
record.fromPackingNumber = record.parentPackingNumber;
record.fromPackingNumber = r.parentPackingNumber;
record.toPackingNumber = r
.packingNumber;
}
else
{
record.fromPackingNumber = record.packingNumber;
record.fromPackingNumber = r.packingNumber;
record.toPackingNumber = r
.packingNumber;
}

Loading…
Cancel
Save