|
|
@@ -53,19 +53,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- <el-form-item label="筛选日期" prop="createTime">
|
|
|
- <el-date-picker clearable size="small" style="width: 205.4px"
|
|
|
- v-model="dateRange"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item>
|
|
|
- <el-button type="cyan" icon="el-icon-search" @click="storeProduct">搜索</el-button>
|
|
|
- </el-form-item>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="下单时间:">
|
|
|
+ <el-select v-model="queryType" placeholder="查询方式" size="small">
|
|
|
+ <el-option
|
|
|
+ v-for="item in queryTypes"
|
|
|
+ :key="item.dictLabel"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="筛选日期" prop="createTime">
|
|
|
+ <el-date-picker clearable size="small" style="width: 205.4px"
|
|
|
+ v-model="dateRange"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item>
|
|
|
+ <el-button type="cyan" icon="el-icon-search" @click="storeProduct">搜索</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
|
|
|
<div class="data-box">
|
|
|
@@ -150,6 +168,11 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ queryTypes:[
|
|
|
+ { dictLabel: '下单时间', dictValue: 1 },
|
|
|
+ { dictLabel: '发货时间', dictValue: 2 }
|
|
|
+ ],
|
|
|
+ queryType: 2,
|
|
|
companys: [],
|
|
|
deptOptions: [],
|
|
|
companyId: undefined,
|
|
|
@@ -269,6 +292,9 @@ export default {
|
|
|
data.startTime = this.dateRange[0]
|
|
|
data.endTime = this.dateRange[1]
|
|
|
}
|
|
|
+ if(this.queryType){
|
|
|
+ data.queryType = this.queryType
|
|
|
+ }
|
|
|
|
|
|
storeProduct(data).then((response) => {
|
|
|
this.dates = response.dates;
|
