Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/CustomerCertification.vue

@@ -60,7 +60,7 @@
                   class="normalBtn mt20 fr"
                   v-if="item.ApplyState === 0"
                   value="通过"
-                  @click="saveIdea(item,1)"
+                  @click="saveIdea(item,3)"
                 />
                 <input
                   type="button"
@@ -154,7 +154,7 @@
         <th width="10%">操作</th>
       </tr>
       <tr>
-        <td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
+        <td colspan="9" align="center" v-show="list.length==0">暂无数据</td>
       </tr>
       <tr v-for="(item,index) in list">
         <td>{{item.CustomerName}}</td>

src/components/Ticketing/flightManagement.vue

@@ -618,6 +618,8 @@
         {
           this.addMsg.synchronization=0;
         }
+        this.checkIsRightTime(this.addMsg.Departure_time,1);
+        this.checkIsRightTime(this.addMsg.Arrival_time,2);
         this.apipost(
           "flight_post_Set",
           this.addMsg,
@@ -634,6 +636,20 @@
           err => {}
         );
       },
+
+      checkIsRightTime(time,type){
+          let arrTime = time.split(':');
+          if (arrTime[1]>24 || arrTime[2]>60)
+          {
+              if(type==1){
+                this.Error('请输入正确的起飞时间格式！');
+              }
+              if(type==2){
+                this.Error('请输入正确的到达时间格式！');
+              }
+          }
+      },
+
       //提交创建、修改表单
       submitForm(addMsg) {
         this.$refs[addMsg].validate(valid => {

src/components/administrative/custumerXzCertification.vue

@@ -154,7 +154,7 @@
         <th width="10%">操作</th>
       </tr>
       <tr>
-        <td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
+        <td colspan="9" align="center" v-show="list.length==0">暂无数据</td>
       </tr>
       <tr v-for="(item,index) in list">
         <td>{{item.CustomerName}}</td>