yusheng 10 сар өмнө
parent
commit
6ac5ac1e78

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

@@ -5,7 +5,7 @@
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
-    style="width: 600px; display: inline-block"
+    style="width: 500px; display: inline-block"
   >
     <el-row :gutter="24">
       <el-col :span="10">

+ 186 - 182
src/views/doc/components/file-table-list.vue

@@ -5,9 +5,9 @@
       ref="table"
       :columns="columns"
       :datasource="datasource"
-      height="calc(30vh)"
+      height="calc(45vh)"
       tool-class="ele-toolbar-form"
-       :initLoad="false"
+      :initLoad="false"
       row-key="id"
       :current.sync="current"
       :selection.sync="selection"
@@ -15,207 +15,212 @@
       @row-click="rowClick"
       @selection-change="selectionClick"
       @done="done"
+      :page-size="20"
       :toolbar="!isPop"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
-        <!-- <div style="display: contents;"> -->
-          <el-dropdown trigger="click" v-if="lcyStatus == 1">
-          <el-button type="primary">
-            新建<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
+        <div style="display: flex; flex-wrap: wrap; align-items: center">
+          <div>
+            <el-dropdown trigger="click" v-if="lcyStatus == 1">
+              <el-button type="primary">
+                新建<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  @click.native="
+                    parenOpen('add', {
+                      power: 'add',
+                      dataKey: 'parentData',
+                      isArr: false
+                    })
+                  "
+                  >新建文件夹</el-dropdown-item
+                >
+                <el-dropdown-item
+                  @click.native="
+                    openEdit('add', '', {
+                      power: 'add',
+                      dataKey: 'parentData',
+                      isArr: false
+                    })
+                  "
+                  >新建文档</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
+            <el-dropdown trigger="click" v-if="lcyStatus == 1">
+              <el-button type="primary">
+                编辑<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  @click.native="
+                    parenOpen('edit', {
+                      power: 'revise',
+                      dataKey: 'parentData',
+                      isArr: false
+                    })
+                  "
+                  >修改</el-dropdown-item
+                >
+                <el-dropdown-item
+                  @click.native="
+                    parenOpen('del', {
+                      power: 'del',
+                      dataKey: 'parentData',
+                      isArr: false
+                    })
+                  "
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
+            <el-button
+              v-if="lcyStatus == 1"
+              type="primary"
               @click.native="
-                parenOpen('add', {
+                openEditAll({
                   power: 'add',
                   dataKey: 'parentData',
                   isArr: false
                 })
               "
-              >新建文件夹</el-dropdown-item
             >
-            <el-dropdown-item
+              批量上传
+            </el-button>
+            <el-button
+              type="primary"
               @click.native="
-                openEdit('add', '', {
-                  power: 'add',
-                  dataKey: 'parentData',
-                  isArr: false
+                checkEnter({
+                  power: 'checkEnter',
+                  dataKey: 'current',
+                  isArr: true
                 })
               "
-              >新建文档</el-dropdown-item
+              :disabled="
+                selection.length > 1 || selection[0]?.checkOutStatus == 0
+              "
+              v-if="lcyStatus == 1"
             >
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-dropdown trigger="click" v-if="lcyStatus == 1">
-          <el-button type="primary">
-            编辑<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item
+              检入
+            </el-button>
+            <el-button
+              type="primary"
               @click.native="
-                parenOpen('edit', {
-                  power: 'revise',
-                  dataKey: 'parentData',
-                  isArr: false
+                checkOut({
+                  power: 'checkOut',
+                  dataKey: 'current',
+                  isArr: true
                 })
               "
-              >修改</el-dropdown-item
+              :disabled="
+                selection.length > 1 || selection[0]?.checkOutStatus == 1
+              "
+              v-if="lcyStatus == 1"
             >
-            <el-dropdown-item
-              @click.native="
-                parenOpen('del', {
-                  power: 'del',
-                  dataKey: 'parentData',
-                  isArr: false
+              检出
+            </el-button>
+
+            <el-popconfirm
+              class="ele-action"
+              v-if="lcyStatus == 1 && fileType === 0"
+              title="归档后文档无法修改,是否确认归档"
+              @confirm="
+                updateLcyStatus({
+                  power: 'archive',
+                  dataKey: 'current',
+                  isArr: true
                 })
               "
-              >删除</el-dropdown-item
             >
-          </el-dropdown-menu>
-        </el-dropdown>
-        <el-button
-          v-if="lcyStatus == 1"
-          type="primary"
-          @click.native="
-            openEditAll({
-              power: 'add',
-              dataKey: 'parentData',
-              isArr: false
-            })
-          "
-        >
-          批量上传
-        </el-button>
-
-    
-        <el-button
-          type="primary"
-          @click.native="
-            checkEnter({
-              power: 'checkEnter',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-          :disabled="selection.length > 1 || selection[0]?.checkOutStatus == 0"
-          v-if="lcyStatus == 1"
-        >
-          检入
-        </el-button>
-        <el-button
-          type="primary"
-          @click.native="
-            checkOut({
-              power: 'checkOut',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-          :disabled="selection.length > 1 || selection[0]?.checkOutStatus == 1"
-          v-if="lcyStatus == 1"
-        >
-          检出
-        </el-button>
+              <template v-slot:reference>
+                <el-button type="primary"> 归档 </el-button>
+              </template>
+            </el-popconfirm>
+            <el-button
+              type="primary"
+              v-if="lcyStatus == 2"
+              @click="
+                noUpdateLcyStatus({
+                  power: 'cancelArchive',
+                  dataKey: 'current',
+                  isArr: true
+                })
+              "
+            >
+              取消归档
+            </el-button>
 
-        <el-popconfirm
-          class="ele-action"
-          v-if="lcyStatus == 1 && fileType === 0"
-          title="归档后文档无法修改,是否确认归档"
-          @confirm="
-            updateLcyStatus({
-              power: 'archive',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-        >
-          <template v-slot:reference>
-            <el-button type="primary"> 归档 </el-button>
-          </template>
-        </el-popconfirm>
-        <el-button
-          type="primary"
-          v-if="lcyStatus == 2"
-          @click="
-            noUpdateLcyStatus({
-              power: 'cancelArchive',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-        >
-          <!-- {
-              power: 'cancelArchive',
-              dataKey: 'current',
-              isArr: true
-            } -->
-          取消归档
-        </el-button>
+            <el-button
+              type="primary"
+              v-if="
+                (lcyStatus == 1 || lcyStatus == 2) &&
+                (fileType == 0 || fileType == 1)
+              "
+              @click="
+                openSendEdit({
+                  power: 'release',
+                  dataKey: 'current',
+                  isArr: true
+                })
+              "
+            >
+              发布
+            </el-button>
+            <el-button
+              v-if="fileType == 2"
+              type="primary"
+              @click="processSubmit_template"
+            >
+              发布
+            </el-button>
 
-        <el-button
-          type="primary"
-          v-if="
-            (lcyStatus == 1 || lcyStatus == 2) &&
-            (fileType == 0 || fileType == 1)
-          "
-          @click="
-            openSendEdit({
-              power: 'release',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-        >
-          发布
-        </el-button>
-        <el-button
-          v-if="fileType == 2"
-          type="primary"
-          @click="processSubmit_template"
-        >
-          发布
-        </el-button>
+            <el-button
+              v-if="fileType === 0 && lcyStatus != 4"
+              type="primary"
+              :disabled="selection.length > 1"
+              @click="
+                processSubmit({
+                  power: 'abolish',
+                  dataKey: 'current',
+                  isArr: true
+                })
+              "
+            >
+              废止
+            </el-button>
 
-        <el-button
-          v-if="fileType === 0 && lcyStatus != 4"
-          type="primary"
-          :disabled="selection.length > 1"
-          @click="
-            processSubmit({
-              power: 'abolish',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-        >
-          废止
-        </el-button>
+            <el-button
+              type="primary"
+              @click.native="
+                getFile({
+                  power: 'download',
+                  dataKey: 'current',
+                  isArr: true
+                })
+              "
+            >
+              下载
+            </el-button>
+            <el-button
+              :disabled="selection.length > 1"
+              type="primary"
+              v-if="fileType == 1"
+              @click.native="move"
+            >
+              移动
+            </el-button>
+          </div>
+          <div>
+            <fileSearch
+              @search="reload"
+              style="margin-left: 20px; "
+            ></fileSearch
+          ></div>
+        </div>
 
-        <!-- <el-button type="primary"> 上传 </el-button> -->
-        <el-button
-          type="primary"
-          @click.native="
-            getFile({
-              power: 'download',
-              dataKey: 'current',
-              isArr: true
-            })
-          "
-        >
-          下载
-        </el-button>
-        <el-button
-          :disabled="selection.length > 1"
-          type="primary"
-          v-if="fileType == 1"
-          @click.native="move"
-        >
-          移动
-        </el-button>
-        <fileSearch @search="reload" style="margin-left: 20px;"></fileSearch>
         <!-- </div> -->
-       
       </template>
 
       <!-- 操作列 -->
@@ -266,7 +271,7 @@
     <el-tabs
       type="border-card"
       v-show="!current?.id && parentData?.id"
-      style="height: calc(70vh - 260)"
+      style="height: calc(55vh - 260px)"
     >
       <el-tab-pane label="常规">
         <folderInfo :parentId="parentData?.id" :folderList="folderList" />
@@ -278,7 +283,7 @@
       v-model="activeName"
       type="border-card"
       v-show="current.id && isPower(current, 'check')"
-      style="height: calc(70vh - 260px)"
+      style="height: calc(55vh - 260px)"
       @tab-click="tabClick"
     >
       <el-tab-pane label="常规" name="常规">
@@ -599,8 +604,7 @@
             directoryId: this.parentData?.id,
             lcyStatus: this.lcyStatus,
             fileType: this.fileType,
-            isQueryAll:this.$hasPermission('fm:doc:viewAll')?1:''
-            
+            isQueryAll: this.$hasPermission('fm:doc:viewAll') ? 1 : ''
           });
         }
       },
@@ -916,7 +920,7 @@
   .el-tabs__content {
     height: calc(100% - 39px);
   }
-  :deep(.ele-table-tool-title-content){
-         display: contents;
+  :deep(.ele-table-tool-title-content) {
+    display: contents;
   }
 </style>