Merge branch 'file-share' into 'test-new'

部门文件共享全屏按钮bug

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

src/pages/main/file/flieList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
-    <div class="container-box">
-      <toolList :tooltit="tooltit"></toolList>
+    <fullscreen :fullscreen.sync="fullscreen" class="container-box">
+       
       <div class="main-box">
         <div class="inner-left" style="overflow: hidden">
           <div class="button-list">
@@ -95,6 +95,15 @@
         </div>
         
         <div class="inner-right">
+          <div class="titbox">
+            <div>
+              <i class="el-icon-refresh" @click="iconCli(1)"></i>
+              <i class="el-icon-full-screen" @click="iconCli(2)"></i>
+              <!--                    <i class="el-icon-folder-opened"></i>-->
+              <!--                    <i class="el-icon-view"></i>-->
+              <!--                    <i class="el-icon-more"></i>-->
+            </div>
+          </div>
           <div class="search">
             <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
           </div>
@@ -185,7 +194,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </fullscreen>
     <el-dialog
       class="p-new-box"
       size="50%"
@@ -363,6 +372,7 @@ export default {
       roleData: "", // 某一条数据
       tableData: [], // 表格数据源
       authData: "", //权限数据
+      fullscreen: false,
       infolist: {
         isFile: "1",
         title: "", // 材料名称
@@ -534,6 +544,7 @@ export default {
         v[0] ? this.paramsSearch.title = v[0] : '';
         this.paramsSearch.isFile = "1";
         // this.paramsSearch.parentId = this.infolist.parentId;
+        this.pageSize = 1;//重置分页
         this.getList(this.paramsSearch, this.pageSize);
     },
     // 附件下载
@@ -813,6 +824,7 @@ export default {
       this.params.catalogId = nodeData.id;
       this.params.id = nodeData.id;
       this.infolist.parentId = nodeData.id;
+      this.pageSize = 1;//切换树重置分页
       this.getList(this.params, this.pageSize);
     },
     // 获取目录
@@ -883,6 +895,15 @@ export default {
       }
       return tree;
     },
+    //功能栏
+    iconCli(v) {
+      if (v === 1) {
+        this.getList(this.params, this.pageSize);
+      }
+      if (v === 2) {
+        this.fullscreen = !this.fullscreen;
+      }
+    },
     // 分页
     currchange(v) {
       this.pageSize = v;
@@ -989,6 +1010,17 @@ export default {
 </style>
 
 <style lang="scss" scoped>
+.titbox {
+  div {
+    float: right;
+
+    i {
+      font-size: 22px;
+      margin-left: 20px;
+      cursor: pointer;
+    }
+  }
+}
 .container {
   background-color: #f0f2f5;
   .clearStyle {

src/pages/main/funcInit/manageLnit.vue

@@ -62,6 +62,14 @@
                         <span>线条名称</span>
                         <el-input v-model="infolist.lineName" placeholder="线条名称" :disabled="disableStatus"></el-input>
                     </el-form-item>
+                    <el-form-item v-if="type == '1'" prop="groupname">
+                        <span>分组名称</span>
+                        <el-select  :disabled="disableStatus" v-model="groupname"
+                            placeholder="分组名称">
+                            <el-option value="default" label="默认"> </el-option>
+					        <el-option value="IT" label="信息中心"> </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item v-if="type != '1'" prop="lineId">
                         <span>线条名称</span>
                         <el-select :popper-append-to-body="false" :disabled="disableStatus" v-model="lineId"
@@ -165,6 +173,15 @@
                     callback()
                 }
             }
+
+             const groupname = (rule, value, callback) => {
+                if (!this.groupname && this.type > 1) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+
             const lineId = (rule, value, callback) => {
                 if (!this.lineId && this.type > 1) {
                     callback(new Error('不能为空'))
@@ -252,6 +269,11 @@
                         trigger: 'blur',
                         validator: lineName
                     }],
+                    groupname: [{
+                        required: true,
+                        trigger: 'blur',
+                        validator: groupname
+                    }],
                     lineId: [{
                         required: true,
                         trigger: 'change',
@@ -342,6 +364,7 @@
 
                 },
                 lineId: '',
+                groupname: 'default',
                 unitId: '',
                 moduleId: '',
                 typeOptions: [{
@@ -440,6 +463,7 @@
                     this.lineId = this.infolist.lineId;
                     this.unitId = this.infolist.unitId;
                     this.moduleId = this.infolist.moduleId;
+                    this.groupname = this.infolist.groupname;
                     return
                 } else if (v === 2) {
                     this.titname = '修改';
@@ -448,6 +472,7 @@
                     this.lineId = this.infolist.lineId;
                     this.unitId = this.infolist.unitId;
                     this.moduleId = this.infolist.moduleId;
+                    this.groupname = this.infolist.groupname;
                 } else if (v === 3) {
                     this.titname = '添加';
                     this.disableStatus = false;
@@ -471,6 +496,7 @@
                     this.infolist.lineId = this.lineId;
                     this.infolist.unitId = this.unitId;
                     this.infolist.moduleId = this.moduleId;
+                    this.infolist.groupname = this.groupname;
                     if (this.titname === '添加') {
                         let url = '';
                         if (this.type == '1') {