提交

src/views/permission/xlwjfflxr/index.vue

@@ -93,23 +93,26 @@
                     </el-table-column>-->
           <el-table-column label="操作" width="150">
             <template slot-scope="scope" v-if="!scope.row.isAdministrator">
-              <tableOpts @edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)">
-                <!--                <el-dropdown hide-on-click>
-                                   <span class="el-dropdown-link">
-                                    <el-button size="mini" type="text">
-                                      {{$t('common.moreBtn')}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
-                                    </el-button>
-                                  </span>
-                                   <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item
-                                      @click.native="handleResetPwd(scope.row.id, scope.row.account)">
-                                      {{$t('user.resetPassword')}}
-                                    </el-dropdown-item>
-                                    <el-dropdown-item @click.native="unlockUser(scope.row.id)"
-                                      v-if="scope.row.enabledMark == 2">解除锁定</el-dropdown-item>
-                                  </el-dropdown-menu>
-                                </el-dropdown>-->
-              </tableOpts>
+              <el-button type="text"  @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
+              <el-button type="text" style="color:red;" v-if="account!=scope.row.mobilePhone" @click="handleDel(scope.row.id)">删除</el-button>
+
+              <!--              <tableOpts @edit="addOrUpdateHandle(scope.row.id)" @del="handleDel(scope.row.id)">-->
+              <!--                <el-dropdown hide-on-click>
+                                 <span class="el-dropdown-link">
+                                  <el-button size="mini" type="text">
+                                    {{$t('common.moreBtn')}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
+                                  </el-button>
+                                </span>
+                                 <el-dropdown-menu slot="dropdown">
+                                  <el-dropdown-item
+                                    @click.native="handleResetPwd(scope.row.id, scope.row.account)">
+                                    {{$t('user.resetPassword')}}
+                                  </el-dropdown-item>
+                                  <el-dropdown-item @click.native="unlockUser(scope.row.id)"
+                                    v-if="scope.row.enabledMark == 2">解除锁定</el-dropdown-item>
+                                </el-dropdown-menu>
+                              </el-dropdown>-->
+              <!--              </tableOpts>-->
             </template>
           </el-table-column>
         </JNPF-table>
@@ -174,6 +177,7 @@ export default {
 
   data() {
     return {
+      account:'',
       editdialogVisible:false,
       deletedialogVisible:false,
       keysInfo:[],
@@ -219,6 +223,7 @@ export default {
     }
   },
   mounted() {
+    this.account=this.$store.state.user.userInfo.userAccount
     this.getOrganizeList(true)
   },
   methods: {
@@ -290,27 +295,26 @@ export default {
       this.organizeId=this.$store.state.user.userInfo.organizeId;
       if(this.organizeId=='96240625-934F-490B-8AA6-0BC775B18468'){
         getOrganizeList().then(res => {
-
-          this.$nextTick(() => {
-            let topItem = {
-              fullName: "全部",
-              hasChildren: true,
-              id: "",
-              children: res.data.list
-            }
-            this.treeData =[topItem]
-            if (!this.treeData.length) {
-              this.treeLoading = false
-              this.listLoading = false
-              return
-            }
-            if (isInit) this.listQuery.organizeId= this.treeData[0].id
-            this.$refs.treeBox.setCurrentKey(this.treeData[0].id)
+          let topItem = {
+            fullName: "全部",
+            hasChildren: true,
+            id: "",
+            children: res.data.list
+          }
+          this.treeData =[topItem]
+          if (!this.treeData.length) {
             this.treeLoading = false
-            if (isInit) this.initData()
-            this.getcommontree()
-
+            this.listLoading = false
+            return
+          }
+          this.listQuery.organizeId= this.treeData[0].id
+          this.$nextTick(()=>{
+            this.$refs.treeBox.setCurrentKey(this.treeData[0].id)
           })
+          this.$refs.treeBox.setCurrentKey(this.treeData[0].id)
+          this.treeLoading = false
+          this.initData()
+          this.getcommontree()
         }).catch(() => {
           this.treeLoading = false
         })
@@ -364,11 +368,7 @@ export default {
     },
     getcommontree(){
       this.treeData.map(firstLevel => {
-        if (firstLevel.children) {
-          firstLevel.children.forEach(secondLevel => {
-            this.expandedKeys.push(secondLevel.id);
-          });
-        }
+        this.expandedKeys.push(firstLevel.id);
       });
     },
     personFormatter(row){