|
|
@@ -78,6 +78,7 @@
|
|
|
end-placeholder="结束日期"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
:default-time="['00:00:00', '23:59:59']"
|
|
|
+ @change="changeDate"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
@@ -212,49 +213,49 @@
|
|
|
prop: 'planName',
|
|
|
label: '保养名称',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'ruleName',
|
|
|
label: '规则名称',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'createUserName',
|
|
|
label: '创建人',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'createTime',
|
|
|
label: '创建时间',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'acceptTime',
|
|
|
label: '开始时间',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'finishTime',
|
|
|
label: '结束时间',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
prop: 'planFinishTime',
|
|
|
label: '计划完成时间',
|
|
|
align: 'center',
|
|
|
- minWidth: '180',
|
|
|
+ minWidth: '180',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
{
|
|
|
@@ -326,15 +327,19 @@
|
|
|
this.searchForm.endTime = '';
|
|
|
this.searchForm.type = 2;
|
|
|
}
|
|
|
- this.$refs.table.reload({ page: 1, where: this.searchForm });
|
|
|
+ let params = Object.assign({}, this.searchForm);
|
|
|
+ delete params.date;
|
|
|
+ this.$refs.table.reload({ page: 1, where: params });
|
|
|
},
|
|
|
|
|
|
// 获取table数据
|
|
|
async datasource({ page, where, limit, ...row }) {
|
|
|
this.searchForm.executeUserId = this.userId;
|
|
|
- let form = this.searchForm;
|
|
|
+ let params = Object.assign({}, this.searchForm);
|
|
|
+ delete params.date;
|
|
|
+
|
|
|
const res = await getWorkOrderPage({
|
|
|
- ...form,
|
|
|
+ ...params,
|
|
|
...where,
|
|
|
pageNum: page,
|
|
|
size: limit,
|
|
|
@@ -417,6 +422,15 @@
|
|
|
result += `${m} 分钟`;
|
|
|
}
|
|
|
return result;
|
|
|
+ },
|
|
|
+ changeDate(val) {
|
|
|
+ if (val === null) {
|
|
|
+ this.searchForm.startTime = '';
|
|
|
+ this.searchForm.endTime = '';
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.searchForm.startTime = val[0];
|
|
|
+ this.searchForm.endTime = val[1];
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -491,7 +505,7 @@
|
|
|
margin-top: 10px;
|
|
|
}
|
|
|
|
|
|
- // 修改
|
|
|
+ // 修改
|
|
|
::v-deep .el-card__body {
|
|
|
padding: 0;
|
|
|
}
|