From 613d624e36041c24b94d4cbe692f8217a15c54fd Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 17 六月 2025 22:30:28 +0800
Subject: [PATCH] update
---
src/views/basesetting/produceplan.vue | 24 ++++++++++++------------
src/views/flow/todolist.vue | 17 ++++++++++++-----
2 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/views/basesetting/produceplan.vue b/src/views/basesetting/produceplan.vue
index bf52432..d86e489 100644
--- a/src/views/basesetting/produceplan.vue
+++ b/src/views/basesetting/produceplan.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-06-17 11:44:52
* @LastEditors: gaoshp
- * @LastEditTime: 2025-06-17 20:46:18
+ * @LastEditTime: 2025-06-17 21:59:33
* @FilePath: /mdmweb/src/views/basesetting/produceplan.vue
-->
<template>
@@ -51,17 +51,17 @@
dialogWidth: 500,
dialogClickModal: false,
column: [
- {
- label: '绋嬪簭鍚嶇О',
- prop: 'programName',
- type: 'input',
- search: false,
- searchRange: true,
- searchSpan: 8,
- hide: true,
- span: 24,
- rules: [{ required: true, message: '璇疯緭鍏ョ▼搴忓悕绉�', trigger: 'blur' }],
- },
+ // {
+ // label: '绋嬪簭鍚嶇О',
+ // prop: 'programName',
+ // type: 'input',
+ // search: false,
+ // searchRange: true,
+ // searchSpan: 8,
+ // hide: true,
+ // span: 24,
+ // rules: [{ required: true, message: '璇疯緭鍏ョ▼搴忓悕绉�', trigger: 'blur' }],
+ // },
{
label: '浜哄憳鍚嶇О',
prop: 'name',
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 0ce9190..4776245 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -159,8 +159,8 @@
width: 200,
prop: 'processCreateTime',
type: 'datetime',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
search: true,
searchRange: true,
searchSpan: 8,
@@ -268,13 +268,19 @@
},
searchChange(params, done) {
+ let data = {}
this.query = params;
this.page.currentPage = 1;
console.log('searchChange', params);
- params.createTimeBegin = params?.createTime?.[0] || '';
- params.createTimeEnd = params?.createTime?.[1] || '';
+ params.createTimeBegin = params?.processCreateTime?.[0] || '';
+ params.createTimeEnd = params?.processCreateTime?.[1] || '';
console.log(params);
- this.onLoad(this.page, params);
+ data = {
+ createTimeBegin: params.createTimeBegin,
+ createTimeEnd: params.createTimeEnd,
+ keyword: params.keyword || ''
+ }
+ this.onLoad(this.page, data);
done();
},
searchReset() {
@@ -297,6 +303,7 @@
// category: params.category ? flowCategory(params.category) : null,
mode: this.mode,
};
+ delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
const data = res.data.data;
--
Gitblit v1.9.3