From d67c4733ba43f8431fe04708ac68156cf34e5433 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 09:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/.vscode/settings.json          |   2 +-
 .../src/views/modules/yantai/certify.vue      |  21 +-
 .../src/views/modules/yantai/detailForm.vue   | 206 ++++++++++++++++++
 .../src/views/modules/yantai/editForm.vue     |  70 +++---
 4 files changed, 251 insertions(+), 48 deletions(-)
 create mode 100644 epmet-oper-web/src/views/modules/yantai/detailForm.vue

diff --git a/epmet-oper-web/.vscode/settings.json b/epmet-oper-web/.vscode/settings.json
index f14aa03..2eab4ad 100644
--- a/epmet-oper-web/.vscode/settings.json
+++ b/epmet-oper-web/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "workbench.colorTheme": "One Monokai",
-  "window.zoomLevel": 2,
+  "window.zoomLevel": 1,
   "terminal.integrated.fontWeightBold": "normal",
   "workbench.iconTheme": "material-icon-theme",
   // vscode默认启用了根据文件类型自动设置tabsize的选项
diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index 5bb756d..4c2dbbb 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -152,12 +152,21 @@
                  @dialogOk="dialogOk"
                  @dialogCancle="dialogCancle"></edit-form>
     </el-dialog>
+    <el-dialog v-if="showDetail"
+               title="修改"
+               :visible.sync="showDetail"
+               width="850"
+               :before-close="dialogCancle">
+      <detail-form ref="ref_detail"
+                   @dialogCancle="dialogCancle"></detail-form>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
 import editForm from './editForm'
+import detailForm from './detailForm'
 // import FootbarList from '../../productConfig/footbar/FootbarList'
 import { requestPost, requestGet } from "@/js/dai/request";
 export default {
@@ -201,11 +210,14 @@ export default {
       },
 
       showEdit: false,
+      showDetail: false,
+
 
     }
   },
   components: {
-    editForm
+    editForm,
+    detailForm
   },
   activated () {
     this.$nextTick(() => {
@@ -290,6 +302,7 @@ export default {
     },
     dialogCancle () {
       this.showEdit = false
+      this.showDetail = false
     },
     dialogOk () {
       this.showEdit = false
@@ -298,8 +311,12 @@ export default {
 
     // 功能配置
     handleDetail (row) {
+      this.showDetail = true
+      this.$nextTick(() => {
+
+        this.$refs.ref_detail.initForm(row.staffId, row.customerId);
+      });
 
-      this.$refs['ref_config_item'].initData(editType, row.staffId, row.customerId)
     },
 
     handleReset () {
diff --git a/epmet-oper-web/src/views/modules/yantai/detailForm.vue b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
new file mode 100644
index 0000000..9df5f82
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <el-form :model="peoForm"
+             label-width="120px"
+             ref="editPeoForm">
+      <el-form-item label="姓名："
+                    prop="name">
+        <span>{{peoForm.name}}</span>
+
+      </el-form-item>
+      <el-form-item label="手机号："
+                    prop="mobile">
+        <span>{{peoForm.mobile}}</span>
+
+      </el-form-item>
+      <el-form-item label="性别："
+                    prop="gender">
+
+        <span v-if="peoForm.gender==='0'">{{'未知'}}</span>
+        <span v-if="peoForm.gender==='1'">{{'男'}}</span>
+        <span v-if="peoForm.gender==='2'">{{'女'}}</span>
+      </el-form-item>
+      <el-form-item label="专兼职："
+                    prop="workType">
+
+        <span v-if="peoForm.workType==='fulltime'">{{'专职'}}</span>
+        <span v-if="peoForm.workType==='parttime'">{{'兼职'}}</span>
+
+      </el-form-item>
+      <el-form-item label="组织/部门："
+                    prop="orgName">
+
+        <span>{{peoForm.orgName||'--'}}</span>
+      </el-form-item>
+      <el-form-item label="激活时间："
+                    prop="activeTime">
+
+        <span>{{peoForm.activeTime||'--'}}</span>
+      </el-form-item>
+      <el-form-item label="是否禁用："
+                    prop="disableFlag">
+
+        <span>{{peoForm.disableFlag||'--'}}</span>
+      </el-form-item>
+      <el-form-item label="职责："
+                    prop="roles">
+        <span>{{peoForm.rolesShow}}</span>
+      </el-form-item>
+
+      <el-form-item label="角色："
+                    prop="newRoles">
+        <span>{{peoForm.szsqRolesShow}}</span>
+      </el-form-item>
+    </el-form>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleClose">关 闭</el-button>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+// import ConfigItem from './ConfigItem'
+// import FootbarList from '../../productConfig/footbar/FootbarList'
+import { requestPost, requestGet } from "@/js/dai/request";
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      staffId: '',
+      customerId: '',
+      agencyId: '',
+
+
+
+      peoForm: {
+        name: "",
+        mobile: "",
+        gender: "",
+        orgId: '',
+        orgType: "",
+        orgName: "",
+        activeTime: "",
+        workType: "",
+        roles: [],
+        newRoles: [],
+      },
+
+    }
+  },
+  components: {
+
+  },
+
+  async mounted () {
+
+
+  },
+  methods: {
+    async initForm (staffId, customerId) {
+      this.startLoading()
+
+      this.staffId = staffId
+      this.customerId = customerId
+
+      await this.lookAngency()
+
+      this.endLoading()
+
+    },
+
+
+    // 查看按钮
+    async lookAngency () {
+      const url = "/data/aggregator/org/staffdetailv2";
+
+      let params = {
+        staffId: this.staffId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.peoForm = data;
+
+        if (data.enableFlag === "enable") {
+          this.peoForm.disableFlag = "已启用";
+        } else {
+          this.peoForm.disableFlag = "已禁用";
+        }
+
+        if (this.peoForm.roles && this.peoForm.roles.length > 0) {
+          this.peoForm.rolesShow = this.peoForm.roles.join(',')
+        } else {
+          this.peoForm.rolesShow = '--'
+        }
+        if (this.peoForm.szsqRoles && this.peoForm.szsqRoles.length > 0) {
+          this.peoForm.szsqRolesShow = this.peoForm.szsqRoles.join(',')
+        } else {
+          this.peoForm.szsqRolesShow = '--'
+        }
+      }
+
+    },
+
+
+    resetForm () {
+      this.peoForm = {
+        name: "",
+        mobile: "",
+        gender: "",
+        orgId: '',
+        orgType: "",
+        orgName: "",
+        workType: "",
+        roles: [],
+        newRoles: [],
+      }
+    },
+    handleClose () {
+      this.resetForm()
+      this.$emit("dialogCancle")
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  },
+  computed: {
+
+  },
+}
+</script>
+
+<style scoped>
+.item-width-1 {
+  width: 200px;
+}
+.item-width-2 {
+  width: 400px;
+}
+.div-btn {
+  margin-top: 20px;
+  display: flex;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index f306c3e..d9a4ac5 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -21,18 +21,6 @@
         <span v-if="peoForm.gender===1">{{'男'}}</span>
         <span v-if="peoForm.gender===2">{{'女'}}</span>
       </el-form-item>
-      <el-form-item label="专兼职"
-                    prop="workType">
-        <el-select v-model="peoForm.workType"
-                   clearable
-                   placeholder="专兼职">
-          <el-option v-for="item in postList"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="组织/部门"
                     prop="orgId">
         <el-cascader v-if="formType==='add'"
@@ -46,11 +34,25 @@
                      clearable></el-cascader>
         <span v-if="formType==='edit'">{{peoForm.orgName||'--'}}</span>
       </el-form-item>
+      <el-form-item label="专兼职"
+                    prop="workType">
+        <el-select v-model="peoForm.workType"
+                   clearable
+                   placeholder="专兼职">
+          <el-option v-for="item in postList"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="职责"
                     prop="roles">
         <el-select v-model="peoForm.roles"
                    class="item-width-2"
                    multiple
+                   @change="$forceUpdate()"
                    placeholder="请选择">
           <el-option v-for="item in dutyList"
                      :key="item.roleId"
@@ -65,6 +67,7 @@
         <el-select v-model="peoForm.newRoles"
                    class="item-width-2"
                    multiple
+                   @change="$forceUpdate()"
                    placeholder="请选择">
           <el-option v-for="item in roleList"
                      :key="item.id"
@@ -187,8 +190,8 @@ export default {
     // 添加人员
     async submitPeoDo () {
       const url = "/gov/org/staff/addstaffv2";
-      console.log(this.peoForm)
-      return false
+      // console.log('this.peoForm', this.peoForm)
+      // return false
       const { data, code, msg } = await requestPost(url, this.peoForm);
 
       if (code === 0) {
@@ -213,13 +216,13 @@ export default {
         ...this.peoForm
       };
 
-      console.log(params)
-      return false
+      // console.log('params', params)
+      // return false
 
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("修改成功");
+        this.$message.success("操作成功");
 
 
 
@@ -228,33 +231,9 @@ export default {
       }
     },
 
-    // 查看按钮
-    async lookAngency () {
-      const url = "/data/aggregator/org/staffdetailv2";
-
-      let params = {
-        staffId: this.staffId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
 
-      if (code === 0) {
-        this.peoForm.name = data.name;
-        this.peoForm.mobile =
-          data.mobile.substr(0, 3) + "****" + data.mobile.substr(7);
-        this.peoForm.activeTime = data.activeTime;
-        this.peoForm.roles = data.roles;
-        this.peoForm.orgName = data.orgName;
-        if (data.enableFlag === "enable") {
-          this.peoForm.disableFlag = "已启用";
-        } else {
-          this.peoForm.disableFlag = "已禁用";
-        }
-      }
-      this.details = true;
-    },
 
-    // 修改网格人员
+    // 修改网格人员初始化
     async xiuGridPeo () {
 
       this.peoForm.orgType = "grid";
@@ -270,13 +249,14 @@ export default {
         this.peoForm = { ...data };
 
         // 已有的权限（职责）
-        let existedDutyArr = [];
+        this.peoForm.roles = [];
         data.roleList.forEach(function (sysDuty) {
           if (sysDuty.selected === true) {
+            this.peoForm.roles.push(sysDuty.roleId)
             existedDutyArr.push(sysDuty.roleId);
           }
         });
-        this.peoForm.roles = existedDutyArr;
+        // this.peoForm.roles = [...existedDutyArr];
         // 已有的权限（角色）
         let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
@@ -389,7 +369,7 @@ export default {
         // mobile: [{ required: true, message: "手机号必填", trigger: "change" }],
         // gender: [{ required: true, message: "性别必填", trigger: "change" }],
         // gender: [{ required: true, message: "性别必填", trigger: "change" }],
-        orgId: [{ required: true, message: "组织/部门必填", trigger: "change" }],
+        // orgId: [{ required: true, message: "组织/部门必填", trigger: "change" }],
         workType: [{ required: true, message: "专兼职必填", trigger: "change" }],
         roles: [{ required: true, message: "职责必填", trigger: "change" }],
         newRoles: [{ required: true, message: "角色必填", trigger: "change" }],