Merge branch 'master' into test-dev

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -116,7 +116,7 @@
             <tr>
               <th >元素位置</th>
               <th>签字岗位</th>
-              <th>是否引用系统级电签</th>
+              <th>电签来源</th>
               <th>签字时间元素位置</th>
               <th >偏移x</th>
               <th>偏移y</th>
@@ -128,8 +128,10 @@
               <td>{{ item.colName }}</td>
               <td>{{ item.sigRoleName }}</td>
               <td align="center">
-                  <i class="el-icon-success" style="font-size: 20px;color:#67C23A" v-if="item.isSystem==1"></i>
-                  <i class="el-icon-error" style="font-size: 20px;color:red" v-else></i>
+            
+                    <el-tag type="success"  v-if="item.isSystem==1">电签角色库</el-tag>
+                    <el-tag type="info" v-if="item.isSystem==2">项目匹配</el-tag>
+                    <el-tag type="warning"  v-if="item.isSystem==0">本表配置</el-tag>
               </td>
               <td>{{ item.timeName }}</td>
               <td>{{ item.pyzbx }}</td>

src/views/manager/wbsinfo/edit.vue

@@ -1211,7 +1211,7 @@
           <i
             class="el-icon-refresh-right marbottom10"
             @click="refreshnfoTable()"
-            style="font-size: 24px; color: rgb(37, 193, 99); cursor: pointer"
+            style="font-size: 24px; color: rgb(37, 193, 99); cursor: pointer" v-loading="nodeInfoTableLoad"
           ></i>
         </div>
         <el-table :data="nodeInfoTable" border style="width: 100%" height="400">
@@ -1550,6 +1550,8 @@ export default {
 
     return {
       loding: false,
+      nodeInfoTableLoad: false,
+
       formDatass: [],
       editElementFormTag: false,
       ImportElementdata: {},
@@ -2757,8 +2759,13 @@ export default {
         nodeId: this.jiedianId,
         type: 0,
       };
+      this.nodeInfoTableLoad = true;
       refrehPram(prams).then((res) => {
         console.log(res);
+         if (res.data.code == 200) {
+           this.nodeInfoTableLoad = false;
+          this.$message.success("刷新成功");
+        }
       });
     },
     delNodeInfo(key, obj) {

src/views/system/user.vue

@@ -583,6 +583,12 @@ export default {
             prop: "userTypeName",
             slot: true,
             display: false
+          },
+            {
+            label: "密码",
+            prop: "plaintextPassword",
+            slot: true,
+            display: false
           },
           {
             label: "用户平台",