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

采购收货任务--1. 再扫描时最好可以兼容扫描ASN编号和箱标签，扫描任务编号的按钮隐藏掉

hella_online_20240829
yufei0306 4 months ago
parent
abe0e8da16
commit
62328a3123
7 changed files with 107 additions and 62 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. 6
      src/mycomponents/job/jobFilter.vue
  2. 7
      src/mycomponents/jobList/jobList.vue
  3. 20
      src/pages/productPutaway/job/productPutawayJob.vue
  4. 19
      src/pages/productReceipt/job/productReceiptJob.vue
  5. 2
      src/pages/purchaseReceipt/job/purchaseReceipt.vue
  6. 96
      src/pages/purchaseReceipt/job/receiptJob.vue
  7. 13
      src/pages/putaway/job/putawayJob.vue

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

@ -37,7 +37,7 @@
<button class="filter_button" hover-class="filter_button_after"
@click="scanOtherClick">扫描ASN单号</button>
</view>
<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
<view class="uni-flex u-row-center" style="margin-top: 30rpx;" v-if="isShowJob">
<button class="filter_button" hover-class="filter_button_after"
@click="scanNumberClick">扫描任务编号</button>
</view>
@ -80,6 +80,10 @@
type: Boolean,
default: false
},
isShowJob:{
type: Boolean,
default: true
},
isShowFromLocationCode:{
type: Boolean,
default: false

7
src/mycomponents/jobList/jobList.vue
View File

@ -37,11 +37,8 @@ import { onShow } from '@dcloudio/uni-app';
},
methods:{
openList(list){
list.forEach(item=>{
if(!this.list.find(subItem=>subItem.title==item.title)){
this.list.push(item)
}
})
this.list = list
this.$refs.listPopup.open('center')
},
selectItem(item,index){

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

@ -354,13 +354,19 @@
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)
if (list.length > 0) {
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)
}
})
console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {

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

@ -380,13 +380,18 @@
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) {
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) {
this.$refs.jobList.openList(list)
} else {

2
src/pages/purchaseReceipt/job/purchaseReceipt.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="">
<receipt-job ref="receiptjob" operation='receipt'></receipt-job>
<receipt-job :isShowAsn="false" :isShowJob="false" ref="receiptjob" operation='receipt'></receipt-job>
</view>
</template>

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

@ -1,7 +1,7 @@
<template>
<view class="">
<com-empty-view v-if="jobList.length==0"></com-empty-view>
<job-filter ref="filter" :isShowAsn="true" @switchChangeToday="switchChangeToday"
<job-filter ref="filter" :isShowAsn="isShowAsn" :isShowJob="isShowJob" @switchChangeToday="switchChangeToday"
@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" @onScanAsnNumber="getScanAsnNumber"
:checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask">
</job-filter>
@ -82,7 +82,15 @@
},
props: {
operation: "receipt" //reject 收货 拒绝
operation: "receipt" ,//reject 收货 拒绝
isShowAsn:{
type: Boolean,
default: true
},
isShowJob:{
type: Boolean,
default: true
},
},
// onShow() {
@ -331,45 +339,65 @@
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",
let filters = []
if(result.label.barType=="BarCode"){
// ASN单号
filters = [{
column: "asn_number",
action: "==",
value: result.label.itemCode
},
// {
// column: "fromLocationCode",
// action: "==",
// value: result.label.fromLocationCode
// }
]
value: result.label.code
}]
}else{
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
// }
]
}
getPurchaseReceiptJobList({
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)
if (list.length > 0) {
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)
}
})
console.log('list', list)
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {

13
src/pages/putaway/job/putawayJob.vue
View File

@ -335,13 +335,18 @@
pageSize: 100,
}).then(res => {
console.log('getPutawayJobList', getPutawayJobList)
var list = res.data.list;
if (list.length > 0) {
list.forEach(item => {
let resultList = res.data.list;
if (resultList.length > 0) {
resultList.forEach(item => {
item.title = item.number;
item.selected = false
})
console.log('list', list)
let list = []
resultList.forEach(item=>{
if(!list.find(subItem=>subItem.title==item.title)){
list.push(item)
}
})
if (list.length > 1) {
this.$refs.jobList.openList(list)
} else {

Write Preview
Loading…
Cancel
Save