Browse Source

修改任务扫描

intex_online20241111
lijuncheng 3 months ago
parent
commit
bf3f03672e
  1. 5
      src/pages/count/job/countJob.vue
  2. 12
      src/pages/issue/job/issueJob.vue
  3. 5
      src/pages/productReceipt/job/productReceiptJob.vue
  4. 16
      src/pages/purchaseReceipt/job/receiptJob.vue
  5. 9
      src/pages/putaway/job/putawayJob.vue

5
src/pages/count/job/countJob.vue

@ -20,7 +20,7 @@
<uni-load-more :status="loadingType" />
</view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
<winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult'>
</winScanPackJob>
<jobList ref="jobList" @selectItem="selectItem"></jobList>
@ -84,7 +84,8 @@
creationTime: "",
status: "1,2",
fromLocationCode: ""
}
},
manageModel:import.meta.env.VITE_MANAGE_MODEL
};
},
onLoad(option) {

12
src/pages/issue/job/issueJob.vue

@ -25,7 +25,7 @@
<uni-load-more :status="loadingType" v-if="jobList.length>0" />
</view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
</winComScanBalance>
<!-- <winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob> -->
@ -114,7 +114,8 @@
businessTypeCode: "Issue",
businessType: null,
timer: null,
productionLineCode:""
productionLineCode:"",
manageModel:import.meta.env.VITE_MANAGE_MODEL
};
},
onLoad(option) {
@ -244,6 +245,9 @@
uni.hideLoading();
if (type === "refresh") {
uni.stopPullDownRefresh();
if(this.manageModel!='BY_BATCH'){
this.openScanPopup()
}
}
var list = res.data.list;
@ -260,9 +264,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
if(this.jobList.length>0){
this.openScanPopup()
}
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();

5
src/pages/productReceipt/job/productReceiptJob.vue

@ -20,7 +20,7 @@
<job-info-popup ref='jobInfoPopup'></job-info-popup>
<uni-load-more :status="loadingType" v-if="jobList.length>0" />
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'></winScanPackJob>
<jobList ref="jobList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
@ -84,7 +84,8 @@
detailOptions: [],
detailGiveupOptions: [],
scanMessage: "",
timer:null
timer:null,
manageModel:import.meta.env.VITE_MANAGE_MODEL
};
},
// type = 'assemble'

16
src/pages/purchaseReceipt/job/receiptJob.vue

@ -20,7 +20,7 @@
<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
</view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<winScanPackJob title="箱标签/ASN单号" ref="scanPopup" @getResult='getScanResult'>
<winScanPackJob :title="scanHintTitle" ref="scanPopup" @getResult='getScanResult'>
</winScanPackJob>
<jobList ref="jobList" @selectItem="selectItem"></jobList>
<comMessage ref="comMessage"></comMessage>
@ -78,7 +78,9 @@
status: '1,2', //
detailOptions: [],
detailGiveupOptions: [],
scanMessage: ""
scanMessage: "",
manageModel:import.meta.env.VITE_MANAGE_MODEL,
scanHintTitle:""
};
},
@ -153,6 +155,12 @@
this.getList("more");
},
refresh() {
if(this.manageModel=='BY_BATCH'){
this.scanHintTitle="ASN单号"
}else {
this.scanHintTitle="箱标签/ASN单号"
}
this.getList('refresh');
},
openFilter() {
@ -397,6 +405,10 @@
value: this.$store.state.user.id
}]
} else {
if(this.manageModel=="BY_BATCH"){
this.showMessage("请扫描ASN单号")
return;
}
filters = [{
column: "packingNumber",
action: "in",

9
src/pages/putaway/job/putawayJob.vue

@ -21,7 +21,7 @@
<uni-load-more :status="loadingType" v-if="jobList.length>0" />
</view>
<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
<win-scan-button @goScan='openScanPopup' v-if="manageModel!='BY_BATCH'&&jobList.length>0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult='getScanResult'>
</winScanPackJob>
@ -84,7 +84,8 @@
detailOptions: [],
detailGiveupOptions: [],
title: '',
scanMessage: ""
scanMessage: "",
manageModel:import.meta.env.VITE_MANAGE_MODEL
};
},
@ -174,7 +175,9 @@
uni.hideLoading();
if (type === "refresh") {
uni.stopPullDownRefresh();
this.openScanPopup()
if(this.manageModel!='BY_BATCH'){
this.openScanPopup()
}
}
var list = res.data.list;

Loading…
Cancel
Save