diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue index eefaa94..28a2888 100644 --- a/src/views/modules/boxManage/saleBoxManage.vue +++ b/src/views/modules/boxManage/saleBoxManage.vue @@ -18,6 +18,7 @@ + @@ -354,7 +355,7 @@ export default { customerId:'', orderType:'销售出库', orderStatus: '', - orderStatusList: ['待出库'], + orderStatusList: ['待包装'], buNo:'', customerName:'', site:this.$store.state.user.site, @@ -696,6 +697,7 @@ export default { getMainData(){ this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex + this.searchData.orderStatus = this.searchData.orderStatusList.join(',') searchOutboundNotificationWithDetail(this.searchData).then(({data}) => { if (data.code === 0) { this.mainDataList = data.rows @@ -733,8 +735,12 @@ export default { this.refreshCurrentTabTable (); }, refreshCurrentTabTable(){ - if(this.currentRow===''||this.currentRow===null){ - this.currentRow={site:'',supplierNo:''} + if (this.currentRow === '' || this.currentRow === null) { + this.currentRow = { + site: '', + buNo: '', + supplierNo: '' + } } if(this.activeName==='boxing'){ this.refreshBoxingTable(); @@ -848,7 +854,7 @@ export default { if(data && data.code === 0){ // 后端现在返回的是集合,需要遍历所有记录 const rollList = data.rollInfo || [] - + if(rollList.length === 0){ this.$message.warning('未查询到卷数据') this.caseForm.rollNo = '' diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue index 40bf0bb..5dbda3a 100644 --- a/src/views/modules/qc/outboundNotification.vue +++ b/src/views/modules/qc/outboundNotification.vue @@ -17,6 +17,7 @@ +