Merge branch 'dev-身份验证1114'

src/views/modules/base/organization/organization.vue

@@ -126,7 +126,16 @@
               height="350">
       <el-table-column prop="name"
                        label="本级工作人员名字"
-                       width="260"></el-table-column>
+                       width="260">
+        <template slot-scope="scope">
+          <span>{{scope.row.name}}</span>
+          <el-tag v-if="scope.row.enableFlag==='disabled'"
+                  type="danger"
+                  style="margin-left:10px"
+                  size="mini"
+                  disable-transitions>{{ '已禁用' }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column prop="roles"
                        label="本级工作人员职责"
                        width="260">
@@ -161,10 +170,16 @@
                      type="info"
                      icon="el-icon-rank"
                      @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
+          <el-button v-if="scope.row.enableFlag==='enable'"
+                     size="mini"
                      type="danger"
                      icon="el-icon-circle-close"
                      @click="DisablePeo(scope.row)">禁用</el-button>
+          <el-button v-if="scope.row.enableFlag==='disabled'"
+                     size="mini"
+                     type="danger"
+                     icon="el-icon-circle-close"
+                     @click="enablestaff(scope.row)">解禁</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -177,6 +192,7 @@
       <el-table-column prop="name"
                        label="下级机关单位/基层科室工作人员"
                        width="260"></el-table-column>
+
       <el-table-column prop="roles"
                        label="下级机关单位/基层科室工作人员职责"
                        width="260">
@@ -1894,6 +1910,47 @@ export default {
       this.DisableForm.staffId = row.staffId;
       this.Disable = true;
     },
+    enablestaff (row) {
+      this.$confirm("确认解禁该员工?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.submitEnable(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+
+        });
+    },
+    // 确定解禁
+    async submitEnable (row) {
+      const url = "/epmetuser/customerstaff/enablestaff";
+
+      let params = {
+        staffId: row.staffId,
+
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message.success("解禁成功");
+        this.Disable = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
+      } else {
+        this.$message.error(msg);
+      }
+    },
     // 确定禁用
     async submitDisable () {
       const url = "/epmetuser/customerstaff/disabledstaff";