From 155b31ab35fcf0de95e67adcc478a3b773b9e760 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 18 Oct 2022 17:40:28 +0800
Subject: [PATCH 01/10] =?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

---
 .../src/views/modules/yantai/certify.vue      | 349 +++++++++++++++
 .../src/views/modules/yantai/editForm.vue     | 414 ++++++++++++++++++
 2 files changed, 763 insertions(+)
 create mode 100644 epmet-oper-web/src/views/modules/yantai/certify.vue
 create mode 100644 epmet-oper-web/src/views/modules/yantai/editForm.vue

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
new file mode 100644
index 0000000..5bb756d
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -0,0 +1,349 @@
+<template>
+  <div>
+    <el-card shadow="never"
+             class="aui-card--fill">
+      <div class="mod-/oper/customize__homecomponent}">
+        <el-form :inline="true">
+          <el-form-item label="统计类型"
+                        prop="name"
+                        label-width="90px">
+            <el-radio-group v-model="formData.type">
+              <el-radio label="0">本级工作人员</el-radio>
+              <el-radio label="1">本级及下级工作人员</el-radio>
+
+            </el-radio-group>
+
+          </el-form-item>
+          <el-form-item label="组织"
+                        prop="name"
+                        label-width="90px">
+            <el-cascader ref="myCascader"
+                         v-model="agencyIdArray"
+                         style="width:540px"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         @change="handleChange"
+                         clearable></el-cascader>
+
+          </el-form-item>
+
+          <div>
+            <el-form-item label="姓名"
+                          prop="name"
+                          label-width="90px">
+              <el-input v-model="formData.name"
+                        style="width:290px"
+                        placeholder="请输入姓名"
+                        :clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item label="手机号"
+                          prop="mobile"
+                          label-width="90px">
+              <el-input v-model="formData.mobile"
+                        style="width:290px"
+                        placeholder="请输入手机号"
+                        :clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item label="状态"
+                          prop="status"
+                          label-width="90px">
+              <el-select v-model="formData.status"
+                         style="width:290px"
+                         placeholder="选择状态"
+                         clearable>
+                <el-option v-for="item in statusList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary"
+                         style="margin-left:20px"
+                         size="small"
+                         @click="handleSearch()">查询</el-button>
+              <el-button style="margin-left:20px"
+                         size="small"
+                         @click="handleReset()">重置</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+
+        <el-table :data="tableData"
+                  ref="ref_customertable"
+                  border
+                  style="width: 100%;">
+          <el-table-column label="所属组织"
+                           header-align="center"
+                           align="center"
+                           prop="orgName"></el-table-column>
+          <el-table-column label="姓名"
+                           header-align="center"
+                           align="center"
+                           width="120"
+                           prop="userName"></el-table-column>
+          <el-table-column label="手机号"
+                           header-align="center"
+                           align="center"
+                           width="120"
+                           prop="telephoneNumber"></el-table-column>
+          <el-table-column label="性别"
+                           header-align="center"
+                           align="center"
+                           width="80"
+                           prop="gender">
+            <template slot-scope="scope">
+              <span v-if="scope.row.gender==='0'">{{'未知'}}</span>
+              <span v-if="scope.row.gender==='1'">{{'男'}}</span>
+              <span v-if="scope.row.gender==='2'">{{'女'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态"
+                           header-align="center"
+                           align="center"
+                           width="80"
+                           prop="status">
+            <template slot-scope="scope">
+              <span v-if="scope.row.status==='0'">{{'未创建'}}</span>
+              <span v-if="scope.row.status==='1'">{{'已创建'}}</span>
+
+            </template>
+          </el-table-column>
+          <el-table-column label="备注"
+                           header-align="center"
+                           align="center"
+                           prop="remark"></el-table-column>
+
+          <el-table-column :label="$t('handle')"
+                           fixed="right"
+                           header-align="center"
+                           align="center"
+                           width="200">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         size="small"
+                         @click="handleEdit(scope.row)">修改</el-button>
+              <el-button type="text"
+                         size="small"
+                         @click="handleDetail(scope.row)">查看</el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination :current-page="pageNo"
+                       :page-sizes="[10, 20, 50, 100]"
+                       :page-size="pageSize"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       :total="total"
+                       @size-change="pageSizeChangeHandle"
+                       @current-change="pageCurrentChangeHandle"></el-pagination>
+      </div>
+
+    </el-card>
+
+    <el-dialog v-if="showEdit"
+               title="修改"
+               :visible.sync="showEdit"
+               width="850"
+               :before-close="dialogCancle">
+      <edit-form ref="ref_edit"
+                 @dialogOk="dialogOk"
+                 @dialogCancle="dialogCancle"></edit-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import editForm from './editForm'
+// import FootbarList from '../../productConfig/footbar/FootbarList'
+import { requestPost, requestGet } from "@/js/dai/request";
+export default {
+  data () {
+    return {
+      tableData: [],
+      statusList: [
+        {
+          value: '0',
+          label: '未创建'
+        },
+        {
+          value: '1',
+          label: '已创建'
+        }
+      ],
+      selOrgId: '',
+      casOptions: [],
+      agencyIdArray: [],
+      iscascaderShow: 0,
+      optionProps: {
+        multiple: false,
+        // value: 'orgId',
+        // label: 'orgName',
+        // children: 'subAgencyList',
+        checkStrictly: true,
+
+        lazy: true,
+        lazyLoad: this.lzayLoadAgency
+      },
+
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      formData: {
+        name: '',
+        status: '',
+        mobile: '',
+        type: '0',
+        orgId: ''
+      },
+
+      showEdit: false,
+
+    }
+  },
+  components: {
+    editForm
+  },
+  activated () {
+    this.$nextTick(() => {
+      this.$refs['ref_customertable'].doLayout() // 解决表格错位
+    })
+
+  },
+  async mounted () {
+
+    await this.loadTable()
+
+  },
+  methods: {
+
+    lzayLoadAgency (node, resolve) {
+      this.getAgency(node, resolve)
+      // setTimeout(() => {
+      //   this.getAgency(node, resolve)
+      // }, 200)
+    },
+    async getAgency (node, resolve) {
+
+      const url = '/third/dataSync/ytorglist'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/third/dataSync/ytorglist'
+
+      let params = {
+        orgId: node.data ? node.data.value : '0',
+
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.orgId, //
+          label: item.orgName,
+          // leaf: node.level >= 2 // 5层级
+          leaf: !item.haveChild // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleChange (value) {
+      console.log(value)
+      this.formData.orgId = value[0]
+    },
+
+    async loadTable () {
+
+      const url = "/third/dataSync/page-user"
+      // const url = "http://yapi.elinkservice.cn/mock/102/third/dataSync/page-user"
+      const params = {
+
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.formData
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.tableData = data.list
+        this.total = data.total
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    handleSearch () {
+      this.loadTable()
+    },
+    async handleEdit (row) {
+
+      this.showEdit = true
+      this.$nextTick(() => {
+        let editType = row.status === '0' ? 'add' : 'edit'
+        this.$refs.ref_edit.initForm(editType, row.staffId, row.customerId);
+      });
+    },
+    dialogCancle () {
+      this.showEdit = false
+    },
+    dialogOk () {
+      this.showEdit = false
+      this.loadTable()
+    },
+
+    // 功能配置
+    handleDetail (row) {
+
+      this.$refs['ref_config_item'].initData(editType, row.staffId, row.customerId)
+    },
+
+    handleReset () {
+      this.agencyIdArray = []
+      this.formData = {
+        name: '',
+        status: '',
+        mobile: '',
+        type: '0',
+        orgId: ''
+      }
+
+    },
+
+    pageCurrentChangeHandle (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+    pageSizeChangeHandle (val) {
+      this.pageSize = val
+      this.loadTable()
+    },
+
+  },
+  computed: {
+    rulesPeo () {
+      return {
+        name: [{ required: true, message: "姓名必填", trigger: "blur" }],
+        mobile: [{ required: true, message: "手机号必填", trigger: "blur" }],
+        gender: [{ required: true, message: "性别必填", trigger: "blur" }],
+        zuzhi: [{ required: true, message: "专兼职必填", trigger: "blur" }],
+
+        newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
+      }
+    },
+  },
+}
+</script>
+
+<style scoped>
+.item-width-1 {
+  width: 200px;
+}
+.item-width-2 {
+  width: 400px;
+}
+</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
new file mode 100644
index 0000000..f306c3e
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -0,0 +1,414 @@
+<template>
+  <div>
+    <el-form :model="peoForm"
+             label-width="120px"
+             ref="editPeoForm"
+             :rules="rulesPeo">
+      <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">
+        <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'"
+                     ref="myCascader"
+                     v-model="agencyIdArray"
+                     class="item-width-2"
+                     :key="iscascaderShow"
+                     :options="casOptions"
+                     :props="optionProps"
+                     @change="handleChangeAgency"
+                     clearable></el-cascader>
+        <span v-if="formType==='edit'">{{peoForm.orgName||'--'}}</span>
+      </el-form-item>
+      <el-form-item label="职责"
+                    prop="roles">
+        <el-select v-model="peoForm.roles"
+                   class="item-width-2"
+                   multiple
+                   placeholder="请选择">
+          <el-option v-for="item in dutyList"
+                     :key="item.roleId"
+                     :label="item.roleName"
+                     :value="item.roleId"
+                     :disabled="item.disabled">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="角色"
+                    prop="newRoles">
+        <el-select v-model="peoForm.newRoles"
+                   class="item-width-2"
+                   multiple
+                   placeholder="请选择">
+          <el-option v-for="item in roleList"
+                     :key="item.id"
+                     :label="item.name"
+                     :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleClose">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 @click="handleConfirm">确 定</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 {
+      formType: 'add',
+      staffId: '',
+      customerId: '',
+      agencyId: '',
+
+      agencyIdArray: [],
+      casOptions: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+
+      peoForm: {
+        name: "",
+        mobile: "",
+        gender: "",
+        orgId: '',
+        orgType: "",
+        orgName: "",
+        workType: "",
+        roles: [],
+        newRoles: [],
+      },
+      // 职责字典
+      dutyList: [],
+      // 专兼职字典
+      postList: [
+        { value: "fulltime", label: "专职" },
+        { value: "parttime", label: "兼职" },
+      ],
+      genderList: [
+        { value: 1, label: "男" },
+        { value: 2, label: "女" },
+        { value: 0, label: "未知" },
+      ],
+      editAgencyIdArray: [],
+      roleList: [],
+    }
+  },
+  components: {
+
+  },
+
+  async mounted () {
+
+
+  },
+  methods: {
+    async initForm (formType, staffId, customerId) {
+      this.startLoading()
+      this.formType = formType
+      this.staffId = staffId
+      this.customerId = customerId
+      this.getDutyList()
+      this.getRoleList()
+      if (formType === 'edit' || formType === 'add') {
+        await this.xiuGridPeo()
+      }
+
+      if (formType === 'add') {
+        await this.getAgencyList()
+      }
+
+      this.endLoading()
+
+    },
+
+    handleChangeAgency (value) {
+      let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.peoForm.orgName = selAgency.agencyName
+      this.peoForm.orgType = selAgency.level
+      this.peoForm.orgId = selAgency.agencyId
+
+
+    },
+
+    handleConfirm () {
+      if (this.formType === 'add') {
+        this.submitPeoDo()
+      } else if (this.formType === 'edit') {
+        this.updatePeoDo()
+      }
+    },
+
+    // 添加人员
+    async submitPeoDo () {
+      const url = "/gov/org/staff/addstaffv2";
+      console.log(this.peoForm)
+      return false
+      const { data, code, msg } = await requestPost(url, this.peoForm);
+
+      if (code === 0) {
+        this.$message.success("操作成功");
+
+        this.peoForm = [];
+
+        this.dialogOk()
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    // 人员修改
+    async updatePeoDo () {
+      const url = "/gov/org/staff/editstaff";
+
+      let params = {
+        staffId: this.staffId,
+        agencyId: this.agencyId,
+        customerId: this.customerId,
+        ...this.peoForm
+      };
+
+      console.log(params)
+      return false
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message.success("修改成功");
+
+
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    // 查看按钮
+    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";
+
+      const url = "/gov/org/staff/editstaffinit";
+      let params = {
+        staffId: this.staffId,
+        customerId: this.customerId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.agencyId = data.agencyId
+        this.peoForm = { ...data };
+
+        // 已有的权限（职责）
+        let existedDutyArr = [];
+        data.roleList.forEach(function (sysDuty) {
+          if (sysDuty.selected === true) {
+            existedDutyArr.push(sysDuty.roleId);
+          }
+        });
+        this.peoForm.roles = existedDutyArr;
+        // 已有的权限（角色）
+        let existedRoleArr = [];
+        data.newRoleList.forEach(function (sysRole) {
+          if (sysRole.selected === true) {
+            existedRoleArr.push(sysRole.roleId);
+          }
+        });
+        this.peoForm.newRoles = existedRoleArr;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getAgencyList () {
+      const url = '/gov/org/customeragency/agencylist'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
+
+      const params = {
+        customerId: this.customerId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          this.casOptions.push(data)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    /** 查询系统工作人员角色（职责） */
+    async getDutyList () {
+      const url = "/gov/org/staff/rolelist";
+      let params = {
+        customerId: this.customerId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.dutyList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    /** 查询系统工作人员角色（职责） */
+    async getRoleList () {
+      this.tableLoading = true;
+
+      const url = "/gov/access/govrole/list";
+
+      let params = {};
+
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        this.roleList = data;
+      } else {
+        this.$message.error(msg);
+      }
+      this.tableLoading = false;
+    },
+
+    resetForm () {
+      this.peoForm = {
+        name: "",
+        mobile: "",
+        gender: "",
+        orgId: '',
+        orgType: "",
+        orgName: "",
+        workType: "",
+        roles: [],
+        newRoles: [],
+      }
+    },
+    handleClose () {
+      this.resetForm()
+      this.$emit("dialogCancle")
+    },
+    dialogOk () {
+      this.resetForm()
+      this.$emit("dialogOk")
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+
+  },
+  computed: {
+    rulesPeo () {
+      return {
+        // name: [{ required: true, message: "姓名必填", trigger: "change" }],
+        // mobile: [{ required: true, message: "手机号必填", trigger: "change" }],
+        // gender: [{ required: true, message: "性别必填", trigger: "change" }],
+        // gender: [{ 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" }],
+      }
+    },
+  },
+}
+</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

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 02/10] =?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" }],

From af6fd8b76b011d79948a1579982a3a32f1a4ca48 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 13:40:59 +0800
Subject: [PATCH 03/10] =?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

---
 .../src/views/modules/yantai/certify.vue      |  3 ++-
 .../src/views/modules/yantai/detailForm.vue   |  4 +--
 .../src/views/modules/yantai/editForm.vue     | 25 ++++++++++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index 4c2dbbb..d9f570c 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -153,7 +153,7 @@
                  @dialogCancle="dialogCancle"></edit-form>
     </el-dialog>
     <el-dialog v-if="showDetail"
-               title="修改"
+               title="详情"
                :visible.sync="showDetail"
                width="850"
                :before-close="dialogCancle">
@@ -305,6 +305,7 @@ export default {
       this.showDetail = false
     },
     dialogOk () {
+      debugger
       this.showEdit = false
       this.loadTable()
     },
diff --git a/epmet-oper-web/src/views/modules/yantai/detailForm.vue b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
index 9df5f82..48fed25 100644
--- a/epmet-oper-web/src/views/modules/yantai/detailForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
@@ -135,12 +135,12 @@ export default {
         }
 
         if (this.peoForm.roles && this.peoForm.roles.length > 0) {
-          this.peoForm.rolesShow = this.peoForm.roles.join(',')
+          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(',')
+          this.peoForm.szsqRolesShow = this.peoForm.szsqRoles.join('，')
         } else {
           this.peoForm.szsqRolesShow = '--'
         }
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index d9a4ac5..0b72483 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -32,7 +32,7 @@
                      :props="optionProps"
                      @change="handleChangeAgency"
                      clearable></el-cascader>
-        <span v-if="formType==='edit'">{{peoForm.orgName||'--'}}</span>
+        <span v-if="formType==='edit'">{{peoForm.agencyName||'--'}}</span>
       </el-form-item>
       <el-form-item label="专兼职"
                     prop="workType">
@@ -189,6 +189,14 @@ export default {
 
     // 添加人员
     async submitPeoDo () {
+      if (this.peoForm.roles.length === 0) {
+        this.$message.error("请选择职责");
+        return false
+      }
+      if (this.peoForm.newRoles.length === 0) {
+        this.$message.error("请选择角色");
+        return false
+      }
       const url = "/gov/org/staff/addstaffv2";
       // console.log('this.peoForm', this.peoForm)
       // return false
@@ -207,6 +215,15 @@ export default {
 
     // 人员修改
     async updatePeoDo () {
+
+      if (this.peoForm.roles.length === 0) {
+        this.$message.error("请选择职责");
+        return false
+      }
+      if (this.peoForm.newRoles.length === 0) {
+        this.$message.error("请选择角色");
+        return false
+      }
       const url = "/gov/org/staff/editstaff";
 
       let params = {
@@ -224,7 +241,7 @@ export default {
       if (code === 0) {
         this.$message.success("操作成功");
 
-
+        this.dialogOk()
 
       } else {
         this.$message.error(msg);
@@ -249,14 +266,14 @@ export default {
         this.peoForm = { ...data };
 
         // 已有的权限（职责）
-        this.peoForm.roles = [];
+        let existedDutyArr = [];
         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) {

From aa4ed78fb59dd5fa8c9962effa7b50da513b38ab Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 13:46:21 +0800
Subject: [PATCH 04/10] 11

---
 epmet-oper-web/src/views/modules/yantai/certify.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index d9f570c..5b81d8a 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -266,8 +266,10 @@ export default {
     },
 
     handleChange (value) {
-      console.log(value)
-      this.formData.orgId = value[0]
+
+      let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
+      console.log(selAgency)
+      this.formData.orgId = selAgency.value
     },
 
     async loadTable () {

From 7449f5f5ac058b239fb77bbb10c2ed926cd1c514 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 14:55:08 +0800
Subject: [PATCH 05/10] 11

---
 epmet-oper-web/src/views/modules/yantai/detailForm.vue | 2 +-
 epmet-oper-web/src/views/modules/yantai/editForm.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/detailForm.vue b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
index 48fed25..d7f1a06 100644
--- a/epmet-oper-web/src/views/modules/yantai/detailForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
@@ -35,7 +35,7 @@
       <el-form-item label="激活时间："
                     prop="activeTime">
 
-        <span>{{peoForm.activeTime||'--'}}</span>
+        <span>{{peoForm.activeTime||'未激活'}}</span>
       </el-form-item>
       <el-form-item label="是否禁用："
                     prop="disableFlag">
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index 0b72483..9715c98 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -269,7 +269,7 @@ export default {
         let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
           if (sysDuty.selected === true) {
-            this.peoForm.roles.push(sysDuty.roleId)
+
             existedDutyArr.push(sysDuty.roleId);
           }
         });

From 79aaeb469b8f28eb8267a8f576bb05acd1574ca1 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 15:40:38 +0800
Subject: [PATCH 06/10] 11

---
 .../src/views/modules/yantai/certify.vue      | 16 +++++++++------
 .../src/views/modules/yantai/editForm.vue     | 20 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index 5b81d8a..d69d27f 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -122,9 +122,14 @@
                            align="center"
                            width="200">
             <template slot-scope="scope">
-              <el-button type="text"
+              <el-button v-if="scope.row.status === '0'"
+                         type="text"
+                         size="small"
+                         @click="handleEdit(scope.row,'add')">新增</el-button>
+              <el-button v-if="scope.row.status === '1'"
+                         type="text"
                          size="small"
-                         @click="handleEdit(scope.row)">修改</el-button>
+                         @click="handleEdit(scope.row,'edit')">修改</el-button>
               <el-button type="text"
                          size="small"
                          @click="handleDetail(scope.row)">查看</el-button>
@@ -294,12 +299,11 @@ export default {
     handleSearch () {
       this.loadTable()
     },
-    async handleEdit (row) {
+    async handleEdit (row, editType) {
 
       this.showEdit = true
       this.$nextTick(() => {
-        let editType = row.status === '0' ? 'add' : 'edit'
-        this.$refs.ref_edit.initForm(editType, row.staffId, row.customerId);
+        this.$refs.ref_edit.initForm(editType, row);
       });
     },
     dialogCancle () {
@@ -307,7 +311,7 @@ export default {
       this.showDetail = false
     },
     dialogOk () {
-      debugger
+
       this.showEdit = false
       this.loadTable()
     },
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index 9715c98..30a7d3b 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -17,9 +17,9 @@
       <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>
+        <span v-if="peoForm.gender===0||peoForm.gender==='0'">{{'未知'}}</span>
+        <span v-if="peoForm.gender===1||peoForm.gender==='1'">{{'男'}}</span>
+        <span v-if="peoForm.gender===2||peoForm.gender==='2'">{{'女'}}</span>
       </el-form-item>
       <el-form-item label="组织/部门"
                     prop="orgId">
@@ -151,16 +151,22 @@ export default {
 
   },
   methods: {
-    async initForm (formType, staffId, customerId) {
+    async initForm (formType, row) {
       this.startLoading()
       this.formType = formType
-      this.staffId = staffId
-      this.customerId = customerId
+      this.customerId = row.customerId
       this.getDutyList()
       this.getRoleList()
-      if (formType === 'edit' || formType === 'add') {
+
+      if (formType === 'edit') {
+        this.staffId = row.staffId
         await this.xiuGridPeo()
       }
+      if (formType === 'add') {
+        this.peoForm.name = row.userName
+        this.peoForm.mobile = row.telephoneNumber
+        this.peoForm.gender = row.gender
+      }
 
       if (formType === 'add') {
         await this.getAgencyList()

From 85d7ea9fdb9ce769579cd62067a4350b446ef992 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 19 Oct 2022 16:10:39 +0800
Subject: [PATCH 07/10] 11

---
 epmet-oper-web/src/views/modules/yantai/editForm.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index 30a7d3b..6a6244f 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -206,7 +206,12 @@ export default {
       const url = "/gov/org/staff/addstaffv2";
       // console.log('this.peoForm', this.peoForm)
       // return false
-      const { data, code, msg } = await requestPost(url, this.peoForm);
+      let params = {
+        customerId: this.customerId,
+        ...this.peoForm
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.$message.success("操作成功");

From 9d38173655d506cb365d233125174b2847c0e589 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Oct 2022 08:54:05 +0800
Subject: [PATCH 08/10] 11

---
 .../src/views/modules/yantai/certify.vue          | 10 +++++++---
 .../src/views/modules/yantai/editForm.vue         | 15 +++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index d69d27f..1fc8274 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -272,9 +272,13 @@ export default {
 
     handleChange (value) {
 
-      let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
-      console.log(selAgency)
-      this.formData.orgId = selAgency.value
+      if (value && value.length > 0) {
+        let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
+        console.log(selAgency)
+        this.formData.orgId = selAgency.value
+      } else {
+        this.formData.orgId = ''
+      }
     },
 
     async loadTable () {
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index 6a6244f..21464e8 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -177,10 +177,17 @@ export default {
     },
 
     handleChangeAgency (value) {
-      let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
-      this.peoForm.orgName = selAgency.agencyName
-      this.peoForm.orgType = selAgency.level
-      this.peoForm.orgId = selAgency.agencyId
+      if (value && value.length > 0) {
+        let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
+        this.peoForm.orgName = selAgency.agencyName
+        this.peoForm.orgType = selAgency.level
+        this.peoForm.orgId = selAgency.agencyId
+      } else {
+        this.peoForm.orgName = ''
+        this.peoForm.orgType = ''
+        this.peoForm.orgId = ''
+      }
+
 
 
     },

From 53792a6ffc24de5075a3ec0c04941178f9ce5665 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 20 Oct 2022 09:10:25 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/yantai/certify.vue      |  9 ++--
 .../src/views/modules/yantai/detailForm.vue   |  2 +
 .../src/views/modules/yantai/editForm.vue     | 49 +++++++++++++++----
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue
index 1fc8274..22fd150 100644
--- a/epmet-oper-web/src/views/modules/yantai/certify.vue
+++ b/epmet-oper-web/src/views/modules/yantai/certify.vue
@@ -130,7 +130,8 @@
                          type="text"
                          size="small"
                          @click="handleEdit(scope.row,'edit')">修改</el-button>
-              <el-button type="text"
+              <el-button v-if="scope.row.status === '1'"
+                         type="text"
                          size="small"
                          @click="handleDetail(scope.row)">查看</el-button>
 
@@ -149,7 +150,7 @@
     </el-card>
 
     <el-dialog v-if="showEdit"
-               title="修改"
+               :title="editTitle"
                :visible.sync="showEdit"
                width="850"
                :before-close="dialogCancle">
@@ -216,7 +217,7 @@ export default {
 
       showEdit: false,
       showDetail: false,
-
+      editTitle: '新增'
 
     }
   },
@@ -304,7 +305,7 @@ export default {
       this.loadTable()
     },
     async handleEdit (row, editType) {
-
+      this.editTitle = editType === 'edit' ? '修改' : '新增'
       this.showEdit = true
       this.$nextTick(() => {
         this.$refs.ref_edit.initForm(editType, row);
diff --git a/epmet-oper-web/src/views/modules/yantai/detailForm.vue b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
index d7f1a06..5748440 100644
--- a/epmet-oper-web/src/views/modules/yantai/detailForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/detailForm.vue
@@ -144,6 +144,8 @@ export default {
         } else {
           this.peoForm.szsqRolesShow = '--'
         }
+      } else {
+        this.$message.error(msg);
       }
 
     },
diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue
index 21464e8..293cccb 100644
--- a/epmet-oper-web/src/views/modules/yantai/editForm.vue
+++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue
@@ -21,10 +21,10 @@
         <span v-if="peoForm.gender===1||peoForm.gender==='1'">{{'男'}}</span>
         <span v-if="peoForm.gender===2||peoForm.gender==='2'">{{'女'}}</span>
       </el-form-item>
-      <el-form-item label="组织/部门"
+      <el-form-item v-if="formType==='add'"
+                    label="组织/部门"
                     prop="orgId">
-        <el-cascader v-if="formType==='add'"
-                     ref="myCascader"
+        <el-cascader ref="myCascader"
                      v-model="agencyIdArray"
                      class="item-width-2"
                      :key="iscascaderShow"
@@ -32,7 +32,13 @@
                      :props="optionProps"
                      @change="handleChangeAgency"
                      clearable></el-cascader>
-        <span v-if="formType==='edit'">{{peoForm.agencyName||'--'}}</span>
+
+      </el-form-item>
+      <el-form-item v-if="formType==='edit'"
+                    label="组织/部门"
+                    prop="agencyName">
+
+        <span>{{peoForm.agencyName||'--'}}</span>
       </el-form-item>
       <el-form-item label="专兼职"
                     prop="workType">
@@ -177,10 +183,11 @@ export default {
     },
 
     handleChangeAgency (value) {
+
       if (value && value.length > 0) {
         let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data
         this.peoForm.orgName = selAgency.agencyName
-        this.peoForm.orgType = selAgency.level
+        this.peoForm.orgType = selAgency.level === 'grid' || selAgency.level === 'dept' ? selAgency.level : 'agency'
         this.peoForm.orgId = selAgency.agencyId
       } else {
         this.peoForm.orgName = ''
@@ -188,8 +195,6 @@ export default {
         this.peoForm.orgId = ''
       }
 
-
-
     },
 
     handleConfirm () {
@@ -202,6 +207,22 @@ export default {
 
     // 添加人员
     async submitPeoDo () {
+
+      this.$refs['editPeoForm'].validate((valid, messageObj) => {
+
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+
+          this.addPeo()
+
+
+
+        }
+      })
+    },
+
+    async addPeo () {
       if (this.peoForm.roles.length === 0) {
         this.$message.error("请选择职责");
         return false
@@ -233,7 +254,18 @@ export default {
 
     // 人员修改
     async updatePeoDo () {
+      this.$refs['editPeoForm'].validate((valid, messageObj) => {
+
+        if (!valid) {
+          app.util.validateRule(messageObj)
+        } else {
+          this.editPeo()
 
+        }
+      })
+    },
+
+    async editPeo () {
       if (this.peoForm.roles.length === 0) {
         this.$message.error("请选择职责");
         return false
@@ -267,7 +299,6 @@ export default {
     },
 
 
-
     // 修改网格人员初始化
     async xiuGridPeo () {
 
@@ -404,7 +435,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" }],

From f60e73e17268bc1ea2660a9db4197ac03b9890c0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Oct 2022 14:17:30 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/workPc/menu-add-or-update.vue        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-oper-web/src/views/modules/workPc/menu-add-or-update.vue b/epmet-oper-web/src/views/modules/workPc/menu-add-or-update.vue
index 2bc463e..9c0ec3d 100644
--- a/epmet-oper-web/src/views/modules/workPc/menu-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/workPc/menu-add-or-update.vue
@@ -27,9 +27,11 @@
                     class="menu-list">
         <el-popover v-model="menuListVisible"
                     ref="menuListPopover"
+                    class="div-popover"
                     placement="bottom-start"
                     trigger="click">
           <el-tree :data="menuList"
+                   class="div-popover"
                    :props="{ label: 'name', children: 'children' }"
                    node-key="id"
                    ref="menuListTree"
@@ -340,4 +342,9 @@ export default {
     }
   }
 }
+
+.div-popover {
+  height: 400px;
+  overflow-y: auto;
+}
 </style>