|
|
@@ -49,12 +49,23 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <label class="el-form-item__label" style="width: auto;"
|
|
|
- >订单日期：</label
|
|
|
+ <el-select
|
|
|
+ v-model="screen2"
|
|
|
+ placeholder="请选择需筛选的内容"
|
|
|
+ clearable
|
|
|
+ style="width:120px"
|
|
|
>
|
|
|
+ <el-option
|
|
|
+ v-for="item in options2"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
<el-date-picker
|
|
|
v-model="startTime"
|
|
|
- type="date"
|
|
|
+ type="datetime"
|
|
|
placeholder="选择日期"
|
|
|
style="width:150px"
|
|
|
>
|
|
|
@@ -62,7 +73,7 @@
|
|
|
<span>至</span>
|
|
|
<el-date-picker
|
|
|
v-model="endTime"
|
|
|
- type="date"
|
|
|
+ type="datetime"
|
|
|
placeholder="选择日期"
|
|
|
style="width:150px"
|
|
|
>
|
|
|
@@ -994,6 +1005,7 @@ export default {
|
|
|
input: null,
|
|
|
screen: '',
|
|
|
screen1: '',
|
|
|
+ screen2: '订单日期',
|
|
|
//存储单价信息的列表（分页前）
|
|
|
priceAllList: [],
|
|
|
//存储单价信息的列表（分页后）
|
|
|
@@ -1045,6 +1057,16 @@ export default {
|
|
|
value: '收款客户',
|
|
|
lable: '收款客户'
|
|
|
}
|
|
|
+ ],
|
|
|
+ options2: [
|
|
|
+ {
|
|
|
+ value: '订单日期',
|
|
|
+ lable: '订单日期'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '制单日期',
|
|
|
+ lable: '制单日期'
|
|
|
+ }
|
|
|
],
|
|
|
//合计净重（磅重）
|
|
|
totalNumber: 0,
|
|
|
@@ -3577,6 +3599,9 @@ export default {
|
|
|
if (!obj) {
|
|
|
obj = new Object()
|
|
|
}
|
|
|
+ if(this.screen2=='制单日期'){
|
|
|
+ obj.saleMakeDate=1;
|
|
|
+ }
|
|
|
if (this.activeName == 'first') {
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
