会议爱拍申请-开始时间小于结束时间/提示错位

src/views/oa/modules/ConferenceApplyModal.vue

@@ -9,11 +9,14 @@
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
+        <a-row>
         <a-col span="24">
           <a-form-item label="会议议题" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
             <a-input v-decorator="[ 'conferenceTitle', validatorRules.conferenceTitle]" placeholder="请输入会议议题"></a-input>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="8">
           <a-form-item label="会议信息发布人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-popup
@@ -35,6 +38,8 @@
             <j-date placeholder="请选择发布日期" v-decorator="[ 'postedDate', validatorRules.postedDate]" :trigger-change="true" style="width: 100%"/>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="8">
           <a-form-item label="会议日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-date placeholder="请选择会议日期" v-decorator="[ 'conferenceDate', validatorRules.conferenceDate]" :trigger-change="true" style="width: 100%"/>
@@ -42,14 +47,16 @@
         </a-col>
         <a-col span="8">
           <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date placeholder="请选择开始时间" v-decorator="[ 'startTime', validatorRules.startTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <j-date placeholder="请选择开始时间" @change="changeStartTime" v-decorator="[ 'startTime', validatorRules.startTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
           </a-form-item>
         </a-col>
         <a-col span="8">
           <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date placeholder="请选择结束时间" v-decorator="[ 'endTime', validatorRules.endTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <j-date placeholder="请选择结束时间" @change="changeEndTime" v-decorator="[ 'endTime', validatorRules.endTime]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="8">
           <a-form-item label="会议地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-popup
@@ -78,21 +85,28 @@
             <a-input v-model="orgCode" :disabled="true" placeholder="请输入出席部门"></a-input>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="24">
           <a-form-item label="其他参会人" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
             <a-input v-decorator="[ 'otherPerson', validatorRules.otherPerson]" placeholder="请输入其他参会人"></a-input>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="24">
           <a-form-item label="会议内容" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
             <a-textarea v-decorator="['conferenceContent', validatorRules.conferenceContent]" rows="1" placeholder="请输入会议内容"/>
           </a-form-item>
         </a-col>
+      </a-row>
+    <a-row>
         <a-col span="24">
           <a-form-item label="附件" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
             <j-upload v-decorator="['file', validatorRules.file]" :trigger-change="true"></j-upload>
           </a-form-item>
         </a-col>
+      </a-row>
       </a-form>
     </a-spin>
   </a-modal>
@@ -274,6 +288,32 @@
       handleCancel () {
         this.close()
       },
+      changeStartTime(data){   
+      var end = (this.form.getFieldValue('endTime'))?new Date((this.form.getFieldValue('endTime')).replace(/\-/g, "\/")):new Date(''.replace(/\-/g, "\/"));
+      var start = new Date(data.replace(/\-/g, "\/"));
+      if(this.form.getFieldValue('endTime')!=""&&data!=""&&start >=end)  
+       {  
+        this.$nextTick(() => {
+          this.form.setFieldsValue({startTime: '' })
+           this.$forceUpdate()
+         })
+        this.$message.error("合同开始时间不能大于合同结束时间！")     
+        return false;  
+        }
+     },
+     changeEndTime(data){
+      var start = (this.form.getFieldValue('startTime'))?new Date((this.form.getFieldValue('startTime')).replace(/\-/g, "\/")):new Date(''.replace(/\-/g, "\/"));
+      var end = new Date(data.replace(/\-/g, "\/"));
+      if(this.form.getFieldValue('startTime')!=""&&data!=""&&start >=end)  
+       {  
+        this.$nextTick(() => {
+          this.form.setFieldsValue({endTime: '' })
+           this.$forceUpdate()
+         })
+        this.$message.error("合同开始时间不能大于合同结束时间！")     
+        return false;  
+        }
+     },
       popupCallback(row){
         this.form.setFieldsValue(pick(row,'conferenceTitle','postedPerson','postedDept','postedDate','conferenceDate','startTime','endTime','conferenceAddress','attendPerson','attendDept','otherPerson','conferenceContent','file'))
       },
@@ -297,4 +337,11 @@
       }
     }
   }
-</script>
+</script>
+<style scoped lang="less">
+
+/deep/ .ant-form-item-control {
+      height: 40px;
+      display: contents;
+} 
+</style>