whj 10 kuukautta sitten
vanhempi
commit
844fc5d1a0

+ 27 - 5
src/views/workplace/publish/Executed.vue

@@ -1,19 +1,39 @@
 <template>
   <a-card :bordered="false">
-    <div v-show="visible">
+    <a-drawer title="筛选" placement="top" :closable="false" :visible="filterVisible" @close="filterVisible=false">
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="12" :sm="24">
+            <a-col :md="8" :sm="24">
+              <a-form-item label="关键字">
+                <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
               <a-form-item label="任务创建时间">
-                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
+                <a-range-picker style="width:100%" showTime :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
               </a-form-item>
             </a-col>
-            <a-col :md="12" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="任务发起时间">
-                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
+                <a-range-picker style="width:100%" PICKER_NORM_DATE_PATTERN :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
               </a-form-item>
             </a-col>
+
+            <a-col :md="24" :sm="24" style="text-align: right">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-drawer>
+    <div v-show="visible">
+      <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+        <a-form layout="inline">
+          <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
@@ -22,6 +42,7 @@
             <a-col :md="6 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button type="primary" style="margin-left: 8px" @click="filterVisible=true">筛选</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
               </span>
             </a-col>
@@ -83,6 +104,7 @@ export default {
   data() {
     return {
       advanced: false,
+      filterVisible: false,
       visible: true,
       // 查询参数
       queryParam: {},

+ 36 - 14
src/views/workplace/publish/WaitPublish.vue

@@ -1,26 +1,16 @@
 <template>
   <a-card :bordered="false">
-    <div v-show="visible">
+    <a-drawer title="筛选" placement="top" :closable="false" :visible="filterVisible" @close="filterVisible=false">
       <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-col :md="5" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="关键字">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="状态">
                 <a-select v-model="queryParam.taskStatus" placeholder="请选择状态">
                   <template v-for="(label,value) in statusMap">
                     <a-select-option v-if="value>2" :key="value" :value="parseInt(value)">{{label}}</a-select-option>
@@ -28,9 +18,40 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :md="7" :sm="24">
+              <a-form-item label="任务创建时间">
+                <a-range-picker style="width:100%" showTime :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="7" :sm="24">
+              <a-form-item label="任务发起时间">
+                <a-range-picker style="width:100%" PICKER_NORM_DATE_PATTERN :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
+              </a-form-item>
+            </a-col>
+
+            <a-col :md=" 24" :sm="24" style="text-align: right">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-drawer>
+    <div v-show="visible">
+      <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="关键字">
+                <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button type="primary" style="margin-left: 8px" @click="filterVisible=true">筛选</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
               </span>
             </a-col>
@@ -96,6 +117,7 @@ export default {
   data() {
     return {
       advanced: false,
+      filterVisible: false,
       visible: true,
       // 查询参数
       queryParam: {},

+ 27 - 5
src/views/workplace/publish/WaitWork.vue

@@ -1,19 +1,39 @@
 <template>
   <a-card :bordered="false">
-    <div v-show="visible">
+    <a-drawer title="筛选" placement="top" :closable="false" :visible="filterVisible" @close="filterVisible=false">
       <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="12" :sm="24">
+            <a-col :md="8" :sm="24">
+              <a-form-item label="关键字">
+                <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="24">
               <a-form-item label="任务创建时间">
-                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
+                <a-range-picker style="width:100%" showTime :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="createdTime" />
               </a-form-item>
             </a-col>
-            <a-col :md="12" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="任务发起时间">
-                <a-range-picker style="width:100%" :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
+                <a-range-picker style="width:100%" PICKER_NORM_DATE_PATTERN :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" v-model="applyTime" />
               </a-form-item>
             </a-col>
+
+            <a-col :md=" 24" :sm="24" style="text-align: right">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-drawer>
+    <div v-show="visible">
+      <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+        <a-form layout="inline">
+          <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
                 <a-input v-model.trim="queryParam.taskName" placeholder="请输入标题" />
@@ -22,6 +42,7 @@
             <a-col :md="6 || 24" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button type="primary" style="margin-left: 8px" @click="filterVisible=true">筛选</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
               </span>
             </a-col>
@@ -83,6 +104,7 @@ export default {
   data() {
     return {
       advanced: false,
+      filterVisible: false,
       visible: true,
       // 查询参数
       queryParam: {},