Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/page/index/top/index.vue

@@ -74,12 +74,14 @@
              @click="handleScreen"></i>
         </div>
       </el-tooltip>
-      <img class="top-bar__img"
-           :src="userInfo.avatar">
       <el-dropdown>
-        <span class="el-dropdown-link">
-          {{userInfo.userName}}
-          <i class="el-icon-arrow-down el-icon--right"></i>
+        <span>
+          <img class="top-bar__img"
+              :src="userInfo.avatar">
+          <span class="el-dropdown-link">
+            {{userInfo.userName}}
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
         </span>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item>

src/views/manager/projectinfo/detail.vue

@@ -907,9 +907,11 @@ export default {
     },
     async treeInit () {
       let refId = this.projectForm.referenceWbsTemplateId;
-      if (refId && refId > 0) {
+      //引用被删会出现 wbsType -1
+      if (refId && refId > 0 && Number(this.projectForm.wbsType) > 0) {
         //有引用id，回显
         //this.selected = true;
+
         this.templateType = this.projectForm.wbsType;
         await this.getTreeList();
         let priv = {};

src/views/manager/projectinfo/list.vue

@@ -291,7 +291,11 @@ export default {
             type: "success",
             message: "删除成功!"
           });
-          this.init();
+          //删除后当前列表为空，且不是第一页，往前翻一页
+          if(this.projectPageList.length == 1 && this.page.currentPage >1){
+            this.page.currentPage--;
+          }
+          this.getProjectPageList();
           this.projectVisible = false;
         })
       })

src/views/manager/projectinfo/tree.vue

@@ -33,7 +33,7 @@
                   slot-scope="{ node, data }"
                 >
                   <!--@mouseover="mouseover(data)" @mouseleave="mouseout(data)"-->
-                  <span>
+                  <span class="pd-r-20">
                     {{ node.label }}
                     <el-dropdown
                       @click="command=>{setLeftType(command,data)}"
@@ -103,7 +103,7 @@
                   slot-scope="{ node, data }"
                   :class="data.moreShow?'show':''"
                 >
-                  <span>
+                  <span class="pd-r-20">
                     {{ node.label }}
                     <el-dropdown
                       @click="command=>{setLeftType(command,data)}"
@@ -2423,4 +2423,8 @@ export default {
     padding: 10px 20px !important;
   }
 }
+.filter-tree{
+  min-width: 100%;
+  display:inline-block;
+}
 </style>

src/views/manager/wbsinfo/edit.vue

@@ -34,7 +34,7 @@
                   slot-scope="{ node, data }"
                 >
                   <!--@mouseover="mouseover(data)" @mouseleave="mouseout(data)"-->
-                  <span>
+                  <span class="pd-r-20">
                     {{ node.label }}
                     <el-dropdown
                       @click="command=>{setLeftType(command,data)}"
@@ -115,7 +115,7 @@
                   slot-scope="{ node, data }"
                   :class="data.moreShow?'show':''"
                 >
-                  <span>
+                  <span class="pd-r-20">
                     {{ node.label }}
                     <el-dropdown
                       @click="command=>{setLeftType(command,data)}"
@@ -722,6 +722,7 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.eType"
+                @change="setDefaultLength(scope.row)"
                 size="small"
                 placeholder="请选择"
               >
@@ -984,6 +985,7 @@
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.eType"
+              @change="setDefaultLength(scope.row)"
               size="small"
               placeholder="请选择"
             >
@@ -1503,6 +1505,17 @@ export default {
       namelist: [],
       namelists: [],
       infoNameVisible: false,
+
+      //数据类型的默认长度
+      dataTypeDefaultMap:{
+        1:1000,//字符串
+        2:65,//整数
+        3:65,//小数
+        4:0,//日期
+        5:65,//数值
+        6:1000,//签名
+        7:1000,//文件
+      }
     };
   },
   computed: {
@@ -2243,6 +2256,12 @@ export default {
       if (!value) return true;
       return data.title.indexOf(value) !== -1;
     },
+
+    //修改数据类型，给个默认值
+    setDefaultLength(row){
+      this.$set(row,'eLength',this.dataTypeDefaultMap[row.eType]);
+    },
+
     //#endregion
 
     //#region 节点参数
@@ -2499,4 +2518,8 @@ export default {
     padding: 10px 20px !important;
   }
 }
+.filter-tree{
+  min-width: 100%;
+  display:inline-block;
+}
 </style>