Merge branch 'file-share' into 'master'

File share

See merge request spfm-group/spfm-market-front!25

src/pages/main/file/flieList.vue

@@ -120,7 +120,7 @@
               <el-table-column type="selection" width="55"> </el-table-column>
               <el-table-column
                 prop="title"
-                width="250"
+                width="180"
                 show-overflow-tooltip
                 label="材料名称"
               >
@@ -135,6 +135,11 @@
                   <span class="">{{ scope.row.titleBg }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="文件名称" width="180" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <span class="">{{ scope.row.fileName }}</span>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="createTime"
                 show-overflow-tooltip
@@ -180,6 +185,7 @@
       title="新增目录"
       :append-to-body="true"
       :visible.sync="addDialogStatus"
+      :close-on-click-modal="false"
     >
       <el-form
         :model="formData"
@@ -195,13 +201,15 @@
             placeholder="请输入标题"
           ></el-input>
         </el-form-item>
+        <!--  目录不设置权限
         <el-form-item label="查看权限:" prop="text">
           <el-radio-group v-model="formData.auth">
-            <el-radio label="1">二级经理可见</el-radio>
+            <el-radio label="3">二级经理可见</el-radio>
             <el-radio label="2">三级经理可见</el-radio>
-            <el-radio label="3">普通员工可见</el-radio>
+            <el-radio label="1">普通员工可见</el-radio>
           </el-radio-group>
         </el-form-item>
+         -->
         <el-form-item
           prop="parentId"
           v-if="actionName != 'add'"
@@ -256,6 +264,7 @@
       :append-to-body="true"
       :before-close="closedia"
       :visible.sync="dialogStatus"
+      :close-on-click-modal="false"
     >
       <div v-loading="loadinged">
         <el-form
@@ -272,9 +281,9 @@
           <el-form-item class="info-line online radviv" prop="text">
             <span>查看权限:</span>
             <el-radio-group v-model="infolist.auth">
-              <el-radio label="1">二级经理可见</el-radio>
-              <el-radio label="2">三级经理可见</el-radio>
-              <el-radio label="3">普通员工可见</el-radio>
+              <el-radio label="2">二级经理可见</el-radio>
+              <el-radio label="3">三级经理可见</el-radio>
+              <el-radio label="1">普通员工可见</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item prop="meeting" class="info-line online">
@@ -675,6 +684,8 @@ export default {
             data: {
               id: val.id,
               isFile: "1",
+              createId: val.createId,
+              createName: val.createName,
             },
           }).then((res) => {
             if (res.data.result == 0) {
@@ -684,6 +695,12 @@ export default {
                 type: "success",
               });
               this.getList(this.params, this.pageSize);
+            }else if(res.data.result == 1) {
+              this.$notify({
+                title: "失败",
+                message: res.data.desc,
+                type: "error",
+              });
             }
           });
         })
@@ -709,6 +726,8 @@ export default {
               data: {
                 id: this.formData.id,
                 isFile: "0",
+                createId: this.formData.createId,
+                createName: this.formData.createName,
               },
             }).then((res) => {
               if (res.data.result == 0) {
@@ -719,7 +738,13 @@ export default {
                 });
                 this.actionName = "";
                 this.getData();
-              }
+              }else if(res.data.result == 1) {
+              this.$notify({
+                title: "失败",
+                message: res.data.desc,
+                type: "error",
+              });
+            }
             });
           })
           .catch(() => {});