添加编辑子部门验证修改

ybf_admin/src/pages/in/contact/components/addGroup.vue

@@ -7,7 +7,7 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" element-loading-text="加载中">
+      <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" :element-loading-text="loadText">
         <el-form-item label="部门名称:" prop="label">
           <el-input
             size="small"
@@ -43,9 +43,9 @@
             style="width: 50%;"
           />
         </el-form-item>
-        <el-form-item label="设置主管:" prop="clerkId"  >
+        <el-form-item label="设置主管:" prop="clerkIds"  >
           <el-cascader :props="props" ref="direcRef" v-model="deptId" :disabled="ifDisabled" :options="parentDeptList" :show-all-levels="false"  filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
-          <el-select v-model="clerkId" filterable multiple placeholder="请选择" style="width: 30%;" clearble  @change="handleMemberChange" :loading="optionLoading" loading-text="数据加载中">
+          <el-select v-model="addForm.clerkIds" filterable multiple placeholder="请选择" style="width: 30%;" clearble  @change="handleMemberChange" :loading="optionLoading" loading-text="数据加载中">
             <el-option
               v-for="item in peopleList"
               :key="item.id"
@@ -106,7 +106,8 @@ export default {
 		  }
     }
     return {
-      clerkId: [],
+      clerkIds: [],
+      loadText: '加载中',
       treeData: [],
       group_name: "",
       shop_code: "",
@@ -125,7 +126,7 @@ export default {
         oyStallName: '',
         oyStallMemberId: '',
         oyStallCode: '',
-        clerkId: '',
+        clerkIds: [],
         oydeptId: ''
       },
       detail: 2,
@@ -144,7 +145,7 @@ export default {
         parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }],
         oyStallCode: [{  required: true, validator: idNumber, trigger: "blur" }],
         oyStallMemberId: [{  required: false, validator: memberNumber, trigger: "blur" }],
-        clerkId: [{  required: true, message: "主管不能为空", trigger: "change" }]
+        clerkIds: [{  required: true, message: "主管不能为空", trigger: "change" }]
       },
       deptOption: {
           value: 'id',
@@ -206,7 +207,8 @@ export default {
     handleParentChange(val) { 
       this.addForm.oydeptId = val
       this.optionLoading = true     
-      this.clerkId = []
+      this.clerkIds = []
+      this.addForm.clerkIds = []
       this.getGroupMember(val)         
     },
     getDeptList() {
@@ -223,20 +225,27 @@ export default {
       this.$emit("handleAddCancel")
     },
     handleAddFinish(formName) {
+      this.formLoading = true
+      this.loadText = "处理中"
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          const clerkIds = this.clerkId + ""
-          let data = Object.assign(this.addForm,{ clerkIds })
-          delete data.clerkId
-          addGroup(data).then(res => {
+          this.addForm.clerkIds = this.addForm.clerkIds + ""
+          // let data = Object.assign(this.addForm,{ clerkIdss })
+          // delete data.clerkIds
+          addGroup(this.addForm).then(res => {
             if(res.result == "success") {
-              if(res.data.isSuccessful == 0) {       
+              if(res.data.isSuccessful == 0) {    
+                this.addForm.clerkIds = this.clerkIds 
                 this.$message.error("门店id不能重复")
+                this.formLoading = false
               }else{
                 this.$emit("handleAddFinish")
+                this.formLoading = false
               }
             }else {
+              this.addForm.clerkIds = this.clerkIds 
               this.$message.error(res.errorMsg)
+              this.formLoading = false
             }
             
           })
@@ -254,12 +263,13 @@ export default {
         this.ifDisabled = false
       })
     },
-    handleMemberChange(val) {     
-      if(val.length == 0) {
-        this.addForm.clerkId = ''
-      }else {
-        this.addForm.clerkId = '验证用'
-      }
+    handleMemberChange(val) {    
+      this.clerkIds = val 
+      // if(val.length == 0) {
+      //   this.addForm.clerkIds = ''
+      // }else {
+      //   this.addForm.clerkIds = '验证用'
+      // }
     }
   },
   watch: {

ybf_admin/src/pages/in/contact/components/editGroup.vue

@@ -7,7 +7,7 @@
       :show-close="false"
       :close-on-click-modal="false"      
     >
-      <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" element-loading-text="数据加载中">
+      <el-form :model="addForm" label-width="auto" ref="addStore" :rules="rules" v-loading="formLoading" :element-loading-text="loadText">
         <el-form-item label="部门名称:" prop="label"  >
           <el-input
             size="small"
@@ -44,16 +44,17 @@
             style="width: 50%;"
           />
         </el-form-item>
-        <el-form-item label="设置主管:" prop="clerkId" >
-          <el-cascader :props="props" v-model="deptId" ref="direcRef" :options="parentDeptList" :disabled="ifDisabled" :show-all-levels="false"  filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
-          <el-select v-model="clerkId"  filterable multiple placeholder="请选择" style="width: 30%;" clearble @change="handleMemberChange" :loading="optionLoading" loading-text="数据加载中" >
+        <el-form-item label="设置主管:" prop="clerkIds" >
+          <el-cascader :props="props" ref="direcRef" v-model="deptId" :disabled="ifDisabled" :options="parentDeptList" :show-all-levels="false"  filterable style="width: 30%;margin-right:15px;" @change="handleParentChange" ></el-cascader>
+          <el-select v-model="addForm.clerkIds" filterable multiple placeholder="请选择" style="width: 30%;" clearble  @change="handleMemberChange" :loading="optionLoading" loading-text="数据加载中">
             <el-option
               v-for="item in peopleList"
               :key="item.id"
               :label="item.userName"
-              :value="item.id">
+              :value="item.id"
+             >
             </el-option>
-          </el-select>
+          </el-select>       
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -114,7 +115,7 @@ export default {
       group_name: "",
       shop_code: "",
       showTree: false,
-      clerkId: [],
+      clerkIds: [],
       params: {
         d_name: "",
         d_parentId: "",
@@ -129,7 +130,8 @@ export default {
         oyStallName: '',
         oyStallMemberId: '',
         oyStallCode: '',
-        clerkId: ''
+        clerkIds: '',
+        oydeptId: ''
       },
       detail: 2,
       deptId: '',
@@ -144,7 +146,7 @@ export default {
         ],
         parentId: [{ required: true, message: "请选择上级部门", trigger: "change" }],
         oyStallCode: [{ required: true, validator: idNumber, trigger: "blur" }],
-        clerkId: [{  required: true, message: "主管不能为空", trigger: "change" }]
+        clerkIds: [{  required: true,  message: "主管不能为空", trigger: "blur" }]
       },
       deptOption: {
           value: 'id',
@@ -166,6 +168,7 @@ export default {
             }, 1000);
           }
       },
+      loadText: "加载中",
       ifDisabled: false,
       formLoading: false,
       props: {
@@ -200,12 +203,12 @@ export default {
       getDeptDetail({id:this.groupId}).then(res=> {
         console.log(res,"详情")
         this.addForm = res.data.organization
-        const clerkId = []
+        const clerkIds = []
         res.data.supervisors.forEach(item => {
-          clerkId.push(item.id)          
+          clerkIds.push(item.id)          
         })
-        this.clerkId = clerkId 
-        this.addForm.clerkId = "验证用"        
+        this.clerkIds = clerkIds 
+        this.$set(this.addForm,'clerkIds',clerkIds)      
         this.getDeptList()
         const deptId = ''
         this.addForm.oydeptId = res.data.oydeptId
@@ -229,7 +232,8 @@ export default {
     handleParentChange(val) {  
       this.addForm.oydeptId = val
       this.optionLoading = true       
-      this.clerkId = []
+      this.clerkIds = []
+      this.addForm.clerkIds = []
       this.getGroupMember(val)           
     },
     getDeptList() {
@@ -247,17 +251,20 @@ export default {
       this.$emit("handleEditCancel")
     },
     handleEditFinish(formName) {
+      this.formLoading = true
+      this.loadText = "处理中"
       this.$refs[formName].validate((valid) => {
         if (valid) {
-        const clerkIds = this.clerkId+""
-        let data = Object.assign(this.addForm,{ clerkIds })
-        delete data.clerkId
-        editDept(data).then(res => {
-        if(res.result == 'success') {
-          this.$emit("handleEditFinish")
-        }else {
-          this.$message.error('修改失败')
-        }        
+        this.addForm.clerkIds = this.addForm.clerkIds + ""
+        editDept(this.addForm).then(res => {
+          if(res.result == 'success') {
+            this.$emit("handleEditFinish")
+            this.formLoading = false
+          }else {
+            this.addForm.clerkIds = this.clerkIds 
+            this.$message.error(res.errorMsg)
+            this.formLoading = false
+          }        
       })
         } else {
           return false;
@@ -274,12 +281,8 @@ export default {
         this.ifDisabled = false
       })
     },
-    handleMemberChange(val) {   
-      if(val.length == 0) {
-        this.addForm.clerkId = ''
-      }else {
-        this.addForm.clerkId = '验证用'
-      }
+    handleMemberChange(val) { 
+      this.clerkIds = val
     } 
   },
   watch: {