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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -803,9 +803,9 @@ export default {
                     if(wechat==null&&zhifu==null&&barcode==""){
                           return;  
                     }
-                    if(zhifu==null&&wechat!=null&&wechat.length>20){
+                    if(zhifu==null&&wechat!=null&&wechat.length>0&&wechat[wechat.length-1].length>20){
                         this.setCode = wechat[wechat.length-1].replace('商户单号','');
-                    }else if(wechat==null&&zhifu!=null&&zhifu.length>20){
+                    }else if(wechat==null&&zhifu!=null&&zhifu.length>0&&zhifu[zhifu.length-1].length>20){
                         this.setCode = zhifu[zhifu.length-1].replace('商家可扫码退款或查询交易','');
                     }else if(barcode!=""){
                         this.setCode=barcode;

src/components/Hotel/roomReservationsDetails.vue

@@ -471,7 +471,14 @@
               {
                  y.UnitPrice=0;
               }
-              y.HotelDiscount = parseInt(y.HotelDiscount);
+              if(y.HotelDiscount)
+              {
+                y.HotelDiscount = parseInt(y.HotelDiscount);
+              }else
+              {
+                y.HotelDiscount =0;
+              }
+             
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
@@ -497,7 +504,13 @@
             subItem.OrderDetailsList.forEach(y => {
               y.HouseTypeCount = parseFloat(y.HouseTypeCount);
               y.UnitPrice = parseInt(y.UnitPrice);
-              y.HotelDiscount = parseInt(y.HotelDiscount);
+             if(y.HotelDiscount)
+              {
+                y.HotelDiscount = parseInt(y.HotelDiscount);
+              }else
+              {
+                y.HotelDiscount =0;
+              }
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
@@ -540,9 +553,8 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
-      let width = window.innerWidth - 50
-      let height = window.innerHeight - 65 -55
-      console.log(height)
+      let width = window.innerWidth - 50;
+      let height = window.innerHeight - 65 -55;
       this.boxHeight = height;
       this.offsetwidth = width
       this.getList();

src/components/busManagement/busHandBook.vue

@@ -20,6 +20,12 @@
     padding-left: 20px;
   }
 
+  .comTextdisClick {
+    background-color: #d1d1d1;
+    color: #fff;
+    border: 1px solid #d1d1d1;
+  }
+
 </style>
 <template>
   <div>
@@ -102,8 +108,9 @@
       <tfoot>
         <tr>
           <td colspan="6">
-            <input type="button" class="normalBtn" @click="SaveData()" value="保存" />
-            <input type="button" class="normalBtn" @click="DownLoadFile()" value="下载" />
+            <input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="SaveData()" value="保存" />
+            <input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="DownLoadFile()"
+              value="下载" />
           </td>
         </tr>
       </tfoot>
@@ -128,20 +135,25 @@
           Remarks: "",
           Details_Extends: []
         },
+        isSave: false,
         TCIDS: ""
       }
     },
     methods: {
       DownLoadFile(item) {
-        let msg = {
-          TCIDS: this.TCIDS
-        };
-        this.loading = true;
-        var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
-        this.GetLocalFile("bus_get_DownLoadBusConfig", msg,fileName,
-          res => {
-            this.loading = false;
-          });
+        if (!this.isSave) {
+          this.isSave = true;
+          let msg = {
+            TCIDS: this.TCIDS
+          };
+          this.loading = true;
+          var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
+          this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName,
+            res => {
+              this.loading = false;
+              this.isSave = false;
+            });
+        }
       },
       GetData() {
         this.loading = true;
@@ -151,22 +163,25 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.DataObj = res.data.data;
-
           } else {
             this.Error(res.data.message);
           }
         }, err => {})
       },
       SaveData() {
-        this.DataObj.TCIDS = this.TCIDS;
-        this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
-          if (res.data.resultCode == 1) {
-            this.Success("操作成功");
-            this.GetData();
-          } else {
-            this.Error(res.data.message);
-          }
-        }, err => {})
+        if (!this.isSave) {
+          this.isSave = true;
+          this.DataObj.TCIDS = this.TCIDS;
+          this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
+            if (res.data.resultCode == 1) {
+              this.Success("操作成功");
+              this.GetData();
+            } else {
+              this.Error(res.data.message);
+            }
+            this.isSave = false;
+          }, err => {})
+        }
       }
     },
     mounted() {