zc

src/views/comprehensive/personnel/student/addPage.vue

@@ -501,6 +501,7 @@ export default {
   },
   methods:{
     upDataClick(){
+      let self = this;
       this.$refs["form"].validate(valid => {
         if (valid) {
           if(this.form.email){
@@ -511,6 +512,7 @@ export default {
             }
           }
           let obj = JSON.parse(JSON.stringify(this.form));
+          obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
           // obj.position = obj.position+'';
           if(this.propsData.userId){
             //编辑
@@ -526,10 +528,10 @@ export default {
                   type: "warning"
                 }).then(() => {
                   //  确定
-                  this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+                  self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
                 }).catch(function() {
                   //  取消
-                  this.outPageButton();
+                  self.outPageButton();
                 });
               }
 
@@ -547,10 +549,10 @@ export default {
                   type: "warning"
                 }).then(() => {
                   //  确定
-                  this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+                  self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
                 }).catch(function() {
                   //  取消
-                  this.outPageButton();
+                  self.outPageButton();
                 });
               }
 

src/views/comprehensive/personnel/student/differenceComponent/addPageSubPagePublic.vue

@@ -8,65 +8,66 @@
     name: 'addPageSubPagePublic',
     methods:{
       upDataClick(){
-        let self = this;
-        self.$parent.$refs["form"].validate(valid => {
-          if (valid) {
-            if(self.$parent.form.email){
-              let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-              if(!re.test(self.$parent.form.email)){
-                self.msgError('请输入正确的邮箱地址')
-                return
-              }
-            }
-            let obj = JSON.parse(JSON.stringify(self.$parent.form));
-            // obj.position = obj.position+'';
-            if(self.$parent.propsData.userId){
-              //编辑
-              obj.userId = self.$parent.propsData.userId
-              obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
-              putUserStudent(obj).then(response => {
-                if(response.code==200){
-                  self.msgSuccess(response.msg)
-                  self.$parent.outPageButton()
-                }else if(response.code==205){
-                  self.$confirm(response.msg, "警告", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                  }).then(() => {
-                    //  确定
-                    self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
-                  }).catch(function() {
-                    //  取消
-                    self.$parent.outPageButton();
-                  });
-                }
-
-              });
-            }else{
-              //新增
-              addUserStudent(obj).then(response => {
-                if(response.code==200){
-                  self.msgSuccess(response.msg)
-                  self.$parent.outPageButton()
-                }else if(response.code==205){
-                  self.$confirm(response.msg, "警告", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                  }).then(() => {
-                    //  确定
-                    self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
-                  }).catch(function() {
-                    //  取消
-                    self.$parent.outPageButton();
-                  });
-                }
-
-              });
-            }
-          }
-        })
+        this.$parent.upDataClick();
+        // let self = this;
+        // self.$parent.$refs["form"].validate(valid => {
+        //   if (valid) {
+        //     if(self.$parent.form.email){
+        //       let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+        //       if(!re.test(self.$parent.form.email)){
+        //         self.msgError('请输入正确的邮箱地址')
+        //         return
+        //       }
+        //     }
+        //     let obj = JSON.parse(JSON.stringify(self.$parent.form));
+        //     // obj.position = obj.position+'';
+        //     if(self.$parent.propsData.userId){
+        //       //编辑
+        //       obj.userId = self.$parent.propsData.userId
+        //       obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
+        //       putUserStudent(obj).then(response => {
+        //         if(response.code==200){
+        //           self.msgSuccess(response.msg)
+        //           self.$parent.outPageButton()
+        //         }else if(response.code==205){
+        //           self.$confirm(response.msg, "警告", {
+        //             confirmButtonText: "确定",
+        //             cancelButtonText: "取消",
+        //             type: "warning"
+        //           }).then(() => {
+        //             //  确定
+        //             self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+        //           }).catch(function() {
+        //             //  取消
+        //             self.$parent.outPageButton();
+        //           });
+        //         }
+        //
+        //       });
+        //     }else{
+        //       //新增
+        //       addUserStudent(obj).then(response => {
+        //         if(response.code==200){
+        //           self.msgSuccess(response.msg)
+        //           self.$parent.outPageButton()
+        //         }else if(response.code==205){
+        //           self.$confirm(response.msg, "警告", {
+        //             confirmButtonText: "确定",
+        //             cancelButtonText: "取消",
+        //             type: "warning"
+        //           }).then(() => {
+        //             //  确定
+        //             self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+        //           }).catch(function() {
+        //             //  取消
+        //             self.$parent.outPageButton();
+        //           });
+        //         }
+        //
+        //       });
+        //     }
+        //   }
+        // })
       },
     }
   }

src/views/comprehensive/personnel/student/differenceComponent/addPageSubPageSZDX.vue

@@ -8,35 +8,36 @@
     name: 'addPageSubPageSZDX',
     methods:{
       upDataClick(){
-        let self = this;
-        self.$parent.$refs["form"].validate(valid => {
-          if (valid) {
-            if(self.$parent.form.email){
-              let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-              if(!re.test(self.$parent.form.email)){
-                self.msgError('请输入正确的邮箱地址')
-                return
-              }
-            }
-            let obj = JSON.parse(JSON.stringify(self.$parent.form));
-            obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
-            // obj.position = obj.position+'';
-            if(self.$parent.propsData.userId){
-              //编辑
-              obj.userId = self.$parent.propsData.userId
-              putUserStudent(self.$parent.form).then(response => {
-                self.msgSuccess(response.msg)
-                self.$parent.outPageButton()
-              });
-            }else{
-              //新增
-              addUserStudent(obj).then(response => {
-                self.msgSuccess(response.msg)
-                self.$parent.outPageButton()
-              });
-            }
-          }
-        });
+        this.$parent.upDataClick();
+        // let self = this;
+        // self.$parent.$refs["form"].validate(valid => {
+        //   if (valid) {
+        //     if(self.$parent.form.email){
+        //       let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+        //       if(!re.test(self.$parent.form.email)){
+        //         self.msgError('请输入正确的邮箱地址')
+        //         return
+        //       }
+        //     }
+        //     let obj = JSON.parse(JSON.stringify(self.$parent.form));
+        //     obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
+        //     // obj.position = obj.position+'';
+        //     if(self.$parent.propsData.userId){
+        //       //编辑
+        //       obj.userId = self.$parent.propsData.userId
+        //       putUserStudent(self.$parent.form).then(response => {
+        //         self.msgSuccess(response.msg)
+        //         self.$parent.outPageButton()
+        //       });
+        //     }else{
+        //       //新增
+        //       addUserStudent(obj).then(response => {
+        //         self.msgSuccess(response.msg)
+        //         self.$parent.outPageButton()
+        //       });
+        //     }
+        //   }
+        // });
       },
     }
   }

src/views/comprehensive/personnel/teacher/addPage.vue

@@ -97,7 +97,7 @@
             <el-input
               :disabled="editType"
               style="width:218px;"
-              maxlength="25"
+              maxlength="11"
               onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
               v-model="form.phonenumber"
               placeholder="请输入手机号码"
@@ -115,7 +115,7 @@
               reserve-keyword
               @change="categorySelectClick"
               @clear="categoryClearClick"
-              placeholder="请选择身份"
+              placeholder="请选择职称"
               :remote-method="categorySelect">
               <el-option
                 v-for="item in categoryOptions"
@@ -158,7 +158,7 @@
               reserve-keyword
               @change="educationSelectClick"
               @clear="educationClearClick"
-              placeholder="请选择身份"
+              placeholder="请选择文化程度"
               :remote-method="educationSelect">
               <el-option
                 v-for="item in educationOptions"
@@ -499,6 +499,8 @@ export default {
     },
     //提交按钮
     upDataButton(){
+      let self = this;
+      console.log('1231111');
       this.$refs["form"].validate(valid => {
         if (valid) {
           if(this.form.email){
@@ -510,6 +512,7 @@ export default {
           }
           let list = this.toArray();
           let obj = JSON.parse(JSON.stringify(this.form));
+          obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
           // obj.position = obj.position+'';
           obj.permitMenus = [];
           if(obj.status == 0){
@@ -541,6 +544,7 @@ export default {
       });
     },
     putUserTeacherNew(obj){
+      let self = this;
       putUserTeacherNew(obj).then(response => {
         if(response.code == 200){
           this.msgSuccess(response.msg);
@@ -552,10 +556,10 @@ export default {
             type: "warning"
           }).then(() => {
             //  确定
-            this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+            self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
           }).catch(function() {
             //  取消
-            this.outPageButton();
+            self.outPageButton();
           });
         }
       });

src/views/comprehensive/personnel/teacher/differenceComponent/addPageSubPagePublic.vue

@@ -8,48 +8,49 @@
     name: 'addPageSubPagePublic',
     methods:{
       upDataButton(){
-        let self = this;
-        self.$parent.$refs["form"].validate(valid => {
-          if (valid) {
-            if(self.$parent.form.email){
-              let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-              if(!re.test(self.$parent.form.email)){
-                self.msgError('请输入正确的邮箱地址')
-                return
-              }
-            }
-            let list = self.$parent.toArray();
-            let obj = JSON.parse(JSON.stringify(self.$parent.form));
-            obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
-            // obj.position = obj.position+'';
-            obj.permitMenus = [];
-            if(obj.status == 0){
-              for(let i=0;i<list.length;i++){
-                let minObj = {
-                  menuId:list[i].menuId,
-                }
-                if(list[i].dataScope){
-                  minObj.dataScope = list[i].dataScope
-                  if(list[i].dataScope == 3){
-                    minObj.deptIds = list[i].deptIds;
-                    minObj.deptIdsList = list[i].deptIdsList;
-                  }
-                }else{
-                  minObj.dataScope = 0
-                }
-                obj.permitMenus.push(minObj)
-              }
-            }
-            if(self.$parent.propsData.userId){
-              //修改
-              obj.userId = self.$parent.propsData.userId;
-              self.putUserTeacherNew(obj);
-            }else{
-              //发布
-              self.addUserTeacher(obj);
-            }
-          }
-        });
+        this.$parent.upDataButton();
+        // let self = this;
+        // self.$parent.$refs["form"].validate(valid => {
+        //   if (valid) {
+        //     if(self.$parent.form.email){
+        //       let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+        //       if(!re.test(self.$parent.form.email)){
+        //         self.msgError('请输入正确的邮箱地址')
+        //         return
+        //       }
+        //     }
+        //     let list = self.$parent.toArray();
+        //     let obj = JSON.parse(JSON.stringify(self.$parent.form));
+        //     obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
+        //     // obj.position = obj.position+'';
+        //     obj.permitMenus = [];
+        //     if(obj.status == 0){
+        //       for(let i=0;i<list.length;i++){
+        //         let minObj = {
+        //           menuId:list[i].menuId,
+        //         }
+        //         if(list[i].dataScope){
+        //           minObj.dataScope = list[i].dataScope
+        //           if(list[i].dataScope == 3){
+        //             minObj.deptIds = list[i].deptIds;
+        //             minObj.deptIdsList = list[i].deptIdsList;
+        //           }
+        //         }else{
+        //           minObj.dataScope = 0
+        //         }
+        //         obj.permitMenus.push(minObj)
+        //       }
+        //     }
+        //     if(self.$parent.propsData.userId){
+        //       //修改
+        //       obj.userId = self.$parent.propsData.userId;
+        //       self.putUserTeacherNew(obj);
+        //     }else{
+        //       //发布
+        //       self.addUserTeacher(obj);
+        //     }
+        //   }
+        // });
       },
       putUserTeacherNew(obj){
         let self = this;

src/views/comprehensive/personnel/teacher/differenceComponent/addPageSubPageSZDX.vue

@@ -8,48 +8,49 @@
     name: 'addPageSubPageSZDX',
     methods:{
       upDataButton(){
-        let self = this;
-        self.$parent.$refs["form"].validate(valid => {
-          if (valid) {
-            if(self.$parent.form.email){
-              let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-              if(!re.test(self.$parent.form.email)){
-                self.msgError('请输入正确的邮箱地址')
-                return
-              }
-            }
-            let list = self.$parent.toArray();
-            let obj = JSON.parse(JSON.stringify(self.$parent.form));
-            obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
-            // obj.position = obj.position+'';
-            obj.permitMenus = [];
-            if(obj.status == 0){
-              for(let i=0;i<list.length;i++){
-                let minObj = {
-                  menuId:list[i].menuId,
-                }
-                if(list[i].dataScope){
-                  minObj.dataScope = list[i].dataScope
-                  if(list[i].dataScope == 3){
-                    minObj.deptIds = list[i].deptIds;
-                    minObj.deptIdsList = list[i].deptIdsList;
-                  }
-                }else{
-                  minObj.dataScope = 0
-                }
-                obj.permitMenus.push(minObj)
-              }
-            }
-            if(self.$parent.propsData.userId){
-              //修改
-              obj.userId = self.$parent.propsData.userId;
-              self.putUserTeacherNew(obj);
-            }else{
-              //发布
-              self.addUserTeacher(obj);
-            }
-          }
-        });
+        this.$parent.upDataButton();
+        // let self = this;
+        // self.$parent.$refs["form"].validate(valid => {
+        //   if (valid) {
+        //     if(self.$parent.form.email){
+        //       let re = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+        //       if(!re.test(self.$parent.form.email)){
+        //         self.msgError('请输入正确的邮箱地址')
+        //         return
+        //       }
+        //     }
+        //     let list = self.$parent.toArray();
+        //     let obj = JSON.parse(JSON.stringify(self.$parent.form));
+        //     obj.roleIds = self.$parent.form.position?self.$parent.form.roleIds:[];
+        //     // obj.position = obj.position+'';
+        //     obj.permitMenus = [];
+        //     if(obj.status == 0){
+        //       for(let i=0;i<list.length;i++){
+        //         let minObj = {
+        //           menuId:list[i].menuId,
+        //         }
+        //         if(list[i].dataScope){
+        //           minObj.dataScope = list[i].dataScope
+        //           if(list[i].dataScope == 3){
+        //             minObj.deptIds = list[i].deptIds;
+        //             minObj.deptIdsList = list[i].deptIdsList;
+        //           }
+        //         }else{
+        //           minObj.dataScope = 0
+        //         }
+        //         obj.permitMenus.push(minObj)
+        //       }
+        //     }
+        //     if(self.$parent.propsData.userId){
+        //       //修改
+        //       obj.userId = self.$parent.propsData.userId;
+        //       self.putUserTeacherNew(obj);
+        //     }else{
+        //       //发布
+        //       self.addUserTeacher(obj);
+        //     }
+        //   }
+        // });
       },
       putUserTeacherNew(obj){
         let self = this;