aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单列表，下单时间和预计入仓时间合并

Browse Source
This commit is contained in:
wuteng 2025-07-30 14:03:55 +08:00
parent d9a8964b8c
commit 15c6e8cdd5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/emis/emisWaybill/UserOrderList.vue
View File

@ -26,6 +26,12 @@
</el-col>
<el-col :span="24">
<el-form-item label="下单时间" prop="createTime" label-width="100px" >
<div slot="label" style="text-align: left;">
<el-radio-group class="query-label" v-model="queryParams.params.queryDateType">
<el-radio :key="1" label="1">下单时间</el-radio>
<el-radio :key="2" label="2">预计入仓时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
@ -160,11 +166,6 @@
<el-option key="oms" label="oms" value="oms"></el-option>
</el-select>
</el-form-item>
<el-col :span="24">
<el-form-item label="预计入仓时间" prop="beginPickRange" label-width="100px" >
<elDateAdvPicker1 clearable v-model="beginPickRange" ></elDateAdvPicker1>
</el-form-item>
</el-col>
</el-col>
</el-row>
</SearchForm>
@ -776,7 +777,8 @@ export default {
dataFrom:null,
params:{
queryOrderType:1,
queryOrderDateType:1
queryOrderDateType:1,
queryDateType:'1',
}
},
};
@ -834,8 +836,14 @@ export default {
this.queryParams.orderSn= null;
this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
}
let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate");
let qParam ={...this.queryParams};
if(this.queryParams.params.queryDateType=='1'){
qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
qParam = this.addDateRange(this.queryParams,[],'PickStartDate')
}else{
qParam = this.addDateRange(qParam, this.dateTimeRange,"PickStartDate");
qParam = this.addDateRange(qParam, [],"orderDate");
}
listEmisOrder(qParam).then(response => {
this.emisWaybillList = response.rows;
this.total = response.total;