Selaa lähdekoodia

Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

yxc 2 vuotta sitten
vanhempi
commit
c5c61de222
2 muutettua tiedostoa jossa 40 lisäystä ja 23 poistoa
  1. 30 19
      src/views/doc/info/index.vue
  2. 10 4
      src/views/doc/level/index.vue

+ 30 - 19
src/views/doc/info/index.vue

@@ -16,8 +16,10 @@
             <el-input v-model="queryParams.docName" placeholder="请输入文件名称" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="文件级别" prop="docLevel">
-            <el-input v-model="queryParams.docLevel" placeholder="请输入文件级别" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-select v-model="queryParams.docLevel" placeholder="请选择文件级别" @change="handleQuery">
+              <el-option v-for="item in levelOptions" :key="item.levelId" :label="item.levelName"
+                :value="item.levelId"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="文件年份" prop="createYear">
             <el-input v-model="queryParams.createYear" placeholder="请输入文件创建年份" clearable
@@ -54,13 +56,14 @@
           <el-table-column label="文件名称" align="center" prop="docName" />
           <el-table-column label="文件大小" align="center" prop="docSize" :formatter="fileSizeData" />
           <el-table-column label="修改时间" align="center" prop="updateTime" />
-          <el-table-column label="文件级别" align="center" prop="docLevel" />
+          <el-table-column label="文件级别" align="center" prop="docLevel" :formatter="fileLevelData" />
           <el-table-column label="文件年份" align="center" prop="createYear" />
           <el-table-column label="标签" align="center" prop="tagName" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-view" @click="handleShare(scope.row)">分享</el-button>
-              <el-button size="mini" type="text" icon="el-icon-view" @click="handleDownload(scope.row)">下载</el-button>
+              <el-button size="mini" type="text" icon="el-icon-download"
+                @click="handleDownload(scope.row)">下载</el-button>
               <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreview(scope.row)">预览</el-button>
               <el-button size="mini" type="text" icon="el-icon-view" @click="handleEdit(scope.row)">在线编辑</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -99,7 +102,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="文件标签" prop="docLevel">
-          <el-input v-model="form.docLevel" type="textarea" placeholder="请输入文件标签,多个标签以空格分隔,每个标签最好不超过四个字!" />
+          <el-input v-model="form.docTag" type="textarea" placeholder="请输入文件标签,多个标签以空格分隔,每个标签最好不超过四个字!" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -159,7 +162,7 @@
         //目录数据
         dirList: undefined,
         //文件等级数据
-        levelOptions: undefined,
+        levelOptions: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -186,9 +189,14 @@
             message: "文件名称不能为空",
             trigger: "blur"
           }],
-          createYear: [{
+          dirId: [{
             required: true,
-            message: "文件创建年份;文件创建年份,分表用不能为空",
+            message: "文件目录不能为空",
+            trigger: "blur"
+          }],
+          docLevel: [{
+            required: true,
+            message: "文件级别不能为空",
             trigger: "blur"
           }],
         }
@@ -229,11 +237,9 @@
         row.isEdit = false;
         this.$tab.openPage("文件[" + row.docName + "]预览", '/doc/oo-edit/index/' + row.docId, row);
       },
-      //下载
+      /**下载按钮操作*/
       handleDownload(row) {
-        this.download(row.docPath, null, row.docName + "." + row.docType);
-        row.isEdit = false;
-        this.$tab.openPage("文件[" + row.docName + "]预览", '/doc/oo-edit/index/' + row.docId, row);
+        location.href = row.docPath;
       },
       //预览
       handlePreview(row) {
@@ -256,7 +262,10 @@
           this.queryParams.dirId = this.dirId;
           this.queryParams.searchValue = this.spaceId;
           this.getList();
-
+          //获取文件级别数据
+          listLevel().then(response => {
+            this.levelOptions = response.rows;
+          });
           this.loading = false;
         });
       },
@@ -321,11 +330,8 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
-        listLevel().then(response => {
-          this.levelOptions = response.rows;
-          this.open = true;
-          this.title = "添加文件基本信息";
-        });
+        this.open = true;
+        this.title = "添加文件基本信息";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -385,7 +391,12 @@
         } else {
           return `${(value / GB).toFixed(2)} GB`;
         }
+      },
+      /**处理文档级别数据*/
+      fileLevelData(row, col, value) {
+        const obj=this.levelOptions.find(level => level.levelId == value);
+        return obj.levelName;
       }
     }
   };
-</script>
+</script>

+ 10 - 4
src/views/doc/level/index.vue

@@ -41,11 +41,13 @@
 
     <el-table v-loading="loading" :data="levelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="级别ID" align="center" prop="levelId" />
+      <!-- <el-table-column label="级别ID" align="center" prop="levelId" /> -->
       <el-table-column label="级别名称" align="center" prop="levelName" />
-      <el-table-column label="级别权限" align="center" prop="levelRole" />
+      <el-table-column label="级别权限" align="center" prop="levelRoleName" />
       <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -66,10 +68,13 @@
           <el-input v-model="form.levelName" placeholder="请输入级别名称" />
         </el-form-item>
         <el-form-item label="级别权限" prop="levelRole">
-          <el-input v-model="form.levelRole" placeholder="请输入级别权限" />
+          <el-select v-model="form.roles" multiple placeholder="请选择权限">
+            <el-option v-for="dict in dict.type.level_role" :key="dict.value" :label="dict.label"
+              :value="dict.value+','+dict.label"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" rows=5 placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -91,6 +96,7 @@
 
   export default {
     name: "Level",
+    dicts: ['level_role'],
     data() {
       return {
         // 遮罩层