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

src/assets/styles/element-ui.scss

@@ -14,6 +14,14 @@
 .el-upload__input {
   display: none;
 }
+ // this.confirm删除确认框修改确定取消按钮顺序
+.el-message-box__btns {
+  text-align: right;
+  padding: 5px 120px 0;
+  display: flex;
+  flex-direction: row-reverse;
+  gap: 65px;
+}
 
 .cell {
   .el-tag {

src/views/doc/info/index.vue

@@ -56,6 +56,7 @@
           <el-table-column label="修改时间" align="center" prop="updateTime" />
           <el-table-column label="文件级别" align="center" prop="docLevel" />
           <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="handlePreview(scope.row)">分享</el-button>
@@ -82,6 +83,9 @@
           <!-- <el-input v-model="form.docPath" placeholder="请输入文件路径" /> -->
           <file-upload v-model="form.docPath" />
         </el-form-item>
+        <el-form-item label="文件目录" prop="dirId">
+          <treeselect v-model="form.dirId" :options="dirList" :normalizer="normalizer" placeholder="请选择文件目录" />
+        </el-form-item>
         <el-form-item label="文件名称" prop="docName">
           <el-input v-model="form.docName" placeholder="请输入文件名称" />
         </el-form-item>
@@ -89,7 +93,13 @@
           <el-input v-model="form.docDesc" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="文件级别" prop="docLevel">
-          <el-input v-model="form.docLevel" placeholder="请输入文件级别" />
+          <el-select v-model="form.docLevel" placeholder="请选择文件级别">
+            <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="docLevel">
+          <el-input v-model="form.docLevel" type="textarea" placeholder="请输入文件标签,多个标签以空格分隔,每个标签最好不超过四个字!" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -116,6 +126,9 @@
     updateDir,
     personalList
   } from "@/api/doc/dir";
+  import {
+    listLevel
+  } from "@/api/doc/level";
 
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -141,8 +154,12 @@
         total: 0,
         // 文件基本信息表格数据
         infoList: [],
-        dirId: undefined, //目录ID
+        //目录ID
+        dirId: undefined,
+        //目录数据
         dirList: undefined,
+        //文件等级数据
+        levelOptions: undefined,
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -180,7 +197,26 @@
     created() {
       this.dirTree();
     },
+    watch: {
+      "form.docPath": function(path, old) {
+        if (path && path.lastIndexOf("/") > -1) {
+          let name = path.slice(path.lastIndexOf("/") + 1);
+          this.form.docName = name.split("_")[0];
+        }
+      }
+    },
     methods: {
+      /** 转换目录信息数据结构 */
+      normalizer(node) {
+        if (node.children && !node.children.length) {
+          delete node.children;
+        }
+        return {
+          id: node.dirId,
+          label: node.dirName,
+          children: node.children
+        };
+      },
       // 节点单击事件
       handleNodeClick(data) {
         this.dirId = data.dirId;
@@ -274,8 +310,11 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
-        this.open = true;
-        this.title = "添加文件基本信息";
+        listLevel().then(response => {
+          this.levelOptions = response.rows;
+          this.open = true;
+          this.title = "添加文件基本信息";
+        });
       },
       /** 修改按钮操作 */
       handleUpdate(row) {