diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 12df735d..deeb70ad 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -59,7 +59,7 @@
import winScanAsnNumber from "@/mycomponents/scan/winScanAsnNumber.vue"
export default {
- emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber","productionLineCode","fromLocationCode"],
+ emits: ["switchChangeToday", "switchChangeWait", "onScanNumber", "onScanAsnNumber","productionLineCode","fromLocationCode","fromLocationCodeConfirm"],
components: {
winScanJobNumber,
winScanAsnNumber
@@ -130,12 +130,6 @@
// 生产线
productionLineCodeConfirm(e){
var lineCode=e
- // this.productionline.forEach(item=>{
- // if(item.value==this.productionLineCode){
- // lineCode=item.value
- // }
- // })
- console.log("生产线+++"+lineCode)
this.$emit("productionLineCode", lineCode)
},
@@ -175,10 +169,12 @@
scanNumberClick() {
this.$refs.scanNumber.openScanPopup();
+ this.closeScanPopup();
},
scanOtherClick() {
this.$refs.scanAsnNumber.openScanPopup();
+ this.closeScanPopup();
},
getScanAsNumber(val) {
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index f6b15788..00761e5c 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,7 +1,7 @@
-
+
生产线
{{dataContent.productionLineCode}}
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 2bc2b06b..ea21b09e 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -1,7 +1,7 @@
-
@@ -80,8 +80,10 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- productionline: [],
- title:''
+ productionlineList: [],
+ title:'',
+ productionLine:"",
+ fromLocation:""
};
},
onLoad(option) {
@@ -89,7 +91,7 @@
this.getIssueJobByProductionline()
},
onShow() {
- this.getList('refresh');
+ this.getList('refresh',this.fromLocation,this.productionLine);
},
onReady() {
@@ -101,11 +103,11 @@
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
- this.getList("more");
+ this.getList("more",this.productionLine);
},
onPullDownRefresh() {
- this.getList('refresh');
+ this.getList('refresh',this.productionLine);
},
//后退按钮
@@ -132,16 +134,20 @@
getIssueJobByProductionline().then(res => {
console.log('生产线', res)
if (res.code == 0) {
- this.productionline = res.data.map(item => ({
+ this.productionlineList = res.data.map(item => ({
value: item.value,
text: item.name
}))
+ this.productionlineList.unshift({
+ value: "",
+ text: "全部"
+ })
} else {
- this.productionline = []
+ this.productionlineList = []
}
})
},
- getList(type, fromLocationCode = '', productionLineCode = '') {
+ getList(type, fromLocation = '', productionLine = '') {
let that = this;
uni.showLoading({
title: "加载中....",
@@ -174,20 +180,20 @@
value: this.$store.state.user.id
})
- if (fromLocationCode != '') {
+ if (fromLocation) {
// 来源库位
filters.push({
column: "fromLocationCode",
action: "==",
- value: fromLocationCode
+ value: fromLocation
})
}
- if (productionLineCode != '') {
+ if (productionLine) {
// 生产线
filters.push({
column: "productionLineCode",
action: "==",
- value: productionLineCode
+ value: productionLine
})
}
@@ -226,13 +232,13 @@
that.showMessage(error)
})
},
- fromLocationCode(fromLocationCode) {
- console.log('fromLocationCode', fromLocationCode)
- this.getList('refresh', fromLocationCode, '')
+ fromLocationCode(fromLocation) {
+ this.fromLocation =fromLocation;
+ this.getList('refresh', this.fromLocation, this.productionLine)
},
productionLineCode(productionLineCode) {
- console.log('productionLineCode', productionLineCode)
- this.getList('refresh', '', productionLineCode)
+ this.productionLine =productionLineCode
+ this.getList('refresh', this.fromLocation,this.productionLine)
},
getByAsnNumber(code) {
let that = this;
@@ -299,7 +305,7 @@
cancleJob(id) {
cancleTakeIssueJob(id).then(res => {
if (res.data) {
- this.getList("refresh")
+ this.getList("refresh",this.fromLocation,this.productionLine)
uni.showToast({
title: "放弃任务成功"
})
@@ -314,13 +320,13 @@
switchChangeToday(state, creationTime) {
this.checkedToday = state;
this.todayTime = creationTime;
- this.getList("refresh");
+ this.getList("refresh",this.fromLocation,this.productionLine);
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
- this.getList("refresh");
+ this.getList("refresh",this.fromLocation,this.productionLine);
},
getScanNumber(code) {
@@ -343,6 +349,12 @@
action: "==",
value: code
})
+
+ filters.push({
+ column: "accept_user_id",
+ action: "==",
+ value: this.$store.state.user.id
+ })
var params = {
filters: filters,
diff --git a/src/pages/productionReceipt/coms/comProductionJobCard.vue b/src/pages/productionReceipt/coms/comProductionJobCard.vue
index d8a43bf2..00761e5c 100644
--- a/src/pages/productionReceipt/coms/comProductionJobCard.vue
+++ b/src/pages/productionReceipt/coms/comProductionJobCard.vue
@@ -1,7 +1,12 @@
-
+
+ 生产线
+ {{dataContent.productionLineCode}}
+
+
+