52 changed files with 2127 additions and 431 deletions
@ -1,11 +1,12 @@ |
|||
VITE_BASE_URL=http://172.21.32.13:81/api/admin-api |
|||
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api |
|||
VITE_BASE_URL=http://172.22.32.8:81/api/admin-api |
|||
VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api |
|||
|
|||
# 租户配置 |
|||
VITE_TENANT='[{"text":"长春1379","value":1}]' |
|||
VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' |
|||
|
|||
# 是否是测试环境 |
|||
VITE_isDevelopment=false |
|||
|
|||
|
|||
# 积木报表请求路径 |
|||
VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' |
|||
VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' |
|||
|
|||
@ -0,0 +1,257 @@ |
|||
<template> |
|||
<view style=" "> |
|||
<uni-drawer ref="showRight" mode="left" :mask-click="true" :width="330"> |
|||
<view style="height:100vh;display:flex;flex-direction:column;"> |
|||
<view class="uni-flex" style="justify-content: center; |
|||
background-color:#007AFF ; |
|||
color: #fff; |
|||
padding: 15rpx; |
|||
font-size: 35rpx;"> |
|||
库存查询 |
|||
</view> |
|||
<scroll-view v-if="true" style="height: calc(100vh - 180rpx)" scroll-y="true"> |
|||
<!-- <button @click="closeDrawer" type="primary">关闭Drawer</button> --> |
|||
<!-- <view v-for="item in 110" :key="item">可滚动内容 {{ item }}</view> --> |
|||
<view class="" style="margin: 10rpx; font-size: 35rpx;"> |
|||
物料号： |
|||
</view> |
|||
<view style=" margin: 10rpx; display: flex; align-items: center;"> |
|||
<uni-easyinput class="uni-mt-5" prefixIcon="search" v-model="itemCode" placeholder="请输入物料号" |
|||
@clear="clearItemCode" @confirm="onConfirmItemCode"></uni-easyinput> |
|||
<!-- <view>查询</view> --> |
|||
<!-- <button style="height: 80rpx; align-items: center; text-align: center;" type="primary" size="mini" >查询</button> --> |
|||
</view> |
|||
|
|||
<view v-for="(item, index) in itemCodeResult" :key="index" @click="selectItemCode(item)"> |
|||
<view class="" style="font-size: 30rpx; margin: 20rpx;"> |
|||
<view class=""> |
|||
({{index+1}}) 物料代码 : {{item.code}} |
|||
</view> |
|||
<view class=""> |
|||
名称 : {{item.name}} |
|||
</view> |
|||
<view class=""> |
|||
描述1 : {{item.desc1}} |
|||
</view> |
|||
<view class=""> |
|||
描述2 : {{item.desc1}} |
|||
</view> |
|||
</view> |
|||
<view class="split_line"></view> |
|||
</view> |
|||
<scroll-view scroll-x="true" v-if="tableData.length>0" style="width: 330px; display: flex; align-items: center; justify-content: center; "> |
|||
<view style="width: 330px; display: flex;justify-content: center; background-color: #fff; padding-bottom: 150rpx;"> |
|||
<uni-table border stripe emptyText="暂无更多数据"> |
|||
<!-- 表头行 --> |
|||
<uni-tr> |
|||
<uni-th width="60" style="font-weight: 800;" align="left">序号</uni-th> |
|||
<uni-th width="60" align="left">批次</uni-th> |
|||
<uni-th width="50" align="left">库位</uni-th> |
|||
<uni-th width="60" align="left">状态</uni-th> |
|||
<uni-th width="120" align="left">数量</uni-th> |
|||
</uni-tr> |
|||
<!-- 表格数据行 --> |
|||
<uni-tr v-for="(item, index) in tableData" :key="index"> |
|||
<uni-td>{{index+1}}</uni-td> |
|||
<uni-td>{{item.batch}}</uni-td> |
|||
<uni-td>{{item.locationCode}}</uni-td> |
|||
<uni-td>{{statusDesc(item.inventoryStatus)}}</uni-td> |
|||
<uni-td>{{item.qty}}</uni-td> |
|||
</uni-tr> |
|||
|
|||
</uni-table> |
|||
<view class="uni-flex" style=" flex-direction: column; position: fixed; bottom: 0; margin-bottom: 100rpx; background-color: #fff; width: 100%; align-items: center;" > |
|||
<view class="" style="width: 100%; display: flex; justify-content: center; font-size: 32rpx;margin-top: 10rpx;margin-bottom: 10rpx;"> |
|||
<view class="" >当前页：{{ current }}，总数：{{ total }}条，每页：{{ pageSize }} |
|||
</view> |
|||
|
|||
</view> |
|||
<uni-pagination :current="current" :total="total" :show-icon="true" |
|||
@change="change" /> |
|||
</view> |
|||
|
|||
</view> |
|||
|
|||
</scroll-view> |
|||
|
|||
</scroll-view> |
|||
|
|||
<button @click="closeDrawer" type="primary" style="padding-left: 20rpx;">关闭</button> |
|||
</view> |
|||
|
|||
</uni-drawer> |
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
getBasicItemByCodeSenior, |
|||
} from '@/api/request2.js'; |
|||
|
|||
import { |
|||
getInventoryStatusStyle, |
|||
getInventoryStatusName |
|||
} from '@/common/directory.js'; |
|||
|
|||
export default { |
|||
components: {}, |
|||
|
|||
data() { |
|||
return { |
|||
itemCode: "", |
|||
itemCodeResult: [], |
|||
current: 1, |
|||
total: 18, |
|||
tableData: [{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 1 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 2 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 3 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 4 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 3 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 4 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 3 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 4 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 3 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 4 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 3 |
|||
}, |
|||
{ |
|||
batch: "20240814", |
|||
locationCode: "901", |
|||
inventoryStatus: "OK", |
|||
qty: 4 |
|||
} |
|||
|
|||
] |
|||
} |
|||
}, |
|||
props: { |
|||
// detail: { |
|||
// type: Object, |
|||
// default: {} |
|||
// }, |
|||
// isShowPack: { |
|||
// type: Boolean, |
|||
// default: true |
|||
// } |
|||
}, |
|||
watch: { |
|||
|
|||
}, |
|||
methods: { |
|||
statusStyle: function(val) { |
|||
return getInventoryStatusStyle(val); |
|||
}, |
|||
statusDesc(value) { |
|||
return getInventoryStatusName(value) |
|||
}, |
|||
change() { |
|||
|
|||
}, |
|||
showErrorMessage(message) { |
|||
this.$refs.comMessage.showErrorMessage(message, res => { |
|||
if (res) { |
|||
|
|||
} |
|||
}); |
|||
}, |
|||
selectItemCode(item) { |
|||
this.itemCode = item.code |
|||
this.itemCodeResult = [] |
|||
}, |
|||
clearItemCode() { |
|||
this.itemCode = "" |
|||
this.itemCodeResult = [] |
|||
}, |
|||
onConfirmItemCode() { |
|||
if (!this.itemCode) { |
|||
this.showErrorMessage("物料号为空,请先输入物料号") |
|||
return; |
|||
} |
|||
uni.showLoading({ |
|||
title: "加载中", |
|||
mask: true |
|||
}) |
|||
|
|||
getBasicItemByCodeSenior(this.itemCode).then(res => { |
|||
uni.hideLoading() |
|||
if (res.data && res.data.list.length > 0) { |
|||
if (res.data.list.length == 1) { |
|||
this.itemCode = res.data.list[0].code |
|||
} else { |
|||
this.itemCodeResult = res.data.list |
|||
} |
|||
} else { |
|||
this.showErrorMessage("未查找到物料[" + this.itemCode + "]") |
|||
} |
|||
|
|||
}).catch(error => { |
|||
uni.hideLoading() |
|||
this.showErrorMessage(error) |
|||
}) |
|||
}, |
|||
showDrawer() { |
|||
this.$refs.showRight.open(); |
|||
}, |
|||
closeDrawer() { |
|||
this.$refs.showRight.close(); |
|||
} |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style> |
|||
</style> |
|||
@ -0,0 +1,84 @@ |
|||
<template> |
|||
<view class="wyf"> |
|||
<uni-popup ref="listPopup" type="dialog"> |
|||
<view class="container"> |
|||
<uni-list class="list"> |
|||
<uni-list-item v-for="(item,index) in list" :title="item.title" |
|||
thumb-size="lg" > |
|||
<template v-slot:footer> |
|||
<!-- <image class="slot-image" src="@/static/logo.png" mode="widthFix" @click="selectItem(item,index)"></image --> |
|||
<text class="go" @click="selectItem(item,index)">Go</text> |
|||
</template> |
|||
|
|||
</uni-list-item> |
|||
|
|||
</uni-list> |
|||
</view> |
|||
</uni-popup> |
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import { onShow } from '@dcloudio/uni-app'; |
|||
export default { |
|||
emits: ["selectItem"], |
|||
components: { |
|||
}, |
|||
data() { |
|||
return { |
|||
isScanedASN:false, |
|||
list: [] |
|||
// [{ |
|||
// title:'哈哈哈哈', |
|||
// selected:false |
|||
// }], |
|||
} |
|||
}, |
|||
props: { |
|||
}, |
|||
methods:{ |
|||
openList(list){ |
|||
this.list = list; |
|||
this.$refs.listPopup.open('center') |
|||
}, |
|||
selectItem(item,index){ |
|||
this.$refs.listPopup.close(); |
|||
this.$emit("selectItem", item); |
|||
} |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style lang="scss" scoped> |
|||
.wyf{ |
|||
// display: block; |
|||
position: fixed; |
|||
top: 0; |
|||
left: 0; |
|||
right: 0; |
|||
bottom: 0; |
|||
z-index: 1000 |
|||
} |
|||
.container{ |
|||
display: flex; |
|||
justify-content: center; |
|||
align-items: center; |
|||
.list{ |
|||
width: 80%; |
|||
max-height:50vh; |
|||
overflow-y: auto; |
|||
border-radius: 10px !important; |
|||
.slot-image{ |
|||
width: 40rpx; |
|||
} |
|||
.go{ |
|||
color: rgb(60, 156, 255); |
|||
} |
|||
|
|||
} |
|||
|
|||
} |
|||
.list ::v-deep .uni-list--border{ |
|||
border: 1rpx solid #e5e5e5; |
|||
} |
|||
</style> |
|||
@ -0,0 +1,431 @@ |
|||
<template> |
|||
<view class=""> |
|||
<com-empty-view v-if="jobList.length==0"></com-empty-view> |
|||
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" |
|||
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" |
|||
:checkedWaitTask="checkedWaitTask"> |
|||
</job-filter> |
|||
|
|||
<view v-if="jobList.length>0"> |
|||
<uni-swipe-action ref="swipeAction"> |
|||
<view v-for="(item, index) in jobList" :key="index"> |
|||
<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions" |
|||
@click="swipeClick($event,item)"> |
|||
<com-putaway-job-card :dataContent="item" @click='openJobDetail(item)'></com-putaway-job-card> |
|||
</uni-swipe-action-item> |
|||
</view> |
|||
</uni-swipe-action> |
|||
|
|||
<putaway-info-popup ref='jobInfoPopup'></putaway-info-popup> |
|||
<putaway-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></putaway-job-list-popup> |
|||
<uni-load-more :status="loadingType" v-if="jobList.length>0" /> |
|||
|
|||
</view> |
|||
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|||
|
|||
<winScanPackJob ref="scanPopup" @getResult='getScanResult'> |
|||
</winScanPackJob> |
|||
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|||
|
|||
<comMessage ref="comMessage"></comMessage> |
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import jobList from '@/mycomponents/jobList/jobList.vue' |
|||
|
|||
import { |
|||
getPutawayJobList, |
|||
cancleTakePutawayJob |
|||
} from '@/api/request2.js'; |
|||
|
|||
import { |
|||
goHome, |
|||
updateTitle |
|||
} from '@/common/basic.js'; |
|||
|
|||
import { |
|||
getDetailOption, |
|||
getDetailGiveupOption |
|||
} from '@/common/array.js'; |
|||
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|||
|
|||
import comEmptyView from '@/mycomponents/common/comEmptyView.vue' |
|||
import jobFilter from '@/mycomponents/job/jobFilter.vue' |
|||
import comPutawayJobCard from '@/pages/putaway/coms/comPutawayJobCard.vue' |
|||
import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue' |
|||
import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue' |
|||
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" |
|||
import { |
|||
Exception |
|||
} from 'sass'; |
|||
|
|||
export default { |
|||
name: 'Putaway', |
|||
components: { |
|||
comEmptyView, |
|||
jobFilter, |
|||
comPutawayJobCard, |
|||
putawayJobListPopup, |
|||
putawayInfoPopup, |
|||
winScanButton, |
|||
winScanPackJob, |
|||
jobList |
|||
}, |
|||
data() { |
|||
return { |
|||
jobList: [], |
|||
pageNo: 1, |
|||
pageSize: 10, |
|||
totalCount: 0, |
|||
loadingType: "nomore", |
|||
checkedToday: false, |
|||
checkedWaitTask: false, |
|||
todayTime: "", |
|||
status: '1,2', //待处理 、进行中 |
|||
detailOptions: [], |
|||
detailGiveupOptions: [], |
|||
title: '', |
|||
scanMessage: "" |
|||
}; |
|||
}, |
|||
|
|||
onLoad(option) { |
|||
this.title = option.title |
|||
}, |
|||
|
|||
onShow() { |
|||
this.getList('refresh'); |
|||
|
|||
}, |
|||
|
|||
onReady() { |
|||
this.detailOptions = getDetailOption(); |
|||
this.detailGiveupOptions = getDetailGiveupOption(); |
|||
}, |
|||
|
|||
//后退按钮 |
|||
onBackPress(options) { |
|||
if (options.from === 'navigateBack') { |
|||
uni.navigateBack({ |
|||
delta: 1 |
|||
}) |
|||
return false; |
|||
} |
|||
}, |
|||
|
|||
//返回首页 |
|||
onNavigationBarButtonTap(e) { |
|||
if (e.index === 0) { |
|||
goHome(); |
|||
} else if (e.index == 1) { |
|||
this.$refs.filter.openFilter(); |
|||
} |
|||
}, |
|||
onReachBottom() { |
|||
//避免多次触发 |
|||
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { |
|||
return; |
|||
} |
|||
this.getList("more"); |
|||
}, |
|||
onPullDownRefresh() { |
|||
this.getList('refresh'); |
|||
}, |
|||
|
|||
methods: { |
|||
getList(type) { |
|||
let that = this; |
|||
uni.showLoading({ |
|||
title: "加载中....", |
|||
mask: true |
|||
}); |
|||
|
|||
this.loadingType = "loading"; |
|||
if (type === "refresh") { |
|||
this.pageNo = 1; |
|||
this.jobList = []; |
|||
} |
|||
|
|||
var filters = [] |
|||
if (this.checkedToday) { |
|||
filters.push({ |
|||
column: "create_time", |
|||
action: "betweeen", |
|||
value: this.todayTime |
|||
}) |
|||
} |
|||
|
|||
filters.push({ |
|||
column: "status", |
|||
action: "in", |
|||
value: this.status |
|||
}) |
|||
filters.push({ |
|||
column: "accept_user_id", |
|||
action: "==", |
|||
value: this.$store.state.user.id |
|||
}) |
|||
var params = { |
|||
filters: filters, |
|||
pageNo: this.pageNo, |
|||
pageSize: this.pageSize, |
|||
} |
|||
|
|||
getPutawayJobList(params).then(res => { |
|||
uni.hideLoading(); |
|||
if (type === "refresh") { |
|||
uni.stopPullDownRefresh(); |
|||
this.openScanPopup() |
|||
} |
|||
|
|||
var list = res.data.list; |
|||
this.totalCount = res.data.total |
|||
updateTitle(this.title + "(" + this.totalCount + ")"); |
|||
this.loadingType = "loadmore"; |
|||
if (list == null || list.length == 0) { |
|||
this.loadingType = "nomore"; |
|||
return; |
|||
} |
|||
this.jobList = type === "refresh" ? list : this.jobList.concat(list); |
|||
this.pageNo++; |
|||
|
|||
}).catch(error => { |
|||
if (type === "refresh") { |
|||
uni.stopPullDownRefresh(); |
|||
} |
|||
this.loadingType = ""; |
|||
updateTitle(this.title); |
|||
uni.hideLoading(); |
|||
that.showMessage(error) |
|||
}) |
|||
}, |
|||
|
|||
openJobDetail(item) { |
|||
uni.navigateTo({ |
|||
url: './putawayDetail?id=' + item.masterId + '&status=' + item.status + '&title=' + this.title |
|||
}); |
|||
this.scanMessage = "" |
|||
}, |
|||
|
|||
showItemList(itemList) { |
|||
this.$refs.scanList.openPopup(itemList); |
|||
}, |
|||
|
|||
selectedItem(item) { |
|||
this.openJobDetail(item); |
|||
}, |
|||
|
|||
swipeClick(e, dataContent) { |
|||
if (e.content.text == "详情") { |
|||
this.openjobInfoPopup(dataContent); |
|||
} else if (e.content.text == "放弃") { |
|||
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", |
|||
res => { |
|||
if (res) { |
|||
this.cancleJob(dataContent.masterId); |
|||
} |
|||
}); |
|||
} |
|||
}, |
|||
|
|||
openjobInfoPopup(item) { |
|||
this.$refs.jobInfoPopup.openPopup(item) |
|||
}, |
|||
|
|||
cancleJob(id) { |
|||
cancleTakePutawayJob(id).then(res => { |
|||
if (res.data) { |
|||
this.getList("refresh") |
|||
uni.showToast({ |
|||
title: "放弃任务成功" |
|||
}) |
|||
} else { |
|||
this.showMessage("放弃任务失败") |
|||
} |
|||
}).catch(error => { |
|||
this.showMessage(error) |
|||
}) |
|||
}, |
|||
|
|||
switchChangeToday(state, creationTime) { |
|||
this.checkedToday = state; |
|||
this.todayTime = creationTime; |
|||
this.getList("refresh"); |
|||
}, |
|||
|
|||
switchChangeWait(state, jobStatus) { |
|||
this.checkedWaitTask = state; |
|||
this.status = jobStatus; |
|||
this.getList("refresh"); |
|||
}, |
|||
|
|||
getScanNumber(code) { |
|||
this.getDataListByType(code) |
|||
}, |
|||
|
|||
getDataListByType(code) { |
|||
let that = this; |
|||
uni.showLoading({ |
|||
title: "加载中....", |
|||
mask: true |
|||
}); |
|||
var filters = [] |
|||
filters.push({ |
|||
column: "status", |
|||
action: "in", |
|||
value: '1,2' |
|||
}) |
|||
filters.push({ |
|||
column: "number", |
|||
action: "==", |
|||
value: code |
|||
}) |
|||
|
|||
filters.push({ |
|||
column: "accept_user_id", |
|||
action: "==", |
|||
value: this.$store.state.user.id |
|||
}) |
|||
|
|||
var params = { |
|||
filters: filters, |
|||
pageNo: 1, |
|||
pageSize: 100, |
|||
} |
|||
getPutawayJobList(params).then(res => { |
|||
uni.hideLoading(); |
|||
if (res.data.list.length == 0) { |
|||
that.showMessage('未查找到' + '【' + code + '】的收货任务'); |
|||
} else if (res.data.list.length == 1) { |
|||
that.openJobDetail(res.data.list[0]); |
|||
} |
|||
}).catch(error => { |
|||
uni.hideLoading(); |
|||
that.showMessage(error); |
|||
}) |
|||
}, |
|||
|
|||
|
|||
showMessage(message) { |
|||
if(this.$refs.scanPopup){ |
|||
this.$refs.scanPopup.packLoseFocus() |
|||
} |
|||
this.$refs.comMessage.showErrorMessage(message, res => { |
|||
if (res) { |
|||
if(this.$refs.scanPopup){ |
|||
this.$refs.scanPopup.packGetFocus() |
|||
} |
|||
} |
|||
}); |
|||
}, |
|||
openScanPopup() { |
|||
this.$refs.scanPopup.openScanPopup(); |
|||
}, |
|||
selectItem(item) { |
|||
this.$refs.scanPopup.closeScanPopup(); |
|||
uni.navigateTo({ |
|||
url: './putawayDetail?id=' + |
|||
item.masterId + |
|||
'&status=' + item.status + |
|||
'&scaned=' + item.packingNumber + |
|||
'&title=' + this.title + |
|||
"&scanMessage=" + this.scanMessage |
|||
}); |
|||
this.scanMessage = "" |
|||
}, |
|||
getScanResult(result) { |
|||
try { |
|||
this.scanMessage = "" |
|||
var filters = [{ |
|||
column: "packingNumber", |
|||
action: "in", |
|||
value: result.package.number + "," + result.package.parentNumber |
|||
}, |
|||
{ |
|||
column: "batch", |
|||
action: "==", |
|||
value: result.package.batch |
|||
}, |
|||
// { |
|||
// column: "qty", |
|||
// action: "==", |
|||
// value: result.label.qty |
|||
// }, |
|||
{ |
|||
column: "itemCode", |
|||
action: "==", |
|||
value: result.package.itemCode |
|||
}, |
|||
{ |
|||
column: "status", |
|||
action: "in", |
|||
value: '1,2', |
|||
}, |
|||
// { |
|||
// column: "accept_user_id", |
|||
// action: "==", |
|||
// value: this.$store.state.user.id |
|||
// } |
|||
// { |
|||
// column: "fromLocationCode", |
|||
// action: "==", |
|||
// value: result.label.fromLocationCode |
|||
// }, |
|||
] |
|||
getPutawayJobList({ |
|||
filters: filters, |
|||
pageNo: 1, |
|||
pageSize: 100, |
|||
}).then(res => { |
|||
this.scanMessage = result.scanMessage |
|||
let resultList = res.data.list; |
|||
if (resultList.length > 0) { |
|||
resultList.forEach(item => { |
|||
item.title = item.number; |
|||
item.selected = false |
|||
}) |
|||
let list = [] |
|||
resultList.forEach(item => { |
|||
if (!list.find(subItem => subItem.title == item.title)) { |
|||
list.push(item) |
|||
} |
|||
}) |
|||
if (list.length == 1) { |
|||
//待处理 |
|||
if (list[0].status == 1) { |
|||
this.selectItem(list[0]) |
|||
} else if (list[0].status == 2) { |
|||
//进行中 |
|||
if (list[0].acceptUserId == this.$store.state.user.id) { |
|||
this.selectItem(list[0]) |
|||
} else { |
|||
this.showMessage("该任务已经被[" + list[0].acceptUserName + "]承接" + "\n任务号[" + |
|||
list[0].number + "]扫描[" + result.scanMessage + "]") |
|||
} |
|||
} else if (list[0].status == 3) { |
|||
this.showMessage("该任务已经完成\n承接人[" + list[0].acceptUserName + "]\n任务号[" + |
|||
list[0].number + "]扫描[" + result.scanMessage + "]") |
|||
} |
|||
} else { |
|||
this.showMessage("查询到多条任务\n" + "扫描[" + result.scanMessage + "]") |
|||
} |
|||
|
|||
} else { |
|||
this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") |
|||
} |
|||
}).catch(error => { |
|||
this.showMessage(error + "\n扫描[" + result.scanMessage + "]") |
|||
}) |
|||
|
|||
} catch (e) { |
|||
this.showMessage(e + "\n扫描[" + result.scanMessage + "]") |
|||
} |
|||
}, |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style scoped lang="scss"> |
|||
|
|||
</style> |
|||
@ -0,0 +1,604 @@ |
|||
<template> |
|||
<view class="page-wraper"> |
|||
<view class="page-header"> |
|||
<view class="header-view"> |
|||
<view class="header_job_top"> |
|||
<job-top :dataContent="jobContent"></job-top> |
|||
</view> |
|||
<view class="header_item"> |
|||
申请单号 : {{jobContent.requestNumber}} |
|||
</view> |
|||
</view> |
|||
</view> |
|||
|
|||
<view class="page-main"> |
|||
<scroll-view scroll-y="true" class="page-main-scroll"> |
|||
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> |
|||
<view class=""> |
|||
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" |
|||
:isShowStatus="false" @remove="updateData" @updateData="updateData" |
|||
:locationAreaTypeList='toLocationAreaTypeList'> |
|||
</comJobDetailCard> |
|||
</view> |
|||
</view> |
|||
</scroll-view> |
|||
</view> |
|||
|
|||
<view class="page-footer"> |
|||
<view class="uni-flex u-col-center space-between padding_10" |
|||
style="background-color:ghostwhite; width: 100%; "> |
|||
<view class=""> |
|||
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" |
|||
:locationCode="toLocationCode" @getLocation='scanLocationCode' :isShowEdit="isCheckLocation" |
|||
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> |
|||
</view> |
|||
<view class=" uni-flex uni-row"> |
|||
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> |
|||
</view> |
|||
</view> |
|||
</view> |
|||
|
|||
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|||
<!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true"> |
|||
</winScanPackAndLocationNoBalance> --> |
|||
|
|||
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' |
|||
:noShowBalanceMessage="true"> |
|||
</winScanPackAndLocation> |
|||
|
|||
<comMessage ref="comMessage"></comMessage> |
|||
</view> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
getManagementPrecisions, |
|||
} from '@/common/balance.js'; |
|||
|
|||
import { |
|||
getPutawayJobDetail, |
|||
putawayJobSubmit, |
|||
takePutawayJob, |
|||
cancleTakePutawayJob, |
|||
getSwitchByCode |
|||
} from '@/api/request2.js'; |
|||
import { |
|||
goHome, |
|||
getCurrDateTime, |
|||
getPackingNumberAndBatch, |
|||
navigateBack, |
|||
compareAsc, |
|||
getSwitchInfoByCode |
|||
} from '@/common/basic.js'; |
|||
|
|||
import { |
|||
getDirectoryItemArray, |
|||
getInventoryStatusName |
|||
} from '@/common/directory.js'; |
|||
|
|||
import { |
|||
getTreeDataSource, |
|||
calcHandleQty, |
|||
calcTreeHandleQty, |
|||
getScanCount |
|||
} from '@/common/detail.js'; |
|||
|
|||
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|||
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" |
|||
import comJobDetailCard from "@/mycomponents/detail/comJobDetailCard.vue" |
|||
import locationCompare from '@/mycomponents/location/locationCompare.vue' |
|||
import jobTop from '@/mycomponents/job/jobTop.vue' |
|||
|
|||
|
|||
export default { |
|||
components: { |
|||
winScanButton, |
|||
winScanPackAndLocation, |
|||
locationCompare, |
|||
comJobDetailCard, |
|||
jobTop |
|||
}, |
|||
data() { |
|||
return { |
|||
id: '', |
|||
scanCount: 0, |
|||
jobContent: {}, //任务内容 |
|||
subList: [], //接口返回的任务subList |
|||
detailSource: [], //绑定在页面上的数据源 |
|||
managementList: [], |
|||
fromLocationCode: "", |
|||
toLocationCode: "", |
|||
toLocationAreaTypeList: [], |
|||
jobStatus: "", |
|||
jobToLocationCode: "", |
|||
isCheckLocation: false, |
|||
scanMessage: "" |
|||
}; |
|||
}, |
|||
onLoad(option) { |
|||
uni.setNavigationBarTitle({ |
|||
title: option.title + '详情' |
|||
}) |
|||
this.id = option.id; |
|||
this.scanMessage = option.scanMessage |
|||
if (this.id != undefined) { |
|||
//新建的任务自动接收 |
|||
if (option.status == "1") { |
|||
this.receive((callback => { |
|||
this.getDetail(); |
|||
})); |
|||
} else { |
|||
this.getDetail(); |
|||
} |
|||
} |
|||
|
|||
|
|||
}, |
|||
//返回首页 |
|||
onNavigationBarButtonTap(e) { |
|||
if (e.index === 0) { |
|||
goHome(); |
|||
} |
|||
}, |
|||
//拦截返回按钮事件 |
|||
onBackPress(e) { |
|||
//已经接收但是没提交任务 |
|||
if (e.from == 'backbutton') { |
|||
if (this.jobStatus == "2") { |
|||
//取消承接任务 |
|||
cancleTakePutawayJob(this.id).then(res => { |
|||
uni.navigateBack(); |
|||
}).catch(error => { |
|||
uni.navigateBack(); |
|||
}) |
|||
} else { |
|||
uni.navigateBack(); |
|||
} |
|||
|
|||
return true; |
|||
} |
|||
}, |
|||
|
|||
onPullDownRefresh() { |
|||
this.getDetail(); |
|||
uni.stopPullDownRefresh(); |
|||
}, |
|||
|
|||
mounted() { |
|||
|
|||
}, |
|||
methods: { |
|||
//接收 |
|||
receive(callback) { |
|||
if (this.id != null) { |
|||
takePutawayJob(this.id).then(res => { |
|||
callback(); |
|||
}).catch(error => { |
|||
this.showErrorMessage(error) |
|||
}) |
|||
} |
|||
}, |
|||
|
|||
getDetail() { |
|||
var that = this; |
|||
uni.showLoading({ |
|||
title: "加载中....", |
|||
mask: true |
|||
}); |
|||
getPutawayJobDetail(that.id).then(res => { |
|||
uni.hideLoading(); |
|||
if (res.data == null) { |
|||
that.showMessage('未获取到详情'); |
|||
} else { |
|||
if (res.data.subList.length > 0) { |
|||
that.jobContent = res.data; |
|||
that.jobStatus = res.data.status |
|||
that.subList = res.data.subList; |
|||
that.detailSource = getTreeDataSource(that.subList) |
|||
that.fromLocationCode = that.subList[0].fromLocationCode |
|||
that.jobToLocationCode = that.subList[0].toLocationCode; |
|||
that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) |
|||
that.isCheckLocation = getSwitchInfoByCode("PurchasePutawayToLocationCodeValidate") |
|||
if (that.isCheckLocation) { |
|||
that.toLocationCode = "" |
|||
} else { |
|||
that.toLocationCode = that.jobToLocationCode; |
|||
} |
|||
//外部进入详情，如果有扫描信息，模拟自动扫描 |
|||
if (this.scanMessage) { |
|||
this.openScanPopupSimulate(this.scanMessage) |
|||
} |
|||
|
|||
} else { |
|||
that.showMessage('列表数据为0'); |
|||
} |
|||
} |
|||
}).catch(error => { |
|||
uni.hideLoading() |
|||
this.showErrorMessage(error) |
|||
}) |
|||
}, |
|||
|
|||
calcScanCount(closeScan) { |
|||
let items = this.subList.filter(r => { |
|||
if (r.scaned) { |
|||
return r; |
|||
} |
|||
}) |
|||
this.scanCount = items != null ? items.length : 0; |
|||
if (this.scanCount == this.subList.length) { |
|||
this.closeScanPopup(); |
|||
} |
|||
}, |
|||
|
|||
calcHandleQty() { |
|||
calcTreeHandleQty(this.detailSource); |
|||
this.continueScan() |
|||
this.$forceUpdate(); |
|||
}, |
|||
|
|||
//继续扫描 |
|||
continueScan() { |
|||
this.scanCount = getScanCount(this.subList); |
|||
if (this.scanCount == this.subList.length) { |
|||
this.closeScanPopup(); |
|||
} else { |
|||
this.scanPopupGetFocus(); |
|||
} |
|||
}, |
|||
|
|||
updateData() { |
|||
console.log("updateData") |
|||
// this.calcHandleQty(); |
|||
calcTreeHandleQty(this.detailSource) |
|||
}, |
|||
//模拟扫描功能 |
|||
openScanPopupSimulate(message) { |
|||
|
|||
let fromlocationCode = ''; |
|||
let fromlocationList = []; |
|||
for (var i = 0; i < this.detailSource.length; i++) { |
|||
let item = this.detailSource[i]; |
|||
item.subList.forEach(l => { |
|||
//重复的库位不往里面插入 |
|||
var location = fromlocationList.find(res => res == l.fromLocationCode) |
|||
if (location == undefined) { |
|||
fromlocationList.push(l.fromLocationCode); |
|||
} |
|||
//来源库位赋默认值 |
|||
if (fromlocationCode == '') { |
|||
fromlocationCode = l.fromLocationCode; |
|||
} |
|||
}) |
|||
} |
|||
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent, |
|||
message); |
|||
}, |
|||
|
|||
openScanPopup() { |
|||
let fromlocationCode = ''; |
|||
let fromlocationList = []; |
|||
for (var i = 0; i < this.detailSource.length; i++) { |
|||
let item = this.detailSource[i]; |
|||
item.subList.forEach(l => { |
|||
//重复的库位不往里面插入 |
|||
var location = fromlocationList.find(res => res == l.fromLocationCode) |
|||
if (location == undefined) { |
|||
fromlocationList.push(l.fromLocationCode); |
|||
} |
|||
//来源库位赋默认值 |
|||
if (fromlocationCode == '') { |
|||
if (!l.scaned) { |
|||
fromlocationCode = l.fromLocationCode; |
|||
} |
|||
} |
|||
}) |
|||
} |
|||
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); |
|||
}, |
|||
|
|||
closeScanPopup() { |
|||
this.$refs.scanPopup.closeScanPopup(); |
|||
}, |
|||
|
|||
getScanResult(result) { |
|||
try { |
|||
var packingNumber = result.label.packingNumber; |
|||
var batch = result.label.batch; |
|||
var qty = result.label.qty; |
|||
var itemCode = result.label.itemCode; |
|||
var locationCode = result.fromLocationCode; |
|||
|
|||
if (!result.balance) { |
|||
this.showMessage("箱码【" + packingNumber + "】没有库存余额") |
|||
return; |
|||
} |
|||
|
|||
// var inventoryStatus = "OK"; |
|||
var detail = this.detailSource.find(r => r.itemCode == itemCode); |
|||
|
|||
if (detail == undefined) { |
|||
this.showErrorMessage("物料号【" + itemCode + "】不在列表中") |
|||
} else { |
|||
var itemDetail = detail.subList.find(r => { |
|||
return r.packingNumber == packingNumber && |
|||
r.batch == batch && |
|||
r.fromLocationCode == result.fromLocationCode |
|||
}) |
|||
|
|||
if (itemDetail == undefined) { |
|||
var isExit; |
|||
for (let subItem of detail.subList) { |
|||
var item; |
|||
for (let pack of subItem.packList) { |
|||
if (pack.packingNumber == packingNumber && |
|||
pack.batch == batch) { |
|||
item = pack; |
|||
isExit = pack; |
|||
break; |
|||
} |
|||
} |
|||
if (item != undefined) { |
|||
subItem.scaned = true |
|||
subItem.handleQty = 0; |
|||
item = undefined |
|||
} |
|||
} |
|||
if (isExit == undefined) { |
|||
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result |
|||
.fromLocationCode + "】不在列表中") |
|||
} else { |
|||
if (!isExit.cancleScanedHiht && isExit.scaned) { |
|||
this.showMessage("箱码【" + packingNumber + "】已经扫描") |
|||
} else { |
|||
isExit.scaned = true |
|||
let qty = 0; |
|||
if (result.balance != null) { |
|||
qty = Number(result.balance.qty); |
|||
} else { |
|||
qty = Number(result.label.qty); |
|||
} |
|||
|
|||
isExit.handleQty = Number(result.label.qty); |
|||
isExit.toLocationCode = this.toLocationCode; |
|||
} |
|||
} |
|||
calcTreeHandleQty(this.detailSource); |
|||
this.continueScan() |
|||
this.$forceUpdate() |
|||
} else { |
|||
var scanedLength = 0; |
|||
itemDetail.packList.forEach(res => { |
|||
if (res.scaned) { |
|||
scanedLength++; |
|||
} |
|||
}) |
|||
|
|||
//大哥让加的 |
|||
itemDetail.fromInventoryStatus = result.balance.inventoryStatus; |
|||
|
|||
if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList |
|||
.length) { |
|||
this.showMessage("箱码【" + packingNumber + "】已经扫描") |
|||
} else { |
|||
itemDetail.scaned = true; |
|||
this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序 |
|||
itemDetail.handleQty = result.label.qty; |
|||
// itemDetail.toInventoryStatus = "OK" |
|||
itemDetail.packList.forEach(pac => { |
|||
pac.scaned = true |
|||
pac.handleQty = Number(pac.qty); |
|||
pac.toLocationCode = this.toLocationCode; |
|||
}) |
|||
|
|||
calcTreeHandleQty(this.detailSource); |
|||
this.continueScan() |
|||
this.$forceUpdate() |
|||
} |
|||
} |
|||
} |
|||
} catch (e) { |
|||
this.showMessage(e.message) |
|||
} |
|||
}, |
|||
|
|||
scanLocationCode(location, code) { |
|||
this.toLocationCode = code |
|||
this.detailSource.forEach(item => { |
|||
item.subList.forEach(detail => { |
|||
detail.toLocationCode = code |
|||
}) |
|||
}) |
|||
}, |
|||
|
|||
openDetail(item) { |
|||
this.$refs.jobDetailPopup.openPopup(item) |
|||
}, |
|||
|
|||
checkLocation() { |
|||
var isPass = true; |
|||
if (this.toLocationCode == "" || this.toLocationCode == null) { |
|||
this.showMessageHint('请扫描收货库位', callback => { |
|||
this.$refs.comScanLocation.showLocation(); |
|||
}) |
|||
|
|||
return isPass = false; |
|||
} |
|||
return isPass; |
|||
}, |
|||
|
|||
showMessageHint(hint, callback) { |
|||
this.$refs.comMessage.showErrorMessage(hint, res => { |
|||
if (res) { |
|||
callback() |
|||
} |
|||
}); |
|||
}, |
|||
|
|||
commit() { |
|||
this.scanCount = getScanCount(this.subList); |
|||
if (this.scanCount == 0) { |
|||
this.showErrorMessage("扫描数为0,请先扫描") |
|||
return; |
|||
} |
|||
if (!this.checkLocation()) { |
|||
return |
|||
} |
|||
|
|||
//扫描数量和任务数量相等，直接提交 |
|||
if (this.scanCount == this.subList.length) { |
|||
this.submitJob(); |
|||
} else if (this.scanCount < this.subList.length) { |
|||
//扫描数量小于任务数量，判断是否允许部分提交 |
|||
if (this.jobContent.allowPartialComplete == "TRUE") { |
|||
//提交 |
|||
this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => { |
|||
if (res) { |
|||
this.submitJob() |
|||
} |
|||
}); |
|||
} else { |
|||
//不允许部分提交，提示 |
|||
this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => { |
|||
if (res) { |
|||
this.openScanPopup(); |
|||
} |
|||
}); |
|||
} |
|||
} |
|||
}, |
|||
|
|||
submitJob() { |
|||
uni.showLoading({ |
|||
title: "提交中....", |
|||
mask: true |
|||
}); |
|||
|
|||
var itemCodes = [] |
|||
this.detailSource.forEach(item => { |
|||
itemCodes.push(item.itemCode) |
|||
}) |
|||
|
|||
//获取管理模式，封装参数 |
|||
getManagementPrecisions(itemCodes, this.toLocationCode, res => { |
|||
if (res.success) { |
|||
this.managementList = res.list; |
|||
var params = this.setParams() |
|||
console.log("提交参数", JSON.stringify(params)); |
|||
putawayJobSubmit(params).then(res => { |
|||
uni.hideLoading() |
|||
if (res.data) { |
|||
this.showCommitSuccessMessage("提交成功\n生成采购上架记录\n" + res.data) |
|||
} else { |
|||
this.showErrorMessage("提交失败[" + res.msg + "]") |
|||
} |
|||
}).catch(error => { |
|||
uni.hideLoading() |
|||
this.showErrorMessage(error) |
|||
}) |
|||
} else { |
|||
uni.hideLoading(); |
|||
this.showErrorMessage(res.message); |
|||
} |
|||
}); |
|||
|
|||
}, |
|||
setParams() { |
|||
var subList = [] |
|||
var creator = this.$store.state.user.id |
|||
this.detailSource.forEach(item => { |
|||
item.subList.forEach(detail => { |
|||
if (detail.scaned) { |
|||
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, |
|||
detail.packingNumber, detail.batch); |
|||
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(); |
|||
|
|||
|
|||
let packList = detail.packList.filter(p => p.scaned == true); |
|||
detail.packList = packList; |
|||
|
|||
|
|||
// detail.singlePrice = detail.balance.singlePrice; |
|||
// detail.amount = detail.balance.singlePrice * detail.handleQty; |
|||
|
|||
// detail.arriveDate = detail.balance.arriveDate; |
|||
// detail.produceDate = detail.balance.produceDate; |
|||
// detail.expireDate = detail.balance.expireDate; |
|||
subList.push(detail) |
|||
} |
|||
}) |
|||
}) |
|||
|
|||
this.jobContent.subList = subList |
|||
this.jobContent.creator = creator; |
|||
return this.jobContent; |
|||
}, |
|||
|
|||
|
|||
showMessage(message) { |
|||
setTimeout(r => { |
|||
this.scanPopupLoseFocus(); |
|||
this.$refs.comMessage.showMessage(message, res => { |
|||
if (res) { |
|||
this.afterCloseMessage() |
|||
} |
|||
}); |
|||
}) |
|||
}, |
|||
|
|||
showErrorMessage(message) { |
|||
setTimeout(r => { |
|||
this.scanPopupLoseFocus(); |
|||
this.$refs.comMessage.showErrorMessage(message, res => { |
|||
if (res) { |
|||
this.afterCloseMessage() |
|||
} |
|||
}); |
|||
}) |
|||
}, |
|||
|
|||
showQuestionMessage(message, callback) { |
|||
setTimeout(r => { |
|||
this.scanPopupLoseFocus(); |
|||
this.$refs.comMessage.showQuestionMessage(message, res => { |
|||
if (res) { |
|||
callback(res); |
|||
} |
|||
}); |
|||
}) |
|||
}, |
|||
|
|||
scanPopupGetFocus() { |
|||
this.$refs.scanPopup.packGetFocus(); |
|||
}, |
|||
|
|||
scanPopupLoseFocus() { |
|||
this.$refs.scanPopup.packLoseFocus(); |
|||
}, |
|||
|
|||
afterCloseMessage() { |
|||
this.scanPopupGetFocus(); |
|||
}, |
|||
|
|||
|
|||
showCommitSuccessMessage(hint) { |
|||
this.$refs.comMessage.showSuccessMessage(hint, res => { |
|||
navigateBack(1) |
|||
}) |
|||
}, |
|||
} |
|||
} |
|||
</script> |
|||
|
|||
<style scoped lang="scss"> |
|||
|
|||
</style> |
|||
Loading…
Reference in new issue