提交代码

src/views/modules/knowledge/album/albumAuditList.vue

@@ -7,8 +7,58 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                 <a-form ref="auditFrom" layout="inline" style="display:flex;" >
-                  <div style="width:80%;;display:flex;flex-wrap:wrap;">
+                 <a-form ref="auditFrom" layout="inline" style="display:flex;flex-wrap:wrap;">
+                    <a-form-item
+                      class="form-item-style"
+                      label="专辑名称"
+                      name="name">
+                      <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                    </a-form-item>
+                    <a-form-item
+                      class="form-item-style"
+                      label="专辑分类"
+                      name="categoryIds">
+                      <a-cascader v-model="categoryIds" 
+                                  class="set-input" 
+                                  :options="classifyLevelList" 
+                                  :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
+                                  placeholder="请选择"
+                                  changeOnSelect
+                                  @change="handleClassifyChange" />
+                    </a-form-item>
+                    <a-form-item
+                      class="form-item-style"
+                      label="负责人"
+                      name="ownerName">
+                      <a-input class="set-input" v-model="queryParam.ownerName" placeholder="请输入" />
+                    </a-form-item>
+                    <a-form-item
+                      class="form-item-style"
+                      label="审核状态"
+                      name="approvalState">
+                      <a-select class="set-input" v-model="queryParam.approvalState" placeholder="请选择"  allowClear>
+                        <a-select-option v-for="(item,index) in approvalStateList" :key="index" :value="item.value">
+                          {{item.label}}
+                        </a-select-option>
+                      </a-select>
+                    </a-form-item>
+                    <a-form-item
+                      class="form-item-style"
+                      label="提交时间"
+                      name="createTime">
+                      <a-range-picker v-model="createTime" 
+                                      class="set-range-picker" 
+                                      separator="→"
+                                      format="YYYY/MM/DD"
+                                      valueFormat="YYYY-MM-DD"
+                                      @change="handleClearTimeChange">
+                      </a-range-picker>
+                    </a-form-item>
+                    <div style="display:flex;justify-content:center;margin-top: 8px;">
+                      <a-button @click="handleResetClick(true)">重置</a-button>
+                      <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                    </div>
+                  <!-- <div style="width:80%;;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                         <a-form-item
                           style="width:320px;margin: 5px 40px 5px 0;"
@@ -80,7 +130,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="albumAuditListBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
               </div>
@@ -99,6 +149,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
@@ -177,10 +228,10 @@ export default {
       classifyLevelList: [],
       approvalStateList: [
         {value: 1, label: '待节点审核'},
-        {value: 2, label: '节点驳回'},
-        {value: 3, label: '待最终审核'},
-        {value: 4, label: '最终驳回'},
-        {value: 5, label: '最终通过'}
+        {value: 2, label: '待最终审核'},
+        {value: 3, label: '节点驳回'},
+        {value: 4, label: '最终节点驳回'},
+        {value: 5, label: '审核完成'}
       ],
       columns: [
         {
@@ -353,6 +404,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -376,7 +429,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -405,7 +458,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -414,6 +478,9 @@ export default {
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/  .ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/album/albumClassifyList.vue

@@ -7,8 +7,18 @@
           <div class="mainContent">
             <div class="body">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <a-form-item
+                    style="width:300px;margin: 5px 40px 5px 0;"
+                    label="分类名称"
+                    name="name">
+                    <a-input v-model="queryParam.name" placeholder="请输入"/>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:flex-end;margin-top: 8px;">
+                    <a-button @click="handleResetClick(true)">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <a-form-item
                       style="width:300px;margin: 5px 40px 5px 0;"
                       label="分类名称"
@@ -19,7 +29,7 @@
                   <div style="width:20%;display:flex;justify-content:flex-end;margin-top: 8px;">
                     <a-button @click="handleResetClick(true)">重置</a-button>
                     <a-button type="primary" @click="handleSearchClick">查询</a-button>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="albumClassifyListAdd" :butn-icon="'none'" @click="handleAddClassClick">新增分类</rx-button>
               </div>
@@ -35,6 +45,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
@@ -267,6 +278,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -290,7 +303,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -306,7 +319,12 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -315,6 +333,9 @@ export default {
 
 </style>
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/ .ant-table-row-expand-icon{
   position: relative;
     z-index: 100;

src/views/modules/knowledge/album/albumList.vue

@@ -7,8 +7,49 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="专辑名称"
+                    name="name">
+                    <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="专辑分类"
+                    name="categoryIds">
+                    <a-cascader v-model="categoryIds" 
+                              class="set-input" 
+                              :options="classifyLevelList" 
+                              :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
+                              placeholder="请选择"
+                              changeOnSelect
+                              @change="handleClassifyChange" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="负责人"
+                    name="ownerName" >
+                    <a-input class="set-input" v-model="queryParam.ownerName" placeholder="请输入" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="创建时间"
+                    name="createTime" >
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                      <a-icon v-if="$store.state.appSetting.collapsed" slot="suffixIcon" type="calendar" />
+                    </a-range-picker>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick(true)">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
@@ -35,17 +76,6 @@
                         name="ownerName" >
                         <a-input v-model="queryParam.ownerName" placeholder="请输入" />
                       </a-form-item>
-                      <!-- <a-form-item
-                        style="width:320px;margin: 5px 40px 5px 0;"
-                        label="审核状态"
-                        name="categoryIds">
-                       <a-cascader v-model="categoryIds" 
-                                  :options="classifyList" 
-                                  :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
-                                  placeholder="请选择"
-                                  changeOnSelect
-                                  @change="handleClassifyChange" />
-                      </a-form-item> -->
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
                         label="创建时间"
@@ -81,7 +111,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button :class="{'knowledge-manage':yelpNum != 0}" :data-attr="yelpNum" alias="albumListComment" :butn-icon="'false'" @click="handleJumpPathClick('comment')">点评审核</rx-button>
                 <rx-button :class="{'knowledge-manage':approveNum != 0}" :data-attr="approveNum" alias="albumListAudit" :butn-icon="'false'" @click="handleJumpPathClick('album')">专辑审核</rx-button>
@@ -99,6 +129,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
@@ -238,11 +269,13 @@ export default {
     }
   },
   created() {
-    let albumClassifyId = JSON.parse(this.$route.query.pkIds)
-    if(albumClassifyId && albumClassifyId.length) {
-      this.queryParam.categoryId = albumClassifyId.slice(-1)[0]
-      console.log(this.queryParam.categoryId)
-      this.categoryIds = albumClassifyId
+    if(this.$route.query.pkIds) {
+      let albumClassifyId = JSON.parse(this.$route.query.pkIds)
+      if(albumClassifyId && albumClassifyId.length) {
+        this.queryParam.categoryId = albumClassifyId.slice(-1)[0]
+        console.log(this.queryParam.categoryId)
+        this.categoryIds = albumClassifyId
+      }
     }
     this.init()
   },
@@ -339,6 +372,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -362,7 +397,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -391,7 +426,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -400,6 +446,9 @@ export default {
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/ .ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/album/checkInfo.vue

@@ -162,7 +162,7 @@ export default {
         {
           title: '时间',
           align: 'center',
-          dataIndex: 'createTime',
+          dataIndex: 'approvalTime',
         },
       ],
       approverData: [],

src/views/modules/knowledge/album/commentAuditList.vue

@@ -7,8 +7,59 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                 <a-form ref="auditFrom" layout="inline" style="display:flex;" >
-                  <div style="width:80%;;display:flex;flex-wrap:wrap;">
+                <a-form ref="auditFrom" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="专辑名称"
+                    name="name">
+                    <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                  class="form-item-style"
+                    label="提交时间"
+                    name="createTime">
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                    </a-range-picker>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="审核状态"
+                    name="approvalState">
+                    <a-select class="set-input" v-model="queryParam.approvalState" placeholder="请选择"  allowClear>
+                      <a-select-option v-for="(item,index) in approvalStateList" :key="index" :value="item.value">
+                        {{item.label}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="所属分类"
+                    name="categoryIds">
+                    <a-cascader v-model="categoryIds" 
+                                class="set-input" 
+                                :options="classifyLevelList" 
+                                :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
+                                placeholder="请选择"
+                                changeOnSelect
+                                @change="handleClassifyChange" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="提交人"
+                    name="createName">
+                    <a-input class="set-input" v-model="queryParam.createName" placeholder="请输入" />
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick(true)">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                        
+                  <!-- <div style="width:80%;;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                         <a-form-item
                           style="width:320px;margin: 5px 40px 5px 0;"
@@ -80,7 +131,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="commentAuditListBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
               </div>
@@ -99,6 +150,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
@@ -182,10 +234,10 @@ export default {
       classifyLevelList: [],
       approvalStateList: [
         {value: 1, label: '待节点审核'},
-        {value: 2, label: '节点驳回'},
-        {value: 3, label: '待最终审核'},
-        {value: 4, label: '最终驳回'},
-        {value: 5, label: '最终通过'}
+        {value: 2, label: '待最终审核'},
+        {value: 3, label: '节点驳回'},
+        {value: 4, label: '最终节点驳回'},
+        {value: 5, label: '审核完成'}
       ],
       columns: [
         {
@@ -373,6 +425,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -396,7 +450,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -425,7 +479,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -434,6 +499,9 @@ export default {
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/  .ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/config/bannerList.vue

@@ -56,7 +56,7 @@
                   <div style="display:flex;justify-content:center;margin-top: 8px;">
                     <a-button @click="handleResetClick">重置</a-button>
                     <a-button type="primary" @click="handleSearchClick">查询</a-button>
-                   </div>
+                  </div>
                   <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                       <a-form-item
@@ -301,7 +301,6 @@ export default {
   padding: 40px!important;
   background: @gary;
   overflow-y: auto!important;
-  // height:calc( 100vh - 118px )!important;
   display: block!important;
   .fit-header {
     .bread-crumb {

src/views/modules/knowledge/map/mapList.vue

@@ -5,11 +5,64 @@
         <div slot="toolheader" border="false" foldbtn="false">
           <breadcrumb firstLevel="地图管理" lastLevel="地图列表" />
           <div class="mainContent">
-            <div class="body" style="padding-right:20px;
-            ">
+            <div class="body" style="padding-right:20px;">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap: wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="地图名称"
+                    name="name">
+                    <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="所属组织"
+                    name="groupId">
+                    <a-tree-select
+                      v-model="queryParam.groupId"
+                      class="set-input"
+                      tree-data-simple-mode
+                      allow-clear
+                      :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                      :tree-data="orgData"
+                      placeholder="请选择"
+                      :load-data="onLoadGroupTree"
+                    />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="地图类型"
+                    name="type">
+                    <a-select class="set-input" v-model="queryParam.type" placeholder="请选择" allowClear>
+                      <a-select-option v-for="(item,index) in mapTypeList" :key="index" :value="item.value">
+                        {{item.name}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="操作人"
+                    name="operator">
+                    <a-input class="set-input" v-model="queryParam.operator" placeholder="请输入" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="操作时间"
+                    name="operatorTime">
+                    <a-range-picker v-model="operatorTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                      <a-icon v-if="$store.state.appSetting.collapsed" slot="suffixIcon" type="calendar" />
+                    </a-range-picker>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick(true)">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
@@ -84,7 +137,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="mapAdd" :butn-icon="'none'" @click="handleAddUpdateMap">新增地图</rx-button>
               </div>
@@ -101,6 +154,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
@@ -273,6 +327,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .bread-crumb {
       position: relative;
@@ -303,7 +359,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -318,6 +374,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 
 @keyframes show-other-search{
 	0%{opacity:0;}
@@ -326,6 +394,9 @@ export default {
 }
 </style>
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/.ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/news/newsList.vue

@@ -7,8 +7,46 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap: wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="新闻标题"
+                    name="title">
+                    <a-input class="set-input" v-model="queryParam.titles" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="上线/下线"
+                    name="type">
+                    <a-select class="set-input" v-model="queryParam.enabled" placeholder="请选择" allowClear>
+                      <a-select-option v-for="(item,index) in lineList" :key="index" :value="item.value">
+                        {{item.label}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="作者"
+                    name="author">
+                    <a-input class="set-input" v-model="queryParam.author" placeholder="请输入" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="创建时间"
+                    name="createTime">
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                    </a-range-picker>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
@@ -69,7 +107,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="newsAdd" :butn-icon="'none'" @click="$router.push('/knowledge/newsAddEdit')">新增新闻</rx-button>
               </div>
@@ -85,6 +123,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           id-fied="pkId"
         >
@@ -211,6 +250,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .bread-crumb {
       position: relative;
@@ -241,7 +282,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -257,7 +298,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -265,6 +317,9 @@ export default {
 }
 </style>
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/.ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/warehouse/auditManageList.vue

@@ -7,8 +7,68 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                 <a-form ref="auditFrom" layout="inline" style="display:flex;" >
-                  <div style="width:80%;;display:flex;flex-wrap:wrap;">
+                <a-form ref="auditFrom" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="知识标题"
+                    name="name">
+                    <a-input class="set-input" v-model="queryParam.titles" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="创建时间"
+                    name="createTime">
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                    </a-range-picker>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="审核状态"
+                    name="online">
+                    <a-select class="set-input" v-model="queryParam.approvalStatus" placeholder="请选择"  allowClear>
+                      <a-select-option v-for="(item,index) in approvalStatusList" :key="index" :value="item.value">
+                        {{item.label}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="知识类别"
+                    name="online">
+                    <a-select class="set-input" v-model="queryParam.type" placeholder="请选择"  allowClear>
+                      <a-select-option v-for="(item,index) in knowledgeList" :key="index" :value="item.value">
+                        {{item.label}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="所属分类"
+                    name="categoryIds">
+                    <a-cascader v-model="categoryIds" 
+                                class="set-input"
+                                :options="classifyList" 
+                                :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
+                                placeholder="请选择"
+                                changeOnSelect
+                                @change="handleClassifyChange" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="作者"
+                    name="creator">
+                    <a-input class="set-input" v-model="queryParam.author" placeholder="请输入" />
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                         <a-form-item
                           style="width:320px;margin: 5px 40px 5px 0;"
@@ -90,7 +150,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="processEdit" :butn-icon="'false'" @click="$router.push('/knowledge/auditProcessMaintain')">维护审核流程</rx-button>
                 <rx-button alias="processBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
@@ -110,6 +170,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
@@ -547,6 +608,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -570,7 +633,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -600,6 +663,18 @@ export default {
 	animation:show-other-search 0.8s;
 }
 
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -608,6 +683,9 @@ export default {
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/  .ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/warehouse/knowledgeClassList.vue

@@ -7,16 +7,22 @@
           <div class="mainContent">
             <div class="body">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <a-form-item
                       style="width:300px;margin: 5px 40px 5px 0;"
                       label="分类名称"
                       name="name">
                       <a-input v-model="queryParam.name" placeholder="请输入"/>
                     </a-form-item>
-                  </div>
-                  <div style="width:20%;display:flex;justify-content:flex-end;margin-top: 8px;">
+                  </div> -->
+                  <a-form-item
+                      class="form-item-style"
+                      label="分类名称"
+                      name="name">
+                      <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                    </a-form-item>
+                  <div style="display:flex;justify-content:flex-end;margin-top: 8px;">
                     <a-button @click="handleResetClick">重置</a-button>
                     <a-button type="primary" @click="handleSearchClick">查询</a-button>
                   </div>
@@ -35,6 +41,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
@@ -288,6 +295,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -311,7 +320,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -327,7 +336,12 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -336,6 +350,9 @@ export default {
 
 </style>
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/ .ant-table-row-expand-icon{
   position: relative;
     z-index: 100;

src/views/modules/knowledge/warehouse/knowledgeLabelList.vue

@@ -7,8 +7,8 @@
           <div class="mainContent">
             <div class="body">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;" >
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap:wrap;" >
+                  <!-- <div style="width:80%;display:flex;flex-wrap:wrap;">
                     <a-form-item
                       style="width:320px;margin: 5px 40px 5px 0;"
                       label="标签名称"
@@ -27,8 +27,26 @@
                         <a-icon v-if="$store.state.appSetting.collapsed" slot="suffixIcon" type="calendar" />
                       </a-range-picker>
                     </a-form-item>
-                  </div>
-                  <div style="width:20%;display:flex;justify-content:flex-end;margin-top: 8px;">
+                  </div> -->
+                  <a-form-item
+                    class="form-item-style"
+                    label="标签名称"
+                    name="name">
+                    <a-input class="set-input" v-model="queryParam.name" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="创建时间"
+                    name="createTime">
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                    </a-range-picker>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:flex-end;margin-top: 8px;">
                     <a-button @click="handleResetClick">重置</a-button>
                     <a-button type="primary" @click="handleSearchClick">查询</a-button>
                   </div>
@@ -48,6 +66,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
@@ -188,6 +207,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -211,7 +232,7 @@ export default {
   }
   .table-style {
     padding: 20px;
-
+    min-height: 400px;
     .clearBtn {
       background: none;
       color: #3294F7;
@@ -222,9 +243,24 @@ export default {
     }
   }
 }
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/  .ant-btn > .anticon + span {
   margin-left: 0;
 }

src/views/modules/knowledge/warehouse/knowledgeManageList.vue

@@ -7,8 +7,58 @@
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;;display:flex;flex-wrap:wrap;">
+                <a-form ref="searchForm" layout="inline" style="display:flex;flex-wrap:wrap;">
+                  <a-form-item
+                    class="form-item-style"
+                    label="知识标题"
+                    name="titles">
+                    <a-input class="set-input" v-model="queryParam.titles" placeholder="请输入"/>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="知识类型"
+                    name="type">
+                    <a-select class="set-input" v-model="queryParam.type" placeholder="请选择" allowClear>
+                      <a-select-option v-for="(item,index) in knowledgeList" :key="index" :value="item.value">
+                        {{item.label}}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="作者"
+                    name="author" >
+                    <a-input class="set-input" v-model="queryParam.author" placeholder="请输入" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="所属分类"
+                    name="categoryIds">
+                    <a-cascader v-model="categoryIds" 
+                              class="set-input" 
+                              :options="classifyList" 
+                              :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
+                              placeholder="请选择"
+                              changeOnSelect
+                              @change="handleClassifyChange" />
+                  </a-form-item>
+                  <a-form-item
+                    class="form-item-style"
+                    label="创建时间"
+                    name="createTime" >
+                    <a-range-picker v-model="createTime" 
+                                    class="set-range-picker" 
+                                    separator="→"
+                                    format="YYYY/MM/DD"
+                                    valueFormat="YYYY-MM-DD"
+                                    @change="handleClearTimeChange">
+                    </a-range-picker>
+                  </a-form-item>
+                  <div style="display:flex;justify-content:center;margin-top: 8px;">
+                    <a-button @click="handleResetClick">重置</a-button>
+                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
+                  </div>
+                  <!-- <div style="width:80%;;display:flex;flex-wrap:wrap;">
                     <div style="display:flex;flex-wrap:wrap;">
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
@@ -80,7 +130,7 @@
                         </template>
                       </a-button>
                     </div>
-                  </div>
+                  </div> -->
                 </a-form>
                 <rx-button alias="knowAdd" :butn-icon="'false'" @click="$router.push('/knowledge/knowledgeAddUpdate')">新增知识</rx-button>
                 <rx-button :class="{'knowledge-manage':num != 0}" :data-attr="num" alias="knowProcess" :butn-icon="'false'" @click="handleJumpPathClick">知识审核</rx-button>
@@ -98,6 +148,7 @@
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
+          :heightAuto="true"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
@@ -306,6 +357,8 @@ export default {
 .rx-fit {
   padding: 40px!important;
   background: @gary;
+  overflow-y: auto!important;
+  display: block!important;
   .fit-header {
     .mainContent {
       width: 100%;
@@ -329,6 +382,7 @@ export default {
   }
   .table-style {
     padding: 20px;
+    min-height: 400px;
 
     .clearBtn {
       background: none;
@@ -358,7 +412,18 @@ export default {
 	width: 100%;
 	animation:show-other-search 0.8s;
 }
-
+.form-item-style {
+  margin: 5px 20px 5px 0;
+}
+.set-input {
+  width:180px;
+}
+.set-select {
+  width:120px;
+}
+.set-range-picker {
+  width:230px!important;
+}
 @keyframes show-other-search{
 	0%{opacity:0;}
   50%{opacity:0.8;}
@@ -367,6 +432,9 @@ export default {
 </style>
 
 <style scoped>
+/deep/   .divdefault {
+  position: inherit!important;
+}
 /deep/ .ant-btn > .anticon + span {
   margin-left: 0;
 }