文件修改

src/components/Ticketing/flightChild.vue

@@ -124,9 +124,9 @@
       <tr v-for="(item,index) in DataList" :key="index">
         <td><input type="checkbox" :value="item.ID" /></td>
         <td>{{item.FDateStr}}</td>
-        <td>{{item.Flight_number}}}</td>
-        <td>{{item.CDepartTime}}}</td>
-        <td>{{item.CArrivalTime}}}</td>
+        <td>{{item.Flight_number}}</td>
+        <td>{{item.CDepartTime}}</td>
+        <td>{{item.CArrivalTime}}</td>
         <td>
           <el-row>
             <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
@@ -136,18 +136,18 @@
         </td>
       </tr>
     </table>
-    <div class="noData" v-show="noData">
+    <div class="noData" v-show="DataList.length<=0">
       {{$t('system.content_noData')}}
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper"
       :page-size="msg.pageSize" :total="msg.total">
     </el-pagination>
-    <el-dialog custom-class='flightAddCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
+    <el-dialog custom-class='flightAddCompany' :title="dialogTitle" :visible.sync="outerVisible" center>
       <el-form>
         <table class="flightChildTable" style="border-collapse: collapse;">
           <tr>
             <td width="350">
-              <div style="float:left;margin-left:30px;">
+              <div style="float:left;margin:20px 0 20px 30px;">
                 <div style="margin-bottom:5px;">开始日期：<el-date-picker clearable class="w135" v-model="PostData.StartDate"
                     type="date" :picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
                 </div>
@@ -156,21 +156,21 @@
                     value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
                 </div>
               </div>
-              <select v-model="PostData.UpdateType">
-                <el-option :value="1" :label="全部"></el-option>
-                <el-option :value="2" :label="星期"></el-option>
-              </select>
+              <el-select v-model="PostData.UpdateType" class="w100" style="margin-top:20px;">
+                <el-option :value="1" label="全部"></el-option>
+                <el-option :value="2" label="星期"></el-option>
+              </el-select>
             </td>
             <td>
-              <div v-if="PostData.UpdateType==2" class="FweekList" v-for="item in dateObj">
-                <el-input type="text" v-model="item.week" class="w60"></el-input>
-                <el-date-picker clearable class="w135" v-model="item.CDepartTime" type="date" value-format="yyyy-MM-dd"
+              <div v-if="PostData.UpdateType==1" class="FweekList" v-for="subItem in dateObj2">
+                <span>{{subItem.week}}</span>
+                <el-date-picker clearable class="w135" v-model="subItem.CDepartTime" type="date" value-format="yyyy-MM-dd"
                   :placeholder="$t('admin.admin_choDate')"></el-date-picker>
-                <el-date-picker clearable class="w135" v-model="item.CArrivalTime" type="date" value-format="yyyy-MM-dd"
+                <el-date-picker clearable class="w135" v-model="subItem.CArrivalTime" type="date" value-format="yyyy-MM-dd"
                   :placeholder="$t('admin.admin_choDate')"></el-date-picker>
               </div>
-              <div v-else class="FweekList" v-for="item in dateObj2">
-                <el-checkbox type="text" v-model="item.CheckStatus"  ></el-checkbox>
+              <div v-if="PostData.UpdateType==2" class="FweekList" v-for="item in dateObj">
+                <el-input type="text" v-model="item.week" class="w60"></el-input>
                 <el-date-picker clearable class="w135" v-model="item.CDepartTime" type="date" value-format="yyyy-MM-dd"
                   :placeholder="$t('admin.admin_choDate')"></el-date-picker>
                 <el-date-picker clearable class="w135" v-model="item.CArrivalTime" type="date" value-format="yyyy-MM-dd"
@@ -182,7 +182,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
-        <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
   </div>
@@ -204,7 +204,6 @@
           currentPage: 1,
         },
         loading: true,
-        noData: false,
         PostData: {
           StartDate: "",
           EndDate: "",
@@ -222,7 +221,7 @@
         dateObj2: [{
           week: '全部',
           CDepartTime: '',
-          CArrivalTime: ''
+          CArrivalTime: '',
         }],
         dateObj: [{
             week: '周一',
@@ -280,6 +279,19 @@
             return startTime.getTime() >= time.getTime();
           }
         },
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+              let endTime = new Date(this.msg.QEndDate)
+              return endTime.getTime() < time.getTime()
+          }
+        },
+        pickerBeginDateAfter: {
+          disabledDate: time => {
+              let startTime = new Date(this.msg.QStartDate)
+              return startTime.getTime() >= time.getTime()
+          }
+        },
+
         airlineList: [],
         DataList: [],
       };
@@ -324,15 +336,6 @@
         this.msg.pageIndex = 1;
         this.msg.currentPage = 1;
       },
-      closeChangeMachie(done) {
-        //弹出框关闭初始化弹框内表单
-        done();
-        this.resetForm("addMsg");
-      },
-      resetForm(formName) {
-        //弹出框取消 初始化谈框内表单
-        this.$refs[formName].clearValidate();
-      },
     },
     mounted() {
       this.getList();