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

任务添加判断，修改扫描查询条件

hella_online_20240829
yufei0306 4 months ago
parent
749aaf547c
commit
69e6a564cb
3 changed files with 111 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/pages/productPutaway/job/productPutawayJob.vue
  2. 137
      src/pages/productReceipt/job/productReceiptJob.vue
  3. 32
      src/pages/purchaseReceipt/job/receiptJob.vue

32
src/pages/productPutaway/job/productPutawayJob.vue
View File

@ -210,7 +210,7 @@
})
},
openJobDetail(item,packingNumber='') {
openJobDetail(item, packingNumber = '') {
uni.navigateTo({
url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
.type + '&scaned=' + packingNumber
@ -333,19 +333,21 @@
action: "==",
value: result.label.batch
},
// {
// column: "qty",
// action: "==",
// value: result.label.qty
// },
{
column: "qty",
action: "==",
value: result.label.qty
}, {
column: "itemCode",
action: "==",
value: result.label.itemCode
}, {
column: "fromLocationCode",
action: "==",
value: result.label.fromLocationCode
}
},
// {
// column: "fromLocationCode",
// action: "==",
// value: result.label.fromLocationCode
// }
]
getProductPutawayJobList({
filters: filters,
@ -358,10 +360,14 @@
item.selected = false
})
console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
if (list.length > 0) {
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
this.selectItem(list[0])
}
} else {
this.selectItem(list[0])
this.showMessage('未查找到任务')
}
}).catch(error => {
this.showMessage(error)

137
src/pages/productReceipt/job/productReceiptJob.vue
View File

@ -52,8 +52,8 @@
import jobInfoPopup from '@/pages/productReceipt/coms/jobInfoPopup.vue'
import jobList from '@/mycomponents/jobList/jobList.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
export default {
name: 'receipt',
components: {
@ -212,18 +212,21 @@
})
},
openJobDetail(item,packingNumber='') {
openJobDetail(item, packingNumber = '') {
if (this.type == 'predict') {
uni.navigateTo({
url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
packingNumber
});
} else if (this.type == 'assemble') {
uni.navigateTo({
url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
'&scaned=' + packingNumber
});
} else {
uni.navigateTo({
url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
packingNumber
});
}
},
@ -336,66 +339,72 @@
return;
}
this.getList("more");
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
selectItem(item) {
this.$refs.scanPopup.closeScanPopup();
this.openJobDetail(item,item.packingNumber);
},
getScanResult(result) {
try {
var filters = [{
column: "packingNumber",
action: "==",
value: result.label.packingNumber
},
{
column: "batch",
action: "==",
value: result.label.batch
},
{
column: "qty",
action: "==",
value: result.label.qty
}, {
column: "itemCode",
action: "==",
value: result.label.itemCode
}, {
column: "fromLocationCode",
action: "==",
value: result.label.fromLocationCode
}
]
getProductReceiptJobList({
filters: filters,
pageNo: 1,
pageSize: 100,
}).then(res => {
var list = res.data.list;
list.forEach(item => {
item.title = item.number;
item.selected = false
})
console.log('list', list.length)
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
this.selectItem(list[0])
}
}).catch(error => {
this.showMessage(error)
})
} catch (e) {
this.showMessage(e.message)
}
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
selectItem(item) {
this.$refs.scanPopup.closeScanPopup();
this.openJobDetail(item, item.packingNumber);
},
getScanResult(result) {
try {
var filters = [{
column: "packingNumber",
action: "==",
value: result.label.packingNumber
},
{
column: "batch",
action: "==",
value: result.label.batch
},
// {
// column: "qty",
// action: "==",
// value: result.label.qty
// },
{
column: "itemCode",
action: "==",
value: result.label.itemCode
},
// {
// column: "fromLocationCode",
// action: "==",
// value: result.label.fromLocationCode
// }
]
getProductReceiptJobList({
filters: filters,
pageNo: 1,
pageSize: 100,
}).then(res => {
var list = res.data.list;
list.forEach(item => {
item.title = item.number;
item.selected = false
})
console.log('list', list.length)
if (list.length > 0) {
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
this.selectItem(list[0])
}
} else {
this.showMessage('未查找到任务')
}
}).catch(error => {
this.showMessage(error)
})
} catch (e) {
this.showMessage(e.message)
}
},
}
}
</script>

32
src/pages/purchaseReceipt/job/receiptJob.vue
View File

@ -254,7 +254,7 @@
})
},
openJobDetail(item,packingNumber='') {
openJobDetail(item, packingNumber = '') {
uni.navigateTo({
url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this
.operation + '&scaned=' + packingNumber
@ -342,19 +342,21 @@
action: "==",
value: result.label.batch
},
// {
// column: "qty",
// action: "==",
// value: result.label.qty
// },
{
column: "qty",
action: "==",
value: result.label.qty
}, {
column: "itemCode",
action: "==",
value: result.label.itemCode
}, {
column: "fromLocationCode",
action: "==",
value: result.label.fromLocationCode
}
},
// {
// column: "fromLocationCode",
// action: "==",
// value: result.label.fromLocationCode
// }
]
getPurchaseReceiptJobList({
filters: filters,
@ -367,10 +369,14 @@
item.selected = false
})
console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
if (list.length > 0) {
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {
this.selectItem(list[0])
}
} else {
this.selectItem(list[0])
this.showMessage('未查找到任务')
}
}).catch(error => {
this.showMessage(error)

Write Preview
Loading…
Cancel
Save