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

src/components/FinancialModule/RecPayQuery.vue

@@ -938,6 +938,9 @@ export default {
             this.msg.BankID=this.$route.query.BankID;
             this.transactionDate[0]=this.$route.query.StartDate;
             this.transactionDate[1]=this.$route.query.StartDate;
+            this.msg.sTradeDate=this.$route.query.StartDate;
+            this.msg.eTradeDate=this.$route.query.StartDate;
+
             if(this.$route.query.BankID==''){
                 // 费用类型：机票折让费
                 this.msg.CostTypeID=197;

src/components/Hotel/HotelDiscount.vue

@@ -157,8 +157,8 @@
                 </el-date-picker>
             </el-form-item>
           </div>
-          <div style="margin-bottom:5px">
-            收款账户 ：日本地接部专户（人民币）
+          <div style="margin-bottom:16px;margin-left:14px">
+            收款账户 <span style="padding-left:10px">日本地接部专户（人民币）</span>
           </div>
           <el-form-item label="折让金额" prop="Money">
               <el-input v-model="addMsg.Money" @keyup.native="checkInteger(addMsg,'Money')" placeholder="单间折让金额"></el-input>
@@ -341,11 +341,13 @@ export default {
                             this.addMsg.QEndDate=''; 
                         }
                     }
-
+                    this.Btnloading=true;
                     this.apipost("Financial_post_SetHotelServiceBetchImport", this.addMsg, res => {
                         if (res.data.resultCode == 1) {
                             this.getList();
                             this.moneyR=false;
+                            this.Btnloading=false;
+
                         }
                         else{
                             this.Error(res.data.message);

src/components/index.vue

@@ -1121,7 +1121,7 @@
       </div>
       <div style="text-align:center">
         <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
-        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/19" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
+        <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/25" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
       </div>
       </div>      
      </div>
@@ -1164,7 +1164,7 @@ export default {
       articleId:0,
       createEmpId:0,
       tsState:false,
-      tsNumber:6,
+      tsNumber:7,
       saleRnkShow: false,
       dialogTitleNot: '',
       outerVisibleNot: false,