Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-web

src/views/secureAccess/approval_handle/addPage.vue

@@ -6,7 +6,7 @@
       <p class="button-p reset-button-one" @click="backPage">返回</p>
     </div>
     <div class="addPage-max-box">
-      <el-form :model="form" ref="drawerForm" :rules="rules" label-position="left" label-width="100px">
+      <el-form :model="form" ref="form" :rules="rules" label-position="left" label-width="100px">
         <div class="addPage-type-one" style="text-align: center" v-if="minType == 1">
           <p class="addPage-type-one-title">实验室安全准入是进入实验室所需的必要手续，为保障您能够顺利申请准入资格，请在申请前请认真阅读以下内容。</p>
           <div style="text-align: left;margin-left:36%">
@@ -392,87 +392,92 @@
       //提交按钮
       upDataButton(){
         let self = this;
-        if(this.dateRange&&this.dateRange.length>0){
-          this.form.validBegin_time=this.dateRange[0]
-          this.form.validEnd_time=this.dateRange[1]
-        }else{
-          this.form.validBegin_time=null;
-          this.form.validEnd_time=null
-        }
-        let sysUser={
-              nickName:this.queryParams.nickName,
-              phonenumber:this.queryParams.phonenumber,
-              userName:this.queryParams.userName,
-              cardNum:this.queryParams.cardNum,
-              tutorUserId:this.queryParams.tutorUserId,
-              grade:this.queryParams.grade,
-              tutorUserName:this.queryParams.tutorUserName,
-              userId:this.queryParams.userId,
-          };
-        let obj = {
-          subjectAdminid:this.subjectData.fzrsysUser[0].user_id,
-          userNumber:this.subjectData.sysUser.userName,//学号/工号
-          userMajor:this.subjectData.sysUser.major,//专业
-          deptId:this.subject.deptId, //NULL部门id
-          deptName:this.subject.deptName, //NULL部门名称
-          subjectId:this.subject.id, //NULL实验室id
-          subjectName:this.subject.name, //NULL实验室名称
-          auditStatus:"0", //NULL审核状态 0待审核 1驳回 2通过
-          //validLength:this.form.validTime, //NULL有效期 月份时长
-          mrList:[],//上传资料
-          sysUser:sysUser,//身份卡用户信息
-          validBeginTime:this.form.validBegin_time,//申请期限开始时间
-          validEndTime:this.form.validEnd_time,//申请期限结束时间
-          applyCause:this.form.applyCause,//申请备注
+        this.$refs["queryParams"].validate(valid => {
+          if (valid) {
+            if(this.dateRange&&this.dateRange.length>0){
+              this.form.validBegin_time=this.dateRange[0]
+              this.form.validEnd_time=this.dateRange[1]
+            }else{
+              this.form.validBegin_time=null;
+              this.form.validEnd_time=null
+            }
+            let sysUser={
+                  nickName:this.queryParams.nickName,
+                  phonenumber:this.queryParams.phonenumber,
+                  userName:this.queryParams.userName,
+                  cardNum:this.queryParams.cardNum,
+                  tutorUserId:this.queryParams.tutorUserId,
+                  grade:this.queryParams.grade,
+                  tutorUserName:this.queryParams.tutorUserName,
+                  userId:this.queryParams.userId,
+              };
+            let obj = {
+              subjectAdminid:this.subjectData.fzrsysUser[0].user_id,
+              userNumber:this.subjectData.sysUser.userName,//学号/工号
+              userMajor:this.subjectData.sysUser.major,//专业
+              deptId:this.subject.deptId, //NULL部门id
+              deptName:this.subject.deptName, //NULL部门名称
+              subjectId:this.subject.id, //NULL实验室id
+              subjectName:this.subject.name, //NULL实验室名称
+              auditStatus:"0", //NULL审核状态 0待审核 1驳回 2通过
+              //validLength:this.form.validTime, //NULL有效期 月份时长
+              mrList:[],//上传资料
+              sysUser:sysUser,//身份卡用户信息
+              validBeginTime:this.form.validBegin_time,//申请期限开始时间
+              validEndTime:this.form.validEnd_time,//申请期限结束时间
+              applyCause:this.form.applyCause,//申请备注
 
-        };
-        if(this.subjectData.sysUser.userType == '22'){
-          for(let i=0;i<self.subjectData.listStudent.length;i++){
-            if(self.subjectData.listStudent[i].materialType==1){
-              if(!self.subjectData.listStudent[i].upList[0]){
-                this.msgError(self.subjectData.listStudent[i].materialName+"未上传");
-                return
-              }else{
-                let upData = {
-                  materialId:self.subjectData.listStudent[i].id,
-                  dataName:self.subjectData.listStudent[i].materialName,
-                  dataDescribe:self.subjectData.listStudent[i].materialDescribe,
-                  dataUrl:"",
-                };
-                for(let o=0;o<self.subjectData.listStudent[i].upList.length;o++){
-                  upData.dataUrl = upData.dataUrl + self.subjectData.listStudent[i].upList[o].name + ';' + self.subjectData.listStudent[i].upList[o].url + ',';
+            };
+            if(this.subjectData.sysUser.userType == '22'){
+              for(let i=0;i<self.subjectData.listStudent.length;i++){
+                if(self.subjectData.listStudent[i].materialType==1){
+                  if(!self.subjectData.listStudent[i].upList[0]){
+                    this.msgError(self.subjectData.listStudent[i].materialName+"未上传");
+                    return
+                  }else{
+                    let upData = {
+                      materialId:self.subjectData.listStudent[i].id,
+                      dataName:self.subjectData.listStudent[i].materialName,
+                      dataDescribe:self.subjectData.listStudent[i].materialDescribe,
+                      dataUrl:"",
+                    };
+                    for(let o=0;o<self.subjectData.listStudent[i].upList.length;o++){
+                      upData.dataUrl = upData.dataUrl + self.subjectData.listStudent[i].upList[o].name + ';' + self.subjectData.listStudent[i].upList[o].url + ',';
+                    }
+                    obj.mrList.push(upData);
+                  }
                 }
-                obj.mrList.push(upData);
               }
-            }
-          }
-        }else if(this.subjectData.sysUser.userType == '11'){
-          for(let i=0;i<self.subjectData.listTeacher.length;i++){
-            if(self.subjectData.listTeacher[i].materialType==1){
-              if(!self.subjectData.listTeacher[i].upList[0]){
-                this.msgError(self.subjectData.listTeacher[i].materialName+"未上传");
-                return
-              }else{
-                let upData = {
-                  materialId:self.subjectData.listTeacher[i].id,
-                  dataName:self.subjectData.listTeacher[i].materialName,
-                  dataDescribe:self.subjectData.listTeacher[i].materialDescribe,
-                  dataUrl:"",
-                };
-                for(let o=0;o<self.subjectData.listTeacher[i].upList.length;o++){
-                  upData.dataUrl = upData.dataUrl + self.subjectData.listTeacher[i].upList[o].name + ';' + self.subjectData.listTeacher[i].upList[o].url + ',';
+            }else if(this.subjectData.sysUser.userType == '11'){
+              for(let i=0;i<self.subjectData.listTeacher.length;i++){
+                if(self.subjectData.listTeacher[i].materialType==1){
+                  if(!self.subjectData.listTeacher[i].upList[0]){
+                    this.msgError(self.subjectData.listTeacher[i].materialName+"未上传");
+                    return
+                  }else{
+                    let upData = {
+                      materialId:self.subjectData.listTeacher[i].id,
+                      dataName:self.subjectData.listTeacher[i].materialName,
+                      dataDescribe:self.subjectData.listTeacher[i].materialDescribe,
+                      dataUrl:"",
+                    };
+                    for(let o=0;o<self.subjectData.listTeacher[i].upList.length;o++){
+                      upData.dataUrl = upData.dataUrl + self.subjectData.listTeacher[i].upList[o].name + ';' + self.subjectData.listTeacher[i].upList[o].url + ',';
+                    }
+                    obj.mrList.push(upData);
+                  }
                 }
-                obj.mrList.push(upData);
               }
             }
+            if(this.infoType){
+              obj.id = this.infoData.labSecurityApply.id;
+              this.materialUpdate(obj);
+            }else{
+              this.materialAdd(obj);
+            }
           }
-        }
-        if(this.infoType){
-          obj.id = this.infoData.labSecurityApply.id;
-          this.materialUpdate(obj);
-        }else{
-          this.materialAdd(obj);
-        }
+        })
+
       },
       //删除对应资料
       delUpData(item,index){