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

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -836,6 +836,7 @@
       downloadFile(fileUrl, fileName) {
         const link = document.createElement('a');
         link.href = fileUrl;
+        link.target="_blank";
         link.download = fileName;
         document.body.appendChild(link);
         link.click();

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -587,8 +587,8 @@
                 </p>
               </template>
               <template>
-                <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
-                  :loading="importOfferLoading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
+                <el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading"
+                  @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
                 </el-button>
               </template>
             </td>
@@ -620,6 +620,7 @@
         AduitMsg: {
 
         },
+        downLoadloading: false,
       }
     },
     methods: {
@@ -682,6 +683,7 @@
         const link = document.createElement('a');
         link.href = fileUrl;
         link.download = fileName;
+        link.target = "_blank";
         document.body.appendChild(link);
         link.click();
       },
@@ -701,9 +703,9 @@
           }
         }
         fileName += ".xls"
-        this.loading = true;
+        this.downLoadloading = true;
         this.GetLocalFile("quotation_get_DownLoadQuotation", downMsg, fileName, res => {
-          this.loading = false;
+          this.downLoadloading = false;
         });
       },
       //调用父组件方法

src/components/dmc/manager/GroupOutCorporationAudit.vue

@@ -39,8 +39,9 @@
           <span>
             <em>{{$t('objFill.v101.dmc.chutrq')}}</em>
             <el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd"
-              size="small" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"
-              @change="getStartTime" clearable>
+              size="small" type="daterange" :range-separator="$t('OrderList.zhi')"
+              :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" @change="getStartTime"
+              clearable>
             </el-date-picker>
           </span>
         </li>
@@ -58,21 +59,23 @@
             @click="goTravel(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
         </template>
       </el-table-column>
-      <el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="StartDate" :label="$t('hotel.hotel_StarDate')" width="120" show-overflow-tooltip>
+      </el-table-column>
       <el-table-column prop="LtName" :label="$t('advmanager.v_xilie')" width="200" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{scope.row.LineName}}</br>
+          {{scope.row.LineName}}<br />
           {{scope.row.LtName}}
         </template>
       </el-table-column>
-      <el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="Title" :label="$t('Operation.Op_TeamName')" width="200" show-overflow-tooltip>
+      </el-table-column>
       <el-table-column prop="" :label="$t('visaT.Applicant')+'/'+$t('objFill.shengqirq')" width="200">
         <template slot-scope="scope">
           <p> {{scope.row.BranchApplyName}}</p>
           <p> {{scope.row.BranchApplyTime}}</p>
         </template>
       </el-table-column>
-      <el-table-column prop="OPName" :label="$t('objFill.shengqyy')" show-overflow-tooltip>
+      <el-table-column prop="OPName" :label="$t('objFill.v101.dmc.shengqyy')" show-overflow-tooltip>
         <template slot-scope="scope">
           {{scope.row.BranchApplyResion}}
         </template>
@@ -94,10 +97,12 @@
       <el-table-column prop="" :label="$t('system.table_operation')" width="150">
         <template slot-scope="scope">
           <div class="_icon_btn">
-            <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top" v-if="scope.row.BranchAuditState==1">
+            <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top"
+              v-if="scope.row.BranchAuditState==1">
               <i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top" v-if="scope.row.BranchAuditState==1">
+            <el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top"
+              v-if="scope.row.BranchAuditState==1">
               <i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i>
             </el-tooltip>
           </div>
@@ -105,20 +110,22 @@
       </el-table-column>
     </el-table>
     <div style="width: 100%;">
-      <el-pagination background  @current-change="handleCurrentChange"
-        :current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper"
-          :page-size="msg.pageSize" :total="total">
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
+        layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
       </el-pagination>
     </div>
 
     <el-dialog custom-class="w600" :title="$t('objFill.bohuiyy')" :visible.sync="cancelOrderDialog">
       <div style="padding-bottom:20px">
-        <el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.v101.dmc.qingtxbtyy')" clear="w300" v-model="cancelRemark">
+        <el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.v101.dmc.qingtxbtyy')" clear="w300"
+          v-model="cancelRemark">
         </el-input>
         <el-row :gutter="20" style="margin-top: 20px;">
           <el-col :span="24" style="text-align: right;">
-            <el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">{{$t('objFill.v101.dmc.quedinbh')}}</el-button>
-            <el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">{{$t('pub.closeSel')}}</el-button>
+            <el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">
+              {{$t('objFill.v101.dmc.quedinbh')}}</el-button>
+            <el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">{{$t('pub.closeSel')}}
+            </el-button>
           </el-col>
         </el-row>
       </div>
@@ -353,7 +360,6 @@
       }
     }
   }
-
 </script>
 <style scoped>
   .groupApproval .singeRowTable {
@@ -424,5 +430,4 @@
   ._icon_btn i.icon-mingxi {
     background-color: rgb(71, 191, 140)
   }
-
-</style>
+</style>
\ No newline at end of file