feat: 文档工作区搜索条件优化

src/views/doc/components/file-search.vue

@@ -1,102 +1,139 @@
 <!-- 搜索表单 -->
 <template>
-  <div style="display: flex; align-items: center">
+  <div>
     <el-form
+      :inline="true"
       size="small"
       class="ele-form-search"
       @keyup.enter.native="search"
       @submit.native.prevent
-      style="width: 260px; display: inline-block"
     >
-      <el-form-item label="文档名称" label-width="80px">
+      <el-form-item label="文档名称">
         <el-input
+          style="width: 100%"
           clearable
           size="small"
           v-model.trim="where.name"
           placeholder="请输入文档名称"
         />
       </el-form-item>
+      <el-form-item label="文档编码">
+        <el-input
+          clearable
+          size="small"
+          v-model.trim="where.code"
+          placeholder="请输入文档编码"
+        />
+      </el-form-item>
+      <el-form-item label="创建人">
+        <el-input
+          clearable
+          size="small"
+          v-model="where.createUserName"
+          placeholder="请选择"
+          @click.native="$refs.addRef.open()"
+          readonly
+        />
+      </el-form-item>
+      <el-form-item style="width: 300px" label="创建时间">
+        <el-date-picker
+          style="width: 230px"
+          v-model="where.createTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          size="small"
+          type="primary"
+          icon="el-icon-search"
+          class="ele-btn-icon"
+          @click="search"
+        >
+          查询
+        </el-button>
+        <el-button size="small" @click="reset" style="margin-left: 5px">
+          重置
+        </el-button>
+        <!-- <el-popover
+          placement="bottom"
+          title="查询"
+          width="600"
+          trigger="manual"
+          v-model="visible"
+        >
+          <el-form
+            size="small"
+            class="ele-form-search"
+            @keyup.enter.native="search"
+            @submit.native.prevent
+            style="width: 500px; display: inline-block"
+          >
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="创建人" label-width="80px">
+                  <el-input
+                    clearable
+                    size="small"
+                    v-model="where.createUserName"
+                    placeholder="请选择"
+                    @click.native="$refs.addRef.open()"
+                    readonly
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="文档编码" label-width="80px">
+                  <el-input
+                    clearable
+                    size="small"
+                    v-model.trim="where.code"
+                    placeholder="请输入文档编码"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <div style="justify-content: flex-end; display: flex">
+                  <el-button size="small" @click="visible = false">
+                    关闭
+                  </el-button>
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-search"
+                    class="ele-btn-icon"
+                    @click="search"
+                    style="margin-left: 5px"
+                  >
+                    查询
+                  </el-button>
+                  <el-button size="small" @click="reset" style="margin-left: 5px">
+                    重置
+                  </el-button>
+                </div>
+              </el-col>
+            </el-row>
+          </el-form>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            slot="reference"
+            style="margin-left: 5px"
+            @click="visible = !visible"
+          >
+            更多查询
+          </el-button>
+        </el-popover> -->
+      </el-form-item>
     </el-form>
-    <el-button
-      size="small"
-      type="primary"
-      icon="el-icon-search"
-      class="ele-btn-icon"
-      @click="search"
-    >
-      查询
-    </el-button>
-    <el-popover
-      placement="bottom"
-      title="查询"
-      width="600"
-      trigger="manual"
-      v-model="visible"
-    >
-      <el-form
-        size="small"
-        class="ele-form-search"
-        @keyup.enter.native="search"
-        @submit.native.prevent
-        style="width: 500px; display: inline-block"
-      >
-        <el-row :gutter="24">
-          <el-col :span="24">
-            <el-form-item label="创建人" label-width="80px">
-              <el-input
-                clearable
-                size="small"
-                v-model="where.createUserName"
-                placeholder="请选择"
-                @click.native="$refs.addRef.open()"
-                readonly
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="文档编码" label-width="80px">
-              <el-input
-                clearable
-                size="small"
-                v-model.trim="where.code"
-                placeholder="请输入文档编码"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <div style="justify-content: flex-end; display: flex">
-              <el-button size="small" @click="visible = false">
-                关闭
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                icon="el-icon-search"
-                class="ele-btn-icon"
-                @click="search"
-                style="margin-left: 5px"
-              >
-                查询
-              </el-button>
-              <el-button size="small" @click="reset" style="margin-left: 5px">
-                重置
-              </el-button>
-            </div>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-button
-        size="small"
-        type="primary"
-        icon="el-icon-search"
-        class="ele-btn-icon"
-        slot="reference"
-        style="margin-left: 5px"
-        @click="visible = !visible"
-      >
-        更多查询
-      </el-button>
-    </el-popover>
+    
     <Add ref="addRef" @success="success" :isSearch="true" />
   </div>
 </template>
@@ -114,7 +151,10 @@
         name: '',
         code: '',
         createUserName: '',
-        createUserIds: []
+        createUserIds: [],
+        createTime: [],
+        createTimeStart: '',
+        createTimeEnd: ''
       };
       return {
         // 表单数据
@@ -136,6 +176,11 @@
       },
       /* 搜索 */
       search() {
+        if (this.where.createTime?.length > 0) {
+          this.where.createTimeStart = this.where.createTime[0] + ' 00:00:00';
+          this.where.createTimeEnd = this.where.createTime[1] + ' 23:59:59';
+        }
+        delete this.where.createTime;
         this.$emit('search', this.where);
         this.visible = false;
       },

src/views/doc/components/file-table-list.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <fileSearch @search="reload"></fileSearch>
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
@@ -249,7 +250,7 @@
         >
           批量移动
         </el-button>
-        <fileSearch @search="reload" style="margin-left: 20px"></fileSearch>
+        
         <!-- </div> -->
       </template>