4 changed files with 1586 additions and 1716 deletions
@ -1,139 +1,122 @@ |
|||||
<template> |
<template> |
||||
<view> |
<view> |
||||
<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode" |
<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode" |
||||
:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> --> |
:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> --> |
||||
|
|
||||
<view v-for="(item,index) in dataContent.subList" style="margin-bottom: 20rpx;"> |
<view v-for="(item,index) in dataContent.subList" style="margin-bottom: 20rpx;"> |
||||
<uni-swipe-action ref="swipeAction" :class="item.scaned? 'scan_view':''"> |
<u-swipe-action ref="swipeAction" |
||||
<uni-swipe-action-item |
:options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options" |
||||
:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options" |
@click="(...event)=>swipeClick(event,item,index)" |
||||
@click="swipeClick($event,item,index)" style='padding:20rpx 0px 5px 0px;align-items: center;'> |
:class="item.scaned? 'scan_view':''"> |
||||
<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false"></item-qty> |
<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false"></item-qty> |
||||
<location :locationCode="item.fromLocationCode"></location> |
<location :locationCode="item.fromLocationCode"></location> |
||||
<recommendBalanceBatch style='margin-left: 20px;' :detail="item" :isShowLocation="false" |
<recommendBalanceBatch style='margin-left: 20px;' :detail="item" :isShowLocation="false" |
||||
:isShowPack="item.packingNumber"></recommendBalanceBatch> |
:isShowPack="item.packingNumber"></recommendBalanceBatch> |
||||
|
</u-swipe-action> |
||||
</uni-swipe-action-item> |
</view> |
||||
</uni-swipe-action> |
</view> |
||||
</view> |
<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></qtyEdit> |
||||
</view> |
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
||||
<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></qtyEdit> |
<comMessage ref="message"></comMessage> |
||||
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
||||
<comMessage ref="message"></comMessage> |
|
||||
</template> |
</template> |
||||
|
|
||||
<script> |
<script setup lang="ts"> |
||||
import itemQty from '@/mycomponents/item/itemQty.vue' |
import itemQty from '@/mycomponents/item/itemQty.vue' |
||||
import recommend from '@/mycomponents/recommend/recommend.vue' |
import recommend from '@/mycomponents/recommend/recommend.vue' |
||||
import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue' |
import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue' |
||||
import handleBalance from '@/mycomponents/balance/handleBalance.vue' |
import handleBalance from '@/mycomponents/balance/handleBalance.vue' |
||||
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' |
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' |
||||
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' |
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' |
||||
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' |
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' |
||||
import qtyEdit from '@/mycomponents/qty/qtyEdit.vue' |
import qtyEdit from '@/mycomponents/qty/qtyEdit.vue' |
||||
import location from '@/mycomponents/balance/location.vue' |
import location from '@/mycomponents/balance/location.vue' |
||||
import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue' |
import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue' |
||||
|
|
||||
import { |
import { |
||||
getDetailOption, |
getDetailOption, |
||||
getPurchaseReceiptOption, |
getPurchaseReceiptOption, |
||||
getRemoveOption, |
getRemoveOption, |
||||
getEditRemoveOption |
getEditRemoveOption |
||||
} from '@/common/array.js'; |
} from '@/common/array.js'; |
||||
|
|
||||
|
import {ref, nextTick, onMounted} from 'vue'; |
||||
|
|
||||
|
const props = defineProps({ |
||||
|
dataContent: { |
||||
|
type: Object, |
||||
|
default: () => ({}) |
||||
|
}, |
||||
|
settingParam: { |
||||
|
type: Object, |
||||
|
default: () => ({}) |
||||
|
}, |
||||
|
isEdit: { |
||||
|
type: Boolean, |
||||
|
default: true |
||||
|
} |
||||
|
}); |
||||
|
const emit = defineEmits(['updateData']); |
||||
|
|
||||
export default { |
const option = ref([]); |
||||
emits: ['updateData'], |
const showItem = ref({}); |
||||
components: { |
const editItem = ref({}); |
||||
itemQty, |
const batchItem = ref({}); |
||||
recommend, |
const detailOptions = ref([]); |
||||
recommendBalanceBatch, |
const scanOptions = ref([]); |
||||
handleBalance, |
const removeOptions = ref([]); |
||||
recommendQtyEdit, |
const editAndRemoveOptions = ref([]); |
||||
requiredLocation, |
const collapse = ref(null); |
||||
qtyEdit, |
const balanceQtyEdit = ref(null); |
||||
location, |
const receiptHint = ref(null); |
||||
detailInfoPopup |
const message = ref(null); |
||||
}, |
onMounted(() => { |
||||
props: { |
removeOptions.value = getRemoveOption(); |
||||
dataContent: { |
editAndRemoveOptions.value = getEditRemoveOption(); |
||||
type: Object, |
}); |
||||
default: {} |
|
||||
}, |
|
||||
settingParam: { |
|
||||
type: Object, |
|
||||
default: {} |
|
||||
}, |
|
||||
isEdit: { |
|
||||
type: Boolean, |
|
||||
default: true |
|
||||
}, |
|
||||
}, |
|
||||
watch: { |
|
||||
|
|
||||
}, |
const resizeCollapse = () => { |
||||
|
nextTick(() => { |
||||
|
collapse.value.forEach(r => { |
||||
|
r.childrens.forEach(i => { |
||||
|
i.init(); |
||||
|
}); |
||||
|
r.resize(); |
||||
|
}); |
||||
|
}); |
||||
|
}; |
||||
|
|
||||
data() { |
const swipeClick = (e, item, index) => { |
||||
return { |
if (e.content.text === "编辑") { |
||||
option: [], |
edit(item); |
||||
showItem: {}, |
} else if (e.content.text === "移除") { |
||||
editItem: {}, |
remove(item, index); |
||||
batchItem: {}, |
} |
||||
detailOptions: [], |
}; |
||||
scanOptions: [] |
|
||||
} |
|
||||
}, |
|
||||
|
|
||||
mounted() { |
const edit = (item) => { |
||||
|
editItem.value = item; |
||||
this.removeOptions = getRemoveOption(); |
balanceQtyEdit.value.openEditPopup(item); |
||||
this.editAndRemoveOptions = getEditRemoveOption() |
}; |
||||
}, |
|
||||
|
|
||||
methods: { |
const detail = (item) => { |
||||
resizeCollapse() { |
showItem.value = item; |
||||
this.$nextTick(r => { |
receiptHint.value.openScanPopup(); |
||||
this.$refs.collapse.forEach(r => { |
}; |
||||
r.childrens.forEach(i => { |
|
||||
i.init(); |
|
||||
}) |
|
||||
r.resize(); |
|
||||
}) |
|
||||
}); |
|
||||
}, |
|
||||
|
|
||||
swipeClick(e, item, index) { |
const remove = (item, index) => { |
||||
if (e.content.text == "编辑") { |
message.value.showQuestionMessage("确定移除扫描信息?", (res) => { |
||||
this.edit(item) |
if (res) { |
||||
} else if (e.content.text == "移除") { |
item.handleQty = 0; |
||||
this.remove(item, index) |
item.scaned = false; |
||||
} |
} |
||||
}, |
}); |
||||
|
}; |
||||
|
|
||||
edit(item) { |
const confirm = (val) => { |
||||
let that = this; |
editItem.value.handleQty = Number(val); |
||||
that.editItem = item; |
emit('updateData', editItem.value); |
||||
that.$refs.balanceQtyEdit.openEditPopup(item); |
}; |
||||
}, |
|
||||
|
|
||||
detail(item) { |
|
||||
this.showItem = item; |
|
||||
this.$refs.receiptHint.openScanPopup() |
|
||||
}, |
|
||||
remove(item, index) { |
|
||||
this.$refs.message.showQuestionMessage("确定移除扫描信息?", |
|
||||
res => { |
|
||||
if (res) { |
|
||||
item.handleQty = 0; |
|
||||
item.scaned = false ; |
|
||||
} |
|
||||
}); |
|
||||
}, |
|
||||
confirm(val) { |
|
||||
this.editItem.handleQty = Number(val); |
|
||||
this.$emit('updateData', this.editItem) |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
</script> |
</script> |
||||
|
|
||||
<style> |
<style> |
||||
|
File diff suppressed because it is too large
File diff suppressed because it is too large
@ -1,479 +1,437 @@ |
|||||
<template> |
<template> |
||||
<view class="page-wraper"> |
<view class="page-wraper"> |
||||
<view class="page-header"> |
<view class="page-header"> |
||||
<view class="header-view"> |
<view class="header-view"> |
||||
<view class="header_job_top"> |
<view class="header_job_top"> |
||||
<job-top :dataContent="jobContent"></job-top> |
<job-top :dataContent="jobContent"></job-top> |
||||
</view> |
</view> |
||||
<view class="cen_card" style="padding: 5rpx;"> |
<view class="cen_card" style="padding: 5rpx;"> |
||||
<view class="cell_box uni-flex uni-row"> |
<view class="cell_box uni-flex uni-row"> |
||||
<view class="cell_info"> |
<view class="cell_info"> |
||||
<view class="text_lightblue">发货类型</view> |
<view class="text_lightblue">发货类型</view> |
||||
<view>{{jobContent.deliverType}}</view> |
<view>{{ jobContent.deliverType }}</view> |
||||
</view> |
</view> |
||||
|
|
||||
<view class="cell_info"> |
<view class="cell_info"> |
||||
<view class="text_lightblue">客户代码</view> |
<view class="text_lightblue">客户代码</view> |
||||
<view>{{jobContent.customerCode}}</view> |
<view>{{ jobContent.customerCode }}</view> |
||||
</view> |
</view> |
||||
|
|
||||
<view class="cell_info"> |
<view class="cell_info"> |
||||
<view class="text_lightblue">目标库位</view> |
<view class="text_lightblue">目标库位</view> |
||||
<view>{{toLocationCode}}</view> |
<view>{{ toLocationCode }}</view> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
|
|
||||
<view class="page-main"> |
<view class="page-main"> |
||||
<scroll-view scroll-y="true" class="page-main-scroll"> |
<scroll-view scroll-y="true" class="page-main-scroll"> |
||||
<view> |
<view> |
||||
<comDeliverDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent" |
<comDeliverDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent" |
||||
@updateData='updateData'> |
@updateData='updateData'> |
||||
</comDeliverDetailCardBatch> |
</comDeliverDetailCardBatch> |
||||
</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" style="background-color:ghostwhite; width: 100%; "> |
<view class="uni-flex u-col-center space-between padding_10" 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="submit()">提交</button> |
<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
</view> |
</view> |
||||
|
|
||||
<win-scan-button @goScan='openScanDetailPopup'></win-scan-button> |
<win-scan-button @goScan='openScanDetailPopup'></win-scan-button> |
||||
<comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'> |
<comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'> |
||||
</comScanDeliverPackBatch> |
</comScanDeliverPackBatch> |
||||
<comMessage ref="comMessage"></comMessage> |
<comMessage ref="comMessage"></comMessage> |
||||
</view> |
</view> |
||||
</template> |
</template> |
||||
|
|
||||
<script> |
<script setup lang="ts"> |
||||
import { |
import { |
||||
getDeliverDetail, |
getDeliverDetail, |
||||
takeDeliverJob, |
takeDeliverJob, |
||||
cancleTakeDeliverJob, |
cancleTakeDeliverJob, |
||||
deliverJobSubmit |
deliverJobSubmit |
||||
} from '@/api/request2.js'; |
} from '@/api/request2.js'; |
||||
|
|
||||
|
|
||||
import { |
import { |
||||
calc |
calc |
||||
} from '@/common/calc.js'; |
} from '@/common/calc.js'; |
||||
|
|
||||
import { |
import { |
||||
goHome, |
goHome, |
||||
navigateBack, |
navigateBack, |
||||
getRemoveOption, |
getRemoveOption, |
||||
getCurrDateTime, |
getCurrDateTime, |
||||
getPackingNumberAndBatch, |
getPackingNumberAndBatch, |
||||
deepCopyData |
deepCopyData |
||||
} 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 { |
import { |
||||
getManagementPrecisions |
getManagementPrecisions |
||||
} from '@/common/balance.js'; |
} from '@/common/balance.js'; |
||||
|
|
||||
|
|
||||
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 comDeliverDetailCardBatch from '@/pages/deliver/coms/comDeliverDetailCardBatch.vue' |
import comDeliverDetailCardBatch from '@/pages/deliver/coms/comDeliverDetailCardBatch.vue' |
||||
import comScanDeliverPackBatch from '@/pages/deliver/coms/comScanDeliverPackBatch.vue' |
import comScanDeliverPackBatch from '@/pages/deliver/coms/comScanDeliverPackBatch.vue' |
||||
import jobTop from '@/mycomponents/job/jobTop.vue' |
import jobTop from '@/mycomponents/job/jobTop.vue' |
||||
|
|
||||
export default { |
|
||||
name: 'issueDetail', |
import {ref} from 'vue'; |
||||
components: { |
import {onLoad, onNavigationBarButtonTap, onBackPress} from '@dcloudio/uni-app'; |
||||
jobDetailPopup, |
|
||||
winScanButton, |
const id = ref(''); |
||||
comDeliverDetailCardBatch, |
const jobContent = ref({}); |
||||
comScanDeliverPackBatch, |
const subList = ref([]); |
||||
jobTop |
const detailSource = ref([]); |
||||
}, |
const detailOptions = ref([]); |
||||
data() { |
const scanOptions = ref([]); |
||||
return { |
const status = ref(""); |
||||
id: '', |
const toLocationCode = ref(""); |
||||
jobContent: {}, //任务内容 |
const jobStatus = ref(""); |
||||
subList: [], //接口返回的任务subList |
const dataContent = ref('') |
||||
detailSource: [], //绑定在页面上的数据源 |
|
||||
detailOptions: [], |
const managementList = ref([]); |
||||
scanOptions: [], |
const comMessage = ref(null); |
||||
status: "", |
const scanPopup = ref(null); |
||||
toLocationCode: "", |
const comScanIssuePack = ref(null); |
||||
jobStatus: "" |
import {useCountStore} from '@/store' |
||||
}; |
const store = useCountStore(); |
||||
}, |
|
||||
|
onLoad((option) => { |
||||
props: { |
uni.setNavigationBarTitle({ |
||||
|
title: option.title + '详情' |
||||
}, |
}); |
||||
|
id.value = option.id; |
||||
onLoad(option) { |
if (id.value != undefined) { |
||||
uni.setNavigationBarTitle({ |
// 新建的任务自动接收 |
||||
title: option.title + '详情' |
if (option.status == "1") { |
||||
}) |
receive(() => { |
||||
this.id = option.id; |
getDetail(); |
||||
if (this.id != undefined) { |
}); |
||||
//新建的任务自动接收 |
} else { |
||||
if (option.status == "1") { |
getDetail(); |
||||
this.receive((callback => { |
} |
||||
this.getDetail(); |
} |
||||
})); |
}); |
||||
} else { |
|
||||
this.getDetail(); |
onNavigationBarButtonTap((e) => { |
||||
} |
if (e.index === 0) { |
||||
} |
goHome(); |
||||
}, |
} |
||||
|
}); |
||||
onNavigationBarButtonTap(e) { |
|
||||
if (e.index === 0) { |
onBackPress((e) => { |
||||
goHome(); |
// 已经接收但是没提交任务 |
||||
} |
if (e.from == 'backbutton') { |
||||
}, |
if (jobStatus.value == "2") { |
||||
|
// 取消承接任务 |
||||
//拦截返回按钮事件 |
cancleTakeDeliverJob(id.value).then(() => { |
||||
onBackPress(e) { |
uni.navigateBack(); |
||||
//已经接收但是没提交任务 |
}).catch(() => { |
||||
if (e.from == 'backbutton') { |
uni.navigateBack(); |
||||
if (this.jobStatus == "2") { |
}); |
||||
//取消承接任务 |
} else { |
||||
cancleTakeDeliverJob(this.id).then(res => { |
uni.navigateBack(); |
||||
uni.navigateBack(); |
} |
||||
}).catch(error => { |
return true; |
||||
uni.navigateBack(); |
} |
||||
}) |
}); |
||||
} else { |
|
||||
uni.navigateBack(); |
const receive = (callback) => { |
||||
} |
if (id.value != null) { |
||||
|
takeDeliverJob(id.value).then(() => { |
||||
return true; |
callback(); |
||||
} |
}).catch((error) => { |
||||
|
showErrorMessage(error); |
||||
}, |
}); |
||||
|
} |
||||
methods: { |
}; |
||||
//接收 |
|
||||
receive(callback) { |
const getDetail = () => { |
||||
if (this.id != null) { |
uni.showLoading({ |
||||
takeDeliverJob(this.id).then(res => { |
title: "加载中....", |
||||
callback(); |
mask: true |
||||
}).catch(error => { |
}); |
||||
this.showErrorMessage(error) |
getDeliverDetail(id.value).then((res) => { |
||||
}) |
uni.hideLoading(); |
||||
} |
if (res.data && res.data.subList.length > 0) { |
||||
}, |
jobContent.value = res.data; |
||||
|
jobStatus.value = res.data.status; |
||||
getDetail() { |
subList.value = res.data.subList; |
||||
var that = this; |
detailSource.value = res.data; |
||||
uni.showLoading({ |
toLocationCode.value = subList.value[0].toLocationCode; |
||||
title: "加载中....", |
resizeCollapse(); |
||||
mask: true |
} else { |
||||
}); |
showMessage('未获取到详情'); |
||||
getDeliverDetail(that.id).then(res => { |
} |
||||
uni.hideLoading(); |
}).catch((error) => { |
||||
if (res.data && res.data.subList.length > 0) { |
uni.hideLoading(); |
||||
that.jobContent = res.data; |
showErrorMessage(error); |
||||
that.jobStatus = res.data.status; |
}); |
||||
that.subList = res.data.subList; |
}; |
||||
that.detailSource = res.data; |
|
||||
that.toLocationCode = that.subList[0].toLocationCode |
const closeScan = () => { |
||||
that.resizeCollapse(); |
resizeCollapse(); |
||||
} else { |
}; |
||||
that.showMessage('未获取到详情'); |
|
||||
} |
const resizeCollapse = () => { |
||||
}).catch(error => { |
// 实现具体逻辑 |
||||
uni.hideLoading() |
}; |
||||
this.showErrorMessage(error) |
|
||||
}) |
const submit = () => { |
||||
}, |
uni.showLoading({ |
||||
|
title: "提交中....", |
||||
closeScan() { |
mask: true |
||||
this.resizeCollapse(); |
}); |
||||
}, |
|
||||
|
// 目前任务只到一个库位 |
||||
resizeCollapse() { |
const itemCodes = []; |
||||
|
const locationCode = detailSource.value.subList[0].toLocationCode; |
||||
}, |
detailSource.value.subList.forEach((item) => { |
||||
|
itemCodes.push(item.itemCode); |
||||
|
}); |
||||
|
|
||||
submit() { |
// 获取管理模式,封装参数 |
||||
uni.showLoading({ |
getManagementPrecisions(itemCodes, locationCode, (res) => { |
||||
title: "提交中....", |
if (res.success) { |
||||
mask: true |
managementList.value = res.list; |
||||
}); |
submitJob(); |
||||
|
} else { |
||||
//目前任务只到一个库位 |
uni.hideLoading(); |
||||
var itemCodes = [] |
showErrorMessage(res.message); |
||||
let locationCode = this.detailSource.subList[0].toLocationCode |
} |
||||
this.detailSource.subList.forEach(item => { |
}); |
||||
itemCodes.push(item.itemCode) |
}; |
||||
}) |
|
||||
//获取管理模式,封装参数 |
const checkCount = () => { |
||||
getManagementPrecisions(itemCodes, locationCode, res => { |
let str = ""; |
||||
if (res.success) { |
let taskQty = 0; |
||||
this.managementList = res.list; |
let totalQty = 0; |
||||
this.submitJob(); |
detailSource.value.subList.forEach((item) => { |
||||
} else { |
taskQty = calc.add(taskQty, item.qty); |
||||
uni.hideLoading(); |
const handleQty = item.qty ? item.qty : 0; |
||||
this.showErrorMessage(res.message); |
totalQty = calc.add(totalQty, handleQty); |
||||
} |
// 实际扫描的数量 |
||||
}); |
item.totalQty = totalQty; |
||||
// //使用在途库,不查询管理模式 |
}); |
||||
// if (locationCode == null) { |
|
||||
// this.submitJob(); |
// 如果允许部分提交任务有扫描记录就可以直接提交;如果不允许部分执行,任务数量和提交数量不一致给出提示 |
||||
// } else { |
if (jobContent.value.allowPartialComplete == "FALSE") { |
||||
// //获取管理模式,封装参数 |
detailSource.value.subList.forEach((detail) => { |
||||
// getManagementPrecisions(itemCodes, locationCode, res => { |
if (taskQty != totalQty) { |
||||
// if (res.success) { |
str += `物料号【${detail.itemCode}】任务数量【${taskQty}】与实际提交数量【${totalQty}】不一致\n`; |
||||
// this.managementList = res.list; |
} |
||||
// this.submitJob(); |
}); |
||||
// } else { |
} |
||||
// uni.hideLoading(); |
|
||||
// this.showErrorMessage(res.message); |
if (str) { |
||||
// } |
str = '不允许提交\n' + str; |
||||
// }); |
showErrorMessage(str); |
||||
// } |
} |
||||
}, |
|
||||
|
return str ? false : true; |
||||
checkCount() { |
}; |
||||
let str = "" |
|
||||
var taskQty = 0; |
const submitJob = () => { |
||||
var totalQty = 0; |
const params = setParams(); |
||||
this.detailSource.subList.forEach(item => { |
console.log("提交参数", params); |
||||
item.taskQty = calc.add(taskQty, item.qty) |
if (params.subList.length == 0) { |
||||
var hanleQty = item.qty ? item.qty : 0 |
uni.hideLoading(); |
||||
totalQty = calc.add(totalQty, hanleQty) |
comMessage.value.showConfirmMessageModal('请扫描箱码'); |
||||
//实际扫描的数量 |
return; |
||||
item.totalQty = totalQty |
} |
||||
|
|
||||
}) |
if (!checkCount()) { |
||||
//如果允许部分提交任务有扫描记录就可以直接提交;如果不允许部分执行,任务数量和提交数量不一致给出提示 |
uni.hideLoading(); |
||||
this.detailSource.subList.forEach(detail => { |
return; |
||||
if (this.jobContent.allowPartialComplete == "FALSE") { |
} |
||||
if (item.taskQty != item.totalQty) { |
|
||||
str += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致\n` |
deliverJobSubmit(params).then((res) => { |
||||
} |
uni.hideLoading(); |
||||
} |
if (res.data) { |
||||
}) |
showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data); |
||||
|
} else { |
||||
if (str) { |
showErrorMessage("提交失败[" + res.msg + "]"); |
||||
str = '不允许提交\n' + str |
} |
||||
this.showErrorMessage(str) |
}).catch((error) => { |
||||
} |
uni.hideLoading(); |
||||
|
showErrorMessage(error); |
||||
return str ? false : true |
}); |
||||
|
}; |
||||
}, |
|
||||
|
const setParams = () => { |
||||
submitJob() { |
const subList = []; |
||||
var params = this.setParams() |
const createTime = getCurrDateTime(); |
||||
console.log("提交参数", params); |
const creator = store.id; |
||||
if (params.subList.length == 0) { |
|
||||
uni.hideLoading() |
detailSource.value.subList.forEach((r) => { |
||||
this.$refs.comMessage.showConfirmMessageModal('请扫描箱码') |
if (r.scaned) { |
||||
return |
const subItem = {...r}; |
||||
} |
subItem.recordList = []; |
||||
|
const record = {}; |
||||
if (!this.checkCount()) { |
record.handleQty = r.handleQty; |
||||
uni.hideLoading() |
record.toContainerNumber = r.ContainerNumber; |
||||
return; |
record.toInventoryStatus = r.inventoryStatus; |
||||
} |
record.toLocationCode = subItem.toLocationCode; |
||||
deliverJobSubmit(params).then(res => { |
record.supplierCode = r.supplierCode; |
||||
uni.hideLoading() |
const info = getPackingNumberAndBatch(managementList.value, r.itemCode, r.packingNumber, r.batch); |
||||
if (res.data) { |
record.toPackingNumber = info.packingNumber; |
||||
this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data) |
record.packingNumber = info.packingNumber; |
||||
} else { |
record.fromPackingNumber = info.packingNumber; |
||||
this.showErrorMessage("提交失败[" + res.msg + "]") |
record.toBatch = info.batch; |
||||
} |
subItem.toPackingNumber = info.packingNumber; |
||||
}).catch(error => { |
subItem.packingNumber = info.packingNumber; |
||||
uni.hideLoading() |
subItem.fromPackingNumber = info.packingNumber; |
||||
this.showErrorMessage(error) |
subItem.recordList.push(record); |
||||
}) |
subList.push(deepCopyData(subItem)); |
||||
}, |
} |
||||
|
}); |
||||
setParams() { |
|
||||
var subList = [] |
jobContent.value.subList = subList; |
||||
var createTime = getCurrDateTime(); |
jobContent.value.createTime = createTime; |
||||
var creator = this.$store.state.user.id |
jobContent.value.creator = creator; |
||||
this.detailSource.subList.forEach(r => { |
return jobContent.value; |
||||
if (r.scaned) { |
}; |
||||
let subItem = { |
|
||||
...r |
const cancel = () => { |
||||
} |
comMessage.value.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', (res) => { |
||||
subItem.recordList = [] |
if (res) { |
||||
let record = {}; |
clearInfo(); |
||||
record.handleQty = r.handleQty; |
} |
||||
record.toContainerNumber = r.ContainerNumber; |
}); |
||||
record.toInventoryStatus = r.inventoryStatus; |
}; |
||||
record.toLocationCode = subItem.toLocationCode; |
|
||||
record.supplierCode = r.supplierCode; |
const clearInfo = () => { |
||||
var info = getPackingNumberAndBatch(this.managementList, r.itemCode, r.packingNumber, r.batch); |
dataContent.value.itemCodeList.forEach((res) => { |
||||
record.toPackingNumber = info.packingNumber; |
if (res.recommendList != null) { |
||||
record.packingNumber = info.packingNumber; |
res.recommendList.forEach((res1) => { |
||||
record.fromPackingNumber = info.packingNumber; |
if (res1.locationCodeList != null) { |
||||
record.toBatch = info.batch; |
res1.locationCodeList.forEach((res2) => { |
||||
subItem.toPackingNumber = info.packingNumber; |
if (res2.packingCodeList != null) { |
||||
subItem.packingNumber = info.packingNumber; |
res2.packingCodeList.forEach((res3) => { |
||||
subItem.fromPackingNumber = info.packingNumber; |
res3.itemCode = ""; |
||||
// //使用在途库不改变管理模式 |
res3.qty = 0; |
||||
// if (this.toLocationCode == null) { |
}); |
||||
// record.toPackingNumber = r.packingNumber; |
} |
||||
// record.toBatch = r.batch; |
}); |
||||
// } else { |
} |
||||
// var info = getPackingNumberAndBatch(this.managementList, r.itemCode,r.packingNumber, r.batch); |
}); |
||||
// record.toPackingNumber = info.packingNumber; |
} |
||||
// record.toBatch = info.batch; |
}); |
||||
// } |
}; |
||||
subItem.recordList.push(record); |
|
||||
subList.push(deepCopyData(subItem)); |
const updateData = (record) => { |
||||
} |
}; |
||||
}) |
|
||||
|
const scanPopupGetFocus = () => { |
||||
this.jobContent.subList = subList |
if (scanPopup.value != undefined) { |
||||
this.jobContent.createTime = createTime; |
scanPopup.value.getfocus(); |
||||
this.jobContent.creator = creator; |
} |
||||
return this.jobContent; |
}; |
||||
}, |
|
||||
|
const showMessage = (message) => { |
||||
cancel() { |
comMessage.value.showMessage(message, (res) => { |
||||
let that = this; |
if (res) { |
||||
this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => { |
afterCloseMessage(); |
||||
if (res) { |
} |
||||
that.clearInfo(); |
}); |
||||
} |
}; |
||||
}); |
|
||||
}, |
const showErrorMessage = (message) => { |
||||
|
comMessage.value.showErrorMessage(message, (res) => { |
||||
clearInfo() { |
if (res) { |
||||
this.dataContent.itemCodeList.forEach(res => { |
afterCloseMessage(); |
||||
if (res.recommendList != null) { |
} |
||||
res.recommendList.forEach(res1 => { |
}); |
||||
if (res1.locationCodeList != null) { |
}; |
||||
res1.locationCodeList.forEach(res2 => { |
|
||||
if (res2.packingCodeList != null) { |
const showScanMessage = (message) => { |
||||
res2.packingCodeList.forEach(res3 => { |
comMessage.value.showScanMessage(message); |
||||
res3.itemCode = ""; |
}; |
||||
res3.qty = 0; |
|
||||
}) |
const showCommitSuccess = () => { |
||||
} |
comMessage.value.showCommitSuccess(); |
||||
}) |
}; |
||||
} |
|
||||
|
const showCommitSuccessMessage = (hint) => { |
||||
}) |
comMessage.value.showSuccessMessage(hint, (res) => { |
||||
} |
navigateBack(1); |
||||
|
}); |
||||
}) |
}; |
||||
}, |
|
||||
|
const showRescanMessage = (message) => { |
||||
updateData(record) { |
comMessage.value.showRescanMessage(message); |
||||
|
}; |
||||
}, |
|
||||
|
const afterCloseMessage = () => { |
||||
scanPopupGetFocus() { |
scanPopupGetFocus(); |
||||
if (this.$refs.scanPopup != undefined) { |
}; |
||||
this.$refs.scanPopup.getfocus(); |
|
||||
} |
const closeScanMessage = () => { |
||||
}, |
scanPopupGetFocus(); |
||||
|
}; |
||||
showMessage(message) { |
|
||||
this.$refs.comMessage.showMessage(message, res => { |
const confirm = (data) => { |
||||
if (res) { |
dataContent.value = data; |
||||
this.afterCloseMessage() |
}; |
||||
} |
|
||||
}); |
const confirmResult = (result) => { |
||||
}, |
dataContent.value = result; |
||||
showErrorMessage(message) { |
}; |
||||
this.$refs.comMessage.showErrorMessage(message, res => { |
|
||||
if (res) { |
const openScanDetailPopup = () => { |
||||
this.afterCloseMessage() |
const datacontent = {...detailSource.value}; // 深度克隆 |
||||
} |
comScanIssuePack.value.openScanPopup(datacontent, jobContent.value); |
||||
}); |
}; |
||||
}, |
|
||||
|
const closeScanPopup = () => { |
||||
showScanMessage(message) { |
// updateCommitBtn(); |
||||
this.$refs.comMessage.showScanMessage(message); |
}; |
||||
}, |
|
||||
|
|
||||
showCommitSuccess() { |
|
||||
this.$refs.comMessage.showCommitSuccess(); |
|
||||
}, |
|
||||
|
|
||||
showCommitSuccessMessage(hint) { |
|
||||
this.$refs.comMessage.showSuccessMessage(hint, res => { |
|
||||
navigateBack(1) |
|
||||
}) |
|
||||
}, |
|
||||
|
|
||||
showRescanMessage(message) { |
|
||||
this.$refs.comMessage.showRescanMessage(message); |
|
||||
}, |
|
||||
|
|
||||
|
|
||||
afterCloseMessage() { |
|
||||
this.scanPopupGetFocus(); |
|
||||
}, |
|
||||
|
|
||||
|
|
||||
closeScanMessage() { |
|
||||
this.scanPopupGetFocus(); |
|
||||
}, |
|
||||
confirm(data) { |
|
||||
this.dataContent = data; |
|
||||
}, |
|
||||
confirmResult(result) { |
|
||||
this.dataContent = result; |
|
||||
this.$forceUpdate(); |
|
||||
}, |
|
||||
openScanDetailPopup() { |
|
||||
var datacontent = {} |
|
||||
//克隆对象,深度克隆,防止双向绑定同一个变量 |
|
||||
// Object.assign(datacontent, this.detailSource); |
|
||||
this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); |
|
||||
}, |
|
||||
closeScanPopup() { |
|
||||
this.updateCommitBtn(); |
|
||||
}, |
|
||||
} |
|
||||
}; |
|
||||
</script> |
</script> |
||||
|
|
||||
<style scoped lang="scss"> |
<style scoped lang="scss"> |
||||
.uni-numbox__value { |
.uni-numbox__value { |
||||
width: 40px; |
width: 40px; |
||||
} |
} |
||||
|
|
||||
button[disabled] { |
button[disabled] { |
||||
background-color: #3C9CFF; |
background-color: #3C9CFF; |
||||
color: #fff; |
color: #fff; |
||||
opacity: 0.7; |
opacity: 0.7; |
||||
} |
} |
||||
|
|
||||
|
|
||||
// /deep/ .input-value { |
// /deep/ .input-value { |
||||
// font-size: 16px; |
// font-size: 16px; |
||||
// } |
// } |
||||
|
|
||||
// /deep/ .uni-collapse-item__title-text { |
// /deep/ .uni-collapse-item__title-text { |
||||
// font-size: 16px; |
// font-size: 16px; |
||||
// } |
// } |
||||
|
|
||||
// /deep/ .uni-collapse-item--border { |
// /deep/ .uni-collapse-item--border { |
||||
// border-bottom-width: 0px; |
// border-bottom-width: 0px; |
||||
// border-bottom-color: #ebeef5; |
// border-bottom-color: #ebeef5; |
||||
// } |
// } |
||||
|
|
||||
// /deep/ .uni-collapse-item--border { |
// /deep/ .uni-collapse-item--border { |
||||
// border-bottom-width: 1px; |
// border-bottom-width: 1px; |
||||
// border-bottom-color: #ebeef5; |
// border-bottom-color: #ebeef5; |
||||
// } |
// } |
||||
</style> |
</style> |
Loading…
Reference in new issue