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

src/views/manager/contractinfo/detail.vue

@@ -701,6 +701,7 @@ export default {
     rId: function () {
       this.postIdss = ''
       this.postId = ''
+      this.contractUserList = [];//从超级管理员，切到其他角色，不会清空列表
       this.roleList.forEach(val => {
         if (val.id === this.rId) {
           if (val.children) {

src/views/manager/projectinfo/tree.vue

@@ -183,7 +183,7 @@
           </el-table>
           <p>
             <span>当前项目信息表</span>
-            <el-button
+            <!-- <el-button
               @click="showFormElement"
               type="text"
               icon="el-icon-circle-plus-outline"
@@ -193,7 +193,7 @@
               type="text"
               icon="el-icon-document-copy"
               class="text-icon"
-            ></el-button>
+            ></el-button> -->
             <i
               class="el-icon-edit-outline marleft10"
               size="26"
@@ -588,6 +588,7 @@
         <el-button
           type="primary"
           @click="saveNode"
+          :loading="saveNodeLoading"
         >确 定</el-button>
       </span>
     </el-dialog>
@@ -1406,6 +1407,7 @@ export default {
       editType: 1,
 
       dialogVisible: false,
+      saveNodeLoading:false,
       deptCategorylist: [],
       majorDataTypeList: [],
       rules: {
@@ -1531,6 +1533,7 @@ export default {
       });
     },
     addNode () {
+      this.saveNodeLoading = true;
       update(this.nodeDetail).then(() => {
         this.updateTreeNewNode();
         this.dialogVisible = false;
@@ -1538,6 +1541,9 @@ export default {
           type: "success",
           message: "新增成功!"
         });
+        this.$nextTick(()=>{
+          this.saveNodeLoading = false;
+        })
       })
     },
     updateNode () {

src/views/manager/wbsinfo/edit.vue

@@ -601,6 +601,7 @@
         <el-button
           type="primary"
           @click="saveNode"
+          :loading="saveNodeLoading"
         >确 定</el-button>
       </span>
     </el-dialog>
@@ -1454,6 +1455,7 @@ export default {
       editType: 1,
 
       dialogVisible: false,
+      saveNodeLoading:false,
       deptCategorylist: [],
       majorDataTypeList: [],
       rules: {
@@ -1663,6 +1665,7 @@ export default {
       });
     },
     addNode () {
+      this.saveNodeLoading = true;
       update(this.nodeDetail).then(() => {
         this.updateTreeNewNode();
         this.dialogVisible = false;
@@ -1670,6 +1673,9 @@ export default {
           type: "success",
           message: "新增成功!"
         });
+        this.$nextTick(()=>{
+          this.saveNodeLoading = false;
+        })
       })
     },
     updateNode () {