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

src/components/ShoppingStore/ShoppingStore.vue

@@ -465,7 +465,9 @@
   .IsConflict td {
     background-color: pink !important;
   }
+
   /* 购物店 */
+
 </style>
 <template>
   <div class="flexOne shoppingStore">
@@ -640,7 +642,7 @@
             </el-form-item>
           </li>
           <li>
-            <el-form-item :label="$t('hotel.hotel_mapLocation')" prop="Address">
+            <el-form-item :label="$t('hotel.hotel_mapLocation')">
               <div class="addressChoice">
                 <input type="text" v-model="addMsg.Address" class="addChoice">
                 <span class="addressIcon" @click="selectAddress = true"><i class="iconfont icon-img_dw"></i></span>
@@ -739,34 +741,39 @@
               <td>{{item.EnterTime}}</td>
               <td :class="{'redType':item.GuideID==0}">
                 <span>{{item.GuideName}}
-                <span v-if="(item.GuideID>0||item.GuideName.length>0)&&item.TCIDExist>-1">
-                  {{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
-                </span>
+                  <span v-if="(item.GuideID>0||item.GuideName.length>0)&&item.TCIDExist>-1">
+                    {{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
+                  </span>
                 </span>
               </td>
               <td :class="{'redType':item.LeaderID==0}">
                 <span>{{item.LeaderName}}
                   <span v-if="(item.LeaderID>0||item.LeaderName.length>0)&&item.TCIDExist>-1">
-                  {{item.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
-                </span>
+                    {{item.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
+                  </span>
                 </span>
               </td>
-              <td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName" style="color:red">[{{$t('objFill.youwu')}}]</span></td>
-              <td>{{item.ImportLeaderName}}<span v-if="item.IsErrorData==1 && item.LeaderName != item.ImportLeaderName" style="color:red">[{{$t('objFill.youwu')}}]</span></td>
+              <td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName"
+                  style="color:red">[{{$t('objFill.youwu')}}]</span></td>
+              <td>{{item.ImportLeaderName}}<span v-if="item.IsErrorData==1 && item.LeaderName != item.ImportLeaderName"
+                  style="color:red">[{{$t('objFill.youwu')}}]</span></td>
               <td>{{item.TotalPrice}}</td>
               <td :class="{'redType':item.GroupExtractExist==-1}">
                 <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
-                  <span style=" cursor: pointer; ">  {{item.GroupExtract}}  </span></el-tooltip>
-               </td>
+                  <span style=" cursor: pointer; "> {{item.GroupExtract}} </span></el-tooltip>
+              </td>
               <td :class="{'redType':item.LeaderExtractExist==-1}">
                 <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
-                  <span style=" cursor: pointer; ">{{item.LeaderExtract}} </span></el-tooltip></td>
+                  <span style=" cursor: pointer; ">{{item.LeaderExtract}} </span></el-tooltip>
+              </td>
               <td :class="{'redType':item.GuideExtractExist==-1}">
                 <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
-                  <span style=" cursor: pointer; ">{{item.GuideExtract}} </span></el-tooltip> </td>
+                  <span style=" cursor: pointer; ">{{item.GuideExtract}} </span></el-tooltip>
+              </td>
               <td :class="{'redType':item.PICExtractExist==-1}">
                 <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
-                  <span style=" cursor: pointer; ">{{item.PICExtract}} </span></el-tooltip></td>
+                  <span style=" cursor: pointer; ">{{item.PICExtract}} </span></el-tooltip>
+              </td>
               <td>{{item.Rate}}</td>
               <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
               <td>{{item.Remarks}}</td>
@@ -794,13 +801,15 @@
         <div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
       </el-upload>
 
-      <div>--------------------------------------------------------------------------------------------------------------------</div>
+      <div>
+        --------------------------------------------------------------------------------------------------------------------
+      </div>
 
       <div style="text-align:center; margin-bottom:5px;color:tomato;">{{$t('objFill.v101.xinbtdmsgwd')}}</div>
-       <el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess"
+      <el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess"
         :before-upload="beforeAvatarUpload">
         <i class="el-icon-upload"></i>
-          <div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
+        <div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
         <div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
 
       </el-upload>
@@ -825,13 +834,13 @@
         defaultImg: 'this.src="' + require("../../assets/img/shoppingstore.jpg") + '"',
         importFileUrl2: this.domainManager().UploadFileUrl +
           "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=1",
-          importFileUrl3: this.domainManager().UploadFileUrl +
+        importFileUrl3: this.domainManager().UploadFileUrl +
           "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=20&RB_Group_id=2&Type=20",
         downList: "",
         TotalPrice: "",
         GroupExtract: "",
         GuideExtract: "",
-        PICExtract:"",
+        PICExtract: "",
         LeaderExtract: "",
         getShoppType: "",
         isShow: false,
@@ -1073,7 +1082,7 @@
             TotalPrice: item.TotalPrice,
             GroupExtract: item.GroupExtract,
             GuideExtract: item.GuideExtract,
-            PICExtract : item.PICExtract,
+            PICExtract: item.PICExtract,
             LeaderExtract: item.LeaderExtract,
             blank: 'y',
             tab: '购物店明细'
@@ -1283,7 +1292,7 @@
               if (res.data.resultCode == 1) {
                 that.tabLoading = false;
                 that.fillShow = false;
-                that.Success(this.$t('objFill.v101.daoruchengg')+'!');
+                that.Success(this.$t('objFill.v101.daoruchengg') + '!');
                 that.getList();
               } else {
                 that.Error(res.data.message);

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -667,9 +667,9 @@
         <li>
           <span class="hotel_name">
             <em>{{$t('system.ph_flightTime')}}</em>
-            <DateLimit :clearable="false" :StartGroupDate="Query.QNeedDateStart" :EndGroupDate="Query.QNeedDateEnd"
-              @change="(date)=> Query.QNeedDateStart = date"></DateLimit>
-            <el-date-picker class="w150" v-model="Query.QNeedDateEnd" type="date" value-format="yyyy-MM-dd"
+            <DateLimit :clearable="false" :StartGroupDate="Query.QFlightDateStart" :EndGroupDate="Query.QFlightDateEnd"
+              @change="(date)=> Query.QFlightDateStart = date"></DateLimit>
+            <el-date-picker class="w150" v-model="Query.QFlightDateEnd" type="date" value-format="yyyy-MM-dd"
               placeholder="" :picker-options="pickerBeginDateAfter">
             </el-date-picker>
           </span>
@@ -951,9 +951,9 @@
           //是否往返
           TicketType: 0,
           //起飞时间
-          QNeedDateStart: "",
+          QFlightDateStart: "",
           //起飞结束日期
-          QNeedDateEnd: "",
+          QFlightDateEnd: "",
           //航空公司编号
           AirLineID: 0,
           //航班号
@@ -1005,13 +1005,13 @@
         UseNum_placeholder: "",
         pickerBeginDateBefore: {
           disabledDate: time => {
-            let endTime = new Date(this.Query.QNeedDateEnd);
+            let endTime = new Date(this.Query.QFlightDateEnd);
             return endTime.getTime() < time.getTime();
           }
         },
         pickerBeginDateAfter: {
           disabledDate: time => {
-            let startTime = new Date(this.Query.QNeedDateStart);
+            let startTime = new Date(this.Query.QFlightDateStart);
             return startTime.getTime() >= time.getTime();
           }
         },
@@ -1027,7 +1027,7 @@
 
           } else {
             let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
-            this.Query.QNeedDateStart = StartDate
+            this.Query.QFlightDateStart = StartDate
           }
         });
       },
@@ -1191,7 +1191,7 @@
       this.getAllEmployeeList();
     },
     mounted() {
-      this.Query.QNeedDateStart = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
+      this.Query.QFlightDateStart = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
       this.GetSupperOrderEditAuth()
       this.getEmployeeList();
       this.GetLineList();