|
@@ -162,6 +162,26 @@
|
|
|
style="max-width: 187px"
|
|
|
/> </el-form-item
|
|
|
></el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item
|
|
|
+ label-width="100px"
|
|
|
+ label="提箱时间"
|
|
|
+ prop="pickerDate"
|
|
|
+ >
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParams.pickerDate"
|
|
|
+ type="daterange"
|
|
|
+ align="right"
|
|
|
+ unlink-panels
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-collapse-transition>
|
|
@@ -210,17 +230,24 @@
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
|
|
|
+ <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-badge :value="buttonValue.acceptDate" type="warning" style="margin-right:10px">
|
|
|
+ <el-badge
|
|
|
+ :value="buttonValue.acceptDate"
|
|
|
+ type="warning"
|
|
|
+ style="margin-right: 10px"
|
|
|
+ >
|
|
|
<el-button size="mini" @click="handleQuery('acceptDate')"
|
|
|
>接 单</el-button
|
|
|
>
|
|
|
</el-badge></el-col
|
|
|
>
|
|
|
<el-col :span="1.5"
|
|
|
- ><el-badge :value="buttonValue.loadDate" type="warning" style="margin-right:10px"
|
|
|
+ ><el-badge
|
|
|
+ :value="buttonValue.loadDate"
|
|
|
+ type="warning"
|
|
|
+ style="margin-right: 10px"
|
|
|
><el-button size="mini" @click="handleQuery('loadDate')"
|
|
|
>提 箱</el-button
|
|
|
></el-badge
|
|
@@ -228,14 +255,21 @@
|
|
|
>
|
|
|
|
|
|
<el-col :span="1.5"
|
|
|
- ><el-badge :value="buttonValue.mdLoadDate" type="warning" style="margin-right:10px">
|
|
|
+ ><el-badge
|
|
|
+ :value="buttonValue.mdLoadDate"
|
|
|
+ type="warning"
|
|
|
+ style="margin-right: 10px"
|
|
|
+ >
|
|
|
<el-button size="mini" @click="handleQuery('mdLoadDate')"
|
|
|
>还卸货</el-button
|
|
|
></el-badge
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5"
|
|
|
- ><el-badge :value="buttonValue.unLoadDate" type="warning" style="margin-right:10px"
|
|
|
+ ><el-badge
|
|
|
+ :value="buttonValue.unLoadDate"
|
|
|
+ type="warning"
|
|
|
+ style="margin-right: 10px"
|
|
|
><el-button size="mini" @click="handleQuery('unLoadDate')"
|
|
|
>还卸柜</el-button
|
|
|
></el-badge
|
|
@@ -437,6 +471,38 @@ export default {
|
|
|
name: "plans",
|
|
|
data() {
|
|
|
return {
|
|
|
+ //时间区间
|
|
|
+ pickerOptions: {
|
|
|
+ shortcuts: [
|
|
|
+ {
|
|
|
+ text: "最近一周",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: "最近一个月",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ text: "最近三个月",
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
+ picker.$emit("pick", [start, end]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
// 控制新增编辑弹窗的显示与隐藏
|
|
|
addOrUpdateVisible: false,
|
|
|
// 非单个禁用
|
|
@@ -463,6 +529,7 @@ export default {
|
|
|
loadAddr: null,
|
|
|
mdLoadAddr: null,
|
|
|
unLoadAddr: null,
|
|
|
+ pickerDate:null,
|
|
|
},
|
|
|
showSetting: false,
|
|
|
drag: false,
|