wans

src/views/workplace/publish/Executed.vue

@@ -4,6 +4,16 @@
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
+            <a-col :md="12" :sm="24">
+              <a-form-item label="任务创建时间">
+                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="任务发起时间">
+                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
@@ -76,6 +86,8 @@ export default {
       visible: true,
       // 查询参数
       queryParam: {},
+      createdTime: [],
+      applyTime: [],
       // 表头
       columns: [
         {
@@ -170,6 +182,18 @@ export default {
       statusMap: {},
     }
   },
+  watch: {
+    createdTime(newVal) {
+      ;[this.queryParam.taskCreatedTimeStart, this.queryParam.taskCreatedTimeEnd] = newVal.map((item) => {
+        return this.BaseTool.Date.formatter(item, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      })
+    },
+    applyTime(newVal) {
+      ;[this.queryParam.applyTimeStart, this.queryParam.applyTimeEnd] = newVal.map((item) => {
+        return this.BaseTool.Date.formatter(item, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      })
+    },
+  },
   created() {
     // 下拉框map
     this.tableOption()
@@ -242,6 +266,8 @@ export default {
     },
     resetSearchForm() {
       this.queryParam = {}
+      this.createdTime = []
+      this.applyTime = []
       this.$refs.table.refresh(true)
     },
     handleEnter() {

src/views/workplace/publish/WaitPublish.vue

@@ -4,7 +4,6 @@
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
-
             <a-col :md="12" :sm="24">
               <a-form-item label="任务创建时间">
                 <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />

src/views/workplace/publish/WaitWork.vue

@@ -4,9 +4,19 @@
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
+            <a-col :md="12" :sm="24">
+              <a-form-item label="任务创建时间">
+                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="任务发起时间">
+                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model.trim="queryParam.taskName" placeholder="请输入名称/类型名称" />
+                <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
               </a-form-item>
             </a-col>
             <a-col :md="6 || 24" :sm="24">
@@ -76,6 +86,8 @@ export default {
       visible: true,
       // 查询参数
       queryParam: {},
+      createdTime: [],
+      applyTime: [],
       // 表头
       columns: [
         {
@@ -188,6 +200,18 @@ export default {
       yesMap: {},
     }
   },
+  watch: {
+    createdTime(newVal) {
+      ;[this.queryParam.taskCreatedTimeStart, this.queryParam.taskCreatedTimeEnd] = newVal.map((item) => {
+        return this.BaseTool.Date.formatter(item, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      })
+    },
+    applyTime(newVal) {
+      ;[this.queryParam.applyTimeStart, this.queryParam.applyTimeEnd] = newVal.map((item) => {
+        return this.BaseTool.Date.formatter(item, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+      })
+    },
+  },
   created() {
     // 下拉框map
     this.tableOption()
@@ -258,6 +282,8 @@ export default {
     },
     resetSearchForm() {
       this.queryParam = {}
+      this.createdTime = []
+      this.applyTime = []
       this.$refs.table.refresh(true)
     },
     handleEnter() {