Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/caseManagement/components/caseentryDialog.vue

@@ -43,6 +43,7 @@
                 v-model="formData.loanStartDate"
                 type="datetime"
                 placeholder="借款开始日期"
+                @change="setStartTime"
               >
               </el-date-picker>
             </el-form-item>
@@ -53,6 +54,7 @@
                 v-model="formData.loanEndDate"
                 type="datetime"
                 placeholder="借款结束日期"
+                @change="setEndTime"
               >
               </el-date-picker>
             </el-form-item>
@@ -361,13 +363,13 @@
           </el-row>
         </div>
       </el-form>
-      <el-button
+      <!-- <el-button
         v-if="flag == 1 || flag == 2"
         type="primary"
         plain
         @click="generateForm"
         >新增申请人主体信息</el-button
-      >
+      > -->
       <!-- 被申请人主体信息 -->
       <el-form
         ref="form3"
@@ -575,13 +577,13 @@
           </el-row>
         </div>
       </el-form>
-      <el-button
+      <!-- <el-button
         v-if="flag == 1 || flag == 2"
         type="primary"
         plain
         @click="generateForm1()"
         >新增被申请人主体信息</el-button
-      >
+      > -->
       <div slot="footer" class="dialog-footer">
         <el-button
           type="primary"
@@ -803,6 +805,26 @@ export default {
     cancel() {
       this.$emit("cancel");
     },
+    // 校验借款开始日期与结束日期
+    setStartTime() {
+      if ( this.setTime(this.formData.loanStartDate) >= this.setTime(this.formData.loanEndDate) ) {
+        this.$message.error('借款开始日期应早于借款结束日期');
+        this.formData.loanStartDate = '';
+        this.formData.loanEndDate = '';
+      }
+    },
+    setEndTime() {
+      if ( this.setTime(this.formData.loanEndDate) <= this.setTime(this.formData.loanStartDate) ) {
+        this.$message.error('借款结束日期应晚于借款开始日期');
+        this.formData.loanStartDate = '';
+        this.formData.loanEndDate = '';
+      }
+    },
+    setTime(val) {
+      const date = new Date(val)
+      const time = date.getTime()
+      return time
+    },
 
     // 新增申请人主体信息
     generateForm() {
@@ -904,6 +926,9 @@ export default {
   background: #ffffff;
   border-radius: 20px;
 }
+.el-date-editor {
+  width: 100%;
+}
 .endbutton {
   width: 154px;
   height: 37px;