|
|
|
@ -18,6 +18,7 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'单据状态'"> |
|
|
|
<el-select multiple collapse-tags v-model="searchData.orderStatusList" clearable style="width: 160px"> |
|
|
|
<el-option label="待包装" value="待包装"></el-option> |
|
|
|
<el-option label="待出库" value="待出库"></el-option> |
|
|
|
<el-option label="已出库" value="已出库"></el-option> |
|
|
|
</el-select> |
|
|
|
@ -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 = '' |
|
|
|
|