|
|
@ -3,13 +3,14 @@ |
|
|
<com-empty-view v-if="jobList.length==0"></com-empty-view> |
|
|
<com-empty-view v-if="jobList.length==0"></com-empty-view> |
|
|
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" |
|
|
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" |
|
|
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" |
|
|
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" |
|
|
:checkedWaitTask="checkedWaitTask"> |
|
|
:checkedWaitTask="checkedWaitTask" :isShowProductionLineCode="true" |
|
|
|
|
|
@productionLineCode="productionLineCode" |
|
|
|
|
|
:productionline="productionLineList"> |
|
|
</job-filter> |
|
|
</job-filter> |
|
|
<view v-if="jobList.length>0"> |
|
|
<view v-if="jobList.length>0"> |
|
|
<uni-swipe-action ref="swipeAction"> |
|
|
<uni-swipe-action ref="swipeAction"> |
|
|
<view v-for="(item, index) in jobList" :key="index"> |
|
|
<view v-for="(item, index) in jobList" :key="index"> |
|
|
<uni-swipe-action-item |
|
|
<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions" |
|
|
:right-options="item.status=='2'?detailGiveupOptions:detailOptions" |
|
|
|
|
|
@click="swipeClick($event,item)"> |
|
|
@click="swipeClick($event,item)"> |
|
|
<com-production-job-card :dataContent="item" @click='openJobDetail(item)'> |
|
|
<com-production-job-card :dataContent="item" @click='openJobDetail(item)'> |
|
|
</com-production-job-card> |
|
|
</com-production-job-card> |
|
|
@ -23,7 +24,7 @@ |
|
|
<uni-load-more :status="loadingType" /> |
|
|
<uni-load-more :status="loadingType" /> |
|
|
</view> |
|
|
</view> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> |
|
|
<winScanPackJob ref="scanPopup" @getResult='getScanResult' ></winScanPackJob> |
|
|
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<jobList ref="jobList" @selectItem="selectItem"></jobList> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
</view> |
|
|
</view> |
|
|
@ -32,7 +33,8 @@ |
|
|
<script> |
|
|
<script> |
|
|
import { |
|
|
import { |
|
|
getProductionReceiptJobList, |
|
|
getProductionReceiptJobList, |
|
|
cancleTakeProductionReceiptJob |
|
|
cancleTakeProductionReceiptJob, |
|
|
|
|
|
getIssueJobByProductionline |
|
|
} from '@/api/request2.js'; |
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
@ -80,16 +82,19 @@ |
|
|
status: '1,2', //待处理 、进行中 |
|
|
status: '1,2', //待处理 、进行中 |
|
|
detailOptions: [], |
|
|
detailOptions: [], |
|
|
detailGiveupOptions: [], |
|
|
detailGiveupOptions: [], |
|
|
title:'', |
|
|
title: '', |
|
|
scanMessage:"" |
|
|
scanMessage: "", |
|
|
|
|
|
productionLineList: [], |
|
|
|
|
|
productionLine:"" |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
onLoad(option){ |
|
|
onLoad(option) { |
|
|
this.title = option.title |
|
|
this.title = option.title |
|
|
|
|
|
this.getIssueJobByProductionline() |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
onShow() { |
|
|
onShow() { |
|
|
this.getList('refresh'); |
|
|
this.getList('refresh', this.productionLine); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
onReady() { |
|
|
onReady() { |
|
|
@ -102,11 +107,11 @@ |
|
|
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { |
|
|
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
this.getList("more"); |
|
|
this.getList("more", this.productionLine); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
onPullDownRefresh() { |
|
|
onPullDownRefresh() { |
|
|
this.getList('refresh'); |
|
|
this.getList('refresh', this.productionLine); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//后退按钮 |
|
|
//后退按钮 |
|
|
@ -129,7 +134,27 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
getList(type) { |
|
|
productionLineCode(productionLineCode) { |
|
|
|
|
|
this.productionLine = productionLineCode |
|
|
|
|
|
this.getList('refresh', this.productionLine) |
|
|
|
|
|
}, |
|
|
|
|
|
getIssueJobByProductionline() { |
|
|
|
|
|
getIssueJobByProductionline().then(res => { |
|
|
|
|
|
if (res.code == 0) { |
|
|
|
|
|
this.productionLineList = res.data.map(item => ({ |
|
|
|
|
|
value: item.value, |
|
|
|
|
|
text: item.name |
|
|
|
|
|
})) |
|
|
|
|
|
this.productionLineList.unshift({ |
|
|
|
|
|
value: "", |
|
|
|
|
|
text: "全部" |
|
|
|
|
|
}) |
|
|
|
|
|
} else { |
|
|
|
|
|
this.productionLineList = [] |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
|
|
|
getList(type, productionLine = '') { |
|
|
let that = this; |
|
|
let that = this; |
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "加载中....", |
|
|
title: "加载中....", |
|
|
@ -161,6 +186,16 @@ |
|
|
action: "==", |
|
|
action: "==", |
|
|
value: this.$store.state.user.id |
|
|
value: this.$store.state.user.id |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
if (productionLine) { |
|
|
|
|
|
// 生产线 |
|
|
|
|
|
filters.push({ |
|
|
|
|
|
column: "productionLineCode", |
|
|
|
|
|
action: "==", |
|
|
|
|
|
value: productionLine |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
var params = { |
|
|
var params = { |
|
|
filters: filters, |
|
|
filters: filters, |
|
|
pageNo: this.pageNo, |
|
|
pageNo: this.pageNo, |
|
|
@ -175,7 +210,7 @@ |
|
|
|
|
|
|
|
|
var list = res.data.list; |
|
|
var list = res.data.list; |
|
|
this.totalCount = res.data.total |
|
|
this.totalCount = res.data.total |
|
|
updateTitle(this.title+"(" + this.totalCount + ")"); |
|
|
updateTitle(this.title + "(" + this.totalCount + ")"); |
|
|
this.loadingType = "loadmore"; |
|
|
this.loadingType = "loadmore"; |
|
|
if (list == null || list.length == 0) { |
|
|
if (list == null || list.length == 0) { |
|
|
this.loadingType = "nomore"; |
|
|
this.loadingType = "nomore"; |
|
|
@ -198,9 +233,10 @@ |
|
|
|
|
|
|
|
|
openJobDetail(item, scanMessage = '') { |
|
|
openJobDetail(item, scanMessage = '') { |
|
|
uni.navigateTo({ |
|
|
uni.navigateTo({ |
|
|
url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' + scanMessage +'&title='+this.title |
|
|
url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status + |
|
|
|
|
|
'&scanMessage=' + scanMessage + '&title=' + this.title |
|
|
}); |
|
|
}); |
|
|
this.scanMessage="" |
|
|
this.scanMessage = "" |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
showItemList(itemList) { |
|
|
showItemList(itemList) { |
|
|
@ -230,12 +266,12 @@ |
|
|
|
|
|
|
|
|
cancleJob(id) { |
|
|
cancleJob(id) { |
|
|
cancleTakeProductionReceiptJob(id).then(res => { |
|
|
cancleTakeProductionReceiptJob(id).then(res => { |
|
|
if(res.data){ |
|
|
if (res.data) { |
|
|
this.getList("refresh") |
|
|
this.getList("refresh", this.productionLine) |
|
|
uni.showToast({ |
|
|
uni.showToast({ |
|
|
title:"放弃任务成功" |
|
|
title: "放弃任务成功" |
|
|
}) |
|
|
}) |
|
|
}else { |
|
|
} else { |
|
|
this.showMessage("放弃任务失败") |
|
|
this.showMessage("放弃任务失败") |
|
|
} |
|
|
} |
|
|
}).catch(error => { |
|
|
}).catch(error => { |
|
|
@ -246,13 +282,13 @@ |
|
|
switchChangeToday(state, creationTime) { |
|
|
switchChangeToday(state, creationTime) { |
|
|
this.checkedToday = state; |
|
|
this.checkedToday = state; |
|
|
this.todayTime = creationTime; |
|
|
this.todayTime = creationTime; |
|
|
this.getList("refresh"); |
|
|
this.getList("refresh", this.productionLine); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
switchChangeWait(state, jobStatus) { |
|
|
switchChangeWait(state, jobStatus) { |
|
|
this.checkedWaitTask = state; |
|
|
this.checkedWaitTask = state; |
|
|
this.status = jobStatus; |
|
|
this.status = jobStatus; |
|
|
this.getList("refresh"); |
|
|
this.getList("refresh"), this.productionLine; |
|
|
}, |
|
|
}, |
|
|
getScanNumber(code) { |
|
|
getScanNumber(code) { |
|
|
this.getDataListByType(code) |
|
|
this.getDataListByType(code) |
|
|
@ -310,11 +346,11 @@ |
|
|
}, |
|
|
}, |
|
|
selectItem(item) { |
|
|
selectItem(item) { |
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
this.$refs.scanPopup.closeScanPopup(); |
|
|
this.openJobDetail(item,this.scanMessage); |
|
|
this.openJobDetail(item, this.scanMessage); |
|
|
}, |
|
|
}, |
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
try { |
|
|
try { |
|
|
this.scanMessage="" |
|
|
this.scanMessage = "" |
|
|
var filters = [{ |
|
|
var filters = [{ |
|
|
column: "packingNumber", |
|
|
column: "packingNumber", |
|
|
action: "==", |
|
|
action: "==", |
|
|
@ -349,8 +385,8 @@ |
|
|
item.selected = false |
|
|
item.selected = false |
|
|
}) |
|
|
}) |
|
|
let list = [] |
|
|
let list = [] |
|
|
resultList.forEach(item=>{ |
|
|
resultList.forEach(item => { |
|
|
if(!list.find(subItem=>subItem.title==item.title)){ |
|
|
if (!list.find(subItem => subItem.title == item.title)) { |
|
|
list.push(item) |
|
|
list.push(item) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -360,10 +396,10 @@ |
|
|
this.selectItem(list[0]) |
|
|
this.selectItem(list[0]) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
this.showMessage("未查找到任务<br>"+"扫描["+result.scanMessage+"]") |
|
|
this.showMessage("未查找到任务<br>" + "扫描[" + result.scanMessage + "]") |
|
|
} |
|
|
} |
|
|
}).catch(error => { |
|
|
}).catch(error => { |
|
|
this.showMessage(error+"<br>扫描["+result.scanMessage+"]") |
|
|
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
} catch (e) { |
|
|
} catch (e) { |
|
|
|
