sunyize 2 лет назад
Родитель
Сommit
debb246d2e

+ 1 - 1
src/views/smscheck/modules/TaskCheckCheck.vue

@@ -67,7 +67,7 @@
               <a-col :span="18" >
                 <div style="clear: both"></div>
                 <a-form-model-item label="稽核结果备注" prop="basicCheckNote" style="float:left;margin: 50px 10px;" :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" >
-                  <a-textarea v-model=infoModel.infoResultRemark  placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:60px; width: 300px;"   />
+                  <a-textarea v-model=infoModel.infoResultRemark  placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:50px; width: 300px;"   />
                 </a-form-model-item>
 
               </a-col>

+ 2 - 4
src/views/smscheck/modules/TaskUploadDataZG.vue

@@ -270,7 +270,7 @@
                   <a-col :span="18" >
                     <div style="clear: both"></div>
                     <a-form-model-item label="稽核结果备注" prop="basicCheckNote" style="float:left;margin: 50px 10px;" :labelCol="{ span: 5 }" :wrapperCol="{ span: 15 }" >
-                      <a-textarea v-model=infoModel.infoResultRemark :disabled='true' placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:60px; width: 300px;"   />
+                      <a-textarea v-model=infoModel.infoResultRemark :disabled='true' placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:50px; width: 300px;"   />
                     </a-form-model-item>
 
                   </a-col>
@@ -3424,25 +3424,23 @@ export default {
         // 验证通过
         if (!valid) {
           info = "no";
-          this.uploading = false;
         }}
       )
       for (var i in this.steps.stepsNow) {
         if (this.steps.stepsNow[i].status !== "finish" && this.steps.stepsNow[i].type!=='solution') {
            this.$message.warn( this.steps.stepsNow[i].title +"资料或备注都未整改!!!");
            info="no";
-          this.uploading = false;
         }
       }
       if (this.infoModel.isCsp==='1'){
         if ((this.infoModel.permitDateDate==="" ||this.infoModel.permitDateDate===null
         ) && (this.infoModel.permitDateDateIs==="" ||this.infoModel.permitDateDateIs===null ||this.infoModel.permitDateDateIs==='0') ){
           info="no";
-          this.uploading = false;
           this.$message.warn( "增值业务许可证到期时间未填写!!!");
         }
       }
       if (info==="no"){
+        this.uploading = false;
         return
       }