Merge remote-tracking branch 'origin/master'

src/components/tools/UserMenu.vue

@@ -2,9 +2,9 @@
   <div class="user-wrapper" :class="theme">
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <span class="action" @click="showClick">
+    <!-- <span class="action" @click="showClick">
       <a-icon type="search"></a-icon>
-    </span>
+    </span> -->
     <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
       <a-select
@@ -31,7 +31,7 @@
         <a-icon type="question-circle-o"></a-icon>
       </a>
     </span> -->
-    <header-notice class="action"/>
+    <!-- <header-notice class="action"/> -->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>

src/views/module_kzks/projectPushList/ProjectPushListList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="任务号">
+              <a-input placeholder="请输入任务号" v-model="queryParam.taskno"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -174,7 +189,7 @@
           deleteBatch: "/projectPushList/projectPushList/deleteBatch",
           exportXlsUrl: "/projectPushList/projectPushList/exportXls",
           importExcelUrl: "projectPushList/projectPushList/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],