调整

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);

epmet-oper-web/src/views/modules/yantai/detailForm.vue

@@ -144,6 +144,8 @@ export default {
         } else {
           this.peoForm.szsqRolesShow = '--'
         }
+      } else {
+        this.$message.error(msg);
       }
 
     },

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'"
+        <el-cascader ref="myCascader"
-                     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" }],