sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

发料，补料任务，查询，重置功能

lijuncheng0816
wangyufei 3 months ago
parent
c2f5c47a1b
commit
9671661e04
3 changed files with 104 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/mycomponents/job/jobFilter.vue
  2. 71
      src/pages/issue/job/issueJob.vue
  3. 58
      src/pages/repleinsh/job/repleinshJob.vue

10
src/mycomponents/job/jobFilter.vue
View File

@ -58,7 +58,7 @@
</view> </view>
</view> --> </view> -->
<view class=" uni-flex uni-row" style="margin-top: 5px;" v-if="isShowQurery"> <view class=" uni-flex uni-row" style="margin-top: 5px;" v-if="isShowQurery">
<button class="btn_single_clear" hover-class="btn_commit_after" @click="query()">重置</button> <button class="btn_single_clear" hover-class="btn_commit_after" @click="reset()">重置</button>
<button class="btn_single_commit" hover-class="btn_commit_after" @click="query()">查询</button> <button class="btn_single_commit" hover-class="btn_commit_after" @click="query()">查询</button>
</view> </view>
</view> </view>
@ -167,6 +167,14 @@
} }
return params; return params;
}, },
reset(){
this.productionLineCode = ''
this.fromLocationCode = ''
this.itemCode = ''
this.creationTime = ''
this.status = ''
this.query()
},
query() { query() {
let params = this.getQueryCondition(); let params = this.getQueryCondition();

71
src/pages/issue/job/issueJob.vue
View File

@ -100,6 +100,7 @@
title: '', title: '',
productionLine: "", productionLine: "",
fromLocation: "", fromLocation: "",
filterItemCode: "",
businessTypeCode: "Issue", businessTypeCode: "Issue",
businessType: null, businessType: null,
}; };
@ -109,7 +110,8 @@
this.getIssueJobByProductionline() this.getIssueJobByProductionline()
}, },
onShow() { onShow() {
this.getList('refresh', this.fromLocation, this.productionLine); this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
onReady() { onReady() {
@ -122,12 +124,13 @@
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return; return;
} }
this.getList('more', this.fromLocation, this.productionLine) this.getList('more', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getList('refresh', this.fromLocation, this.productionLine) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
//后退按钮 //后退按钮
@ -180,7 +183,7 @@
}) })
}, },
getList(type, fromLocation = '', productionLine = '') { getList(type, fromLocation = '', productionLine = '',filterItemCode='') {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中­....", title: "加载中­....",
@ -229,7 +232,14 @@
value: productionLine value: productionLine
}) })
} }
if(filterItemCode){
// 物料代码
filters.push({
column: "itemCode",
action: "like",
value: filterItemCode
})
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -266,6 +276,7 @@
}, },
getListByFilter(params) { getListByFilter(params) {
console.log('getListByFilter',params)
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中­....", title: "加载中­....",
@ -294,56 +305,68 @@
if (params.fromLocationCode) { if (params.fromLocationCode) {
// 来源库位 // 来源库位
this.fromLocation = params.fromLocationCode
filters.push({ filters.push({
column: "fromLocationCode", column: "fromLocationCode",
action: "==", action: "==",
value: params.fromLocationCode value: params.fromLocationCode
}) })
}else{
this.fromLocation = ''
} }
if (params.productionLineCode) { if (params.productionLineCode) {
// 生产线 // 生产线
this.productionLine = params.productionLineCode
filters.push({ filters.push({
column: "productionLineCode", column: "productionLineCode",
action: "==", action: "==",
value: params.productionLineCode value: params.productionLineCode
}) })
}else{
this.productionLine = ''
} }
if (params.itemCode) { if (params.itemCode) {
// 生产线 // 物料代码
this.filterItemCode = params.itemCode
filters.push({ filters.push({
column: "itemCode", column: "itemCode",
action: "like", action: "like",
value: params.itemCode value: params.itemCode
}) })
}else{
this.filterItemCode = ''
} }
var params = { var params = {
filters: filters, filters: filters,
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
} }
getIssueJobList(params).then(res => {
uni.hideLoading();
if (res.data.total == 0) {
that.showMessage('未查找到发料任务');
} else if (res.data.total == 1) {
that.openJobDetail(res.data.list[0]);
} else {
that.showItemList(res.data.list);
}
}).catch(error => {
that.showMessage(error) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}) // getIssueJobList(params).then(res => {
// uni.hideLoading();
// if (res.data.total == 0) {
// that.showMessage('未查找到发料任务');
// } else if (res.data.total == 1) {
// that.openJobDetail(res.data.list[0]);
// } else {
// that.showItemList(res.data.list);
// }
// }).catch(error => {
// that.showMessage(error)
// })
}, },
fromLocationCode(fromLocation) { fromLocationCode(fromLocation) {
this.fromLocation = fromLocation; this.fromLocation = fromLocation;
this.getList('refresh', this.fromLocation, this.productionLine) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
productionLineCode(productionLineCode) { productionLineCode(productionLineCode) {
this.productionLine = productionLineCode this.productionLine = productionLineCode
this.getList('refresh', this.fromLocation, this.productionLine) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
getByAsnNumber(code) { getByAsnNumber(code) {
let that = this; let that = this;
@ -418,7 +441,8 @@
cancleJob(id) { cancleJob(id) {
cancleTakeIssueJob(id).then(res => { cancleTakeIssueJob(id).then(res => {
if (res.data) { if (res.data) {
this.getList("refresh", this.fromLocation, this.productionLine) this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
uni.showToast({ uni.showToast({
title: "放弃任务成功" title: "放弃任务成功"
}) })
@ -454,13 +478,14 @@
switchChangeToday(state, creationTime) { switchChangeToday(state, creationTime) {
this.checkedToday = state; this.checkedToday = state;
this.todayTime = creationTime; this.todayTime = creationTime;
this.getList("refresh", this.fromLocation, this.productionLine); this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
switchChangeWait(state, jobStatus) { switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state; this.checkedWaitTask = state;
this.status = jobStatus; this.status = jobStatus;
this.getList("refresh", this.fromLocation, this.productionLine); this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
}, },
getScanNumber(code) { getScanNumber(code) {

58
src/pages/repleinsh/job/repleinshJob.vue
View File

@ -103,7 +103,9 @@
inInventoryStatus: "", //目标入库库存状态 inInventoryStatus: "", //目标入库库存状态
outInventoryStatus: "", //来源出库库存状态 outInventoryStatus: "", //来源出库库存状态
productionLineCode: "", productionLineCode: "",
productionlineList: [] productionlineList: [],
fromLocationCode:'',
filterItemCode:''
}; };
}, },
onLoad(option) { onLoad(option) {
@ -144,10 +146,12 @@
if (this.loadingType == 'loading' || this.loadingType == 'nomore') { if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return; return;
} }
this.getList("more"); this.getList('more', this.fromLocationCode, this.filterItemCode)
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getList('refresh'); this.getList('refresh', this.fromLocationCode, this.filterItemCode)
}, },
methods: { methods: {
@ -164,7 +168,8 @@
}); });
}, },
getList(type, fromLocationCode = '') { getList(type, fromLocationCode = '',filterItemCode='') {
let that = this; let that = this;
uni.showLoading({ uni.showLoading({
title: "加载中­....", title: "加载中­....",
@ -205,6 +210,14 @@
value: fromLocationCode value: fromLocationCode
}) })
} }
if (filterItemCode != '') {
// 物料代码
filters.push({
column: "itemCode",
action: "like",
value: filterItemCode
})
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -270,46 +283,55 @@
if (params.fromLocationCode) { if (params.fromLocationCode) {
// 来源库位 // 来源库位
this.fromLocationCode = params.fromLocationCode
filters.push({ filters.push({
column: "fromLocationCode", column: "fromLocationCode",
action: "==", action: "==",
value: params.fromLocationCode value: params.fromLocationCode
}) })
}else{
this.fromLocationCode = ''
} }
if (params.itemCode) { if (params.itemCode) {
// 生产线 // 物料代码
this.filterItemCode = params.itemCode
filters.push({ filters.push({
column: "itemCode", column: "itemCode",
action: "like", action: "like",
value: params.itemCode value: params.itemCode
}) })
}else{
this.filterItemCode = ''
} }
var params = { var params = {
filters: filters, filters: filters,
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 100,
} }
getRepleinshJobList(params).then(res => { this.getList('refresh', this.fromLocationCode, this.filterItemCode)
uni.hideLoading();
if (res.data.total == 0) {
that.showMessage('未查找到补料任务');
} else if (res.data.total == 1) {
that.openJobDetail(res.data.list[0]);
} else {
that.showItemList(res.data.list);
}
}).catch(error => {
that.showMessage(error) // getRepleinshJobList(params).then(res => {
}) // uni.hideLoading();
// if (res.data.total == 0) {
// that.showMessage('未查找到补料任务');
// } else if (res.data.total == 1) {
// that.openJobDetail(res.data.list[0]);
// } else {
// that.showItemList(res.data.list);
// }
// }).catch(error => {
// that.showMessage(error)
// })
}, },
fromLocationCode(fromLocationCode) { fromLocationCode(fromLocationCode) {
console.log('fromLocationCode', fromLocationCode) console.log('fromLocationCode', fromLocationCode)
this.getList('refresh', fromLocationCode, '') this.fromLocationCode = fromLocationCode
this.getList('refresh', this.fromLocationCode, this.filterItemCode)
}, },
openJobDetail(item, scanMessage = '') { openJobDetail(item, scanMessage = '') {

Write Preview
Loading…
Cancel
Save