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

src/assets/utils/calendarUtils.js

@@ -179,15 +179,12 @@ var calendarUtils = {
    */
   isDateBetween: function (dateString, startDateString, endDateString) {
     if (calendarUtils.isEmpty(dateString)) {
-      console.log("dateString不能为空");
       return;
     }
     if (calendarUtils.isEmpty(startDateString)) {
-      console.log("startDateString不能为空");
       return;
     }
     if (calendarUtils.isEmpty(endDateString)) {
-      console.log("endDateString不能为空");
       return;
     }
     var flag = false;
@@ -208,11 +205,9 @@ var calendarUtils = {
    */
   dateCompare: function (dateString, compareDateString) {
     if (calendarUtils.isEmpty(dateString)) {
-      console.log("dateString不能为空");
       return;
     }
     if (calendarUtils.isEmpty(compareDateString)) {
-      console.log("compareDateString不能为空");
       return;
     }
     var dateTime = calendarUtils.dateParse(dateString).getTime();

src/assets/utils/googleMap.js

@@ -132,9 +132,7 @@ var googleMap = {
         googleMap.geocoder.geocode({ 'address': address }, function (results, status) {
             if (status == google.maps.GeocoderStatus.OK) {
                 googleMap.getAddress(results,1);
-            } else {
-                console.log("对不起没有找到相关的地理位置信息,请点击地图上的准确位置，进行定位!");
-            }
+            } 
         });
     },
     placeMarker: function (location) {
@@ -143,9 +141,7 @@ var googleMap = {
             googleMap.geocoder.geocode({ 'location': location }, function (results, status) {
                 if (status == google.maps.GeocoderStatus.OK) {
                     googleMap.getAddress(results, 1);
-                } else {
-                    console.log("对不起没有找到相关的地理位置信息,请点击地图上的准确位置，进行定位!");
-                }
+                } 
             });
         }
     },

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1163,11 +1163,8 @@ export default {
         },
         Financial_post_GetCostTypeList(id,type){  //获取支出费用类型
             this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
-                console.log("this.res",res.data)
-
                 if(res.data.resultCode == 1) {
                     this.GetCostTypeList = res.data.data;
-                    console.log("this.GetCostTypeList",this.GetCostTypeList)
                     if(type){
                         this.msg.detailList.forEach(x=>{
                             this.GetCostTypeList.forEach(y=>{

src/components/FinancialModule/refundQuery.vue

@@ -70,7 +70,7 @@
                 <li>
                     <span>
                         <em>财务单据</em>
-                        <el-input type="text" v-model="msg.FinanceId" :placeholder="$t('pub.pleaseImport')"></el-input>
+                        <el-input type="text" v-model="msg.FinanceId"  @keyup.native="checkInteger(msg,'FinanceId')" :placeholder="$t('pub.pleaseImport')"></el-input>
                     </span>
                 </li>
                 <li>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1038,7 +1038,7 @@
             coefficient = 1 + 0.08;
           }
           if (obj.PayStyle === 1 || obj.PayStyle === 11) {
-            if (index == 4 && obj.DMCPayType !== 1) {
+            if (index == 4 && obj.DMCPayType !== 1 && obj.DMCPayType !== 11) {
               totalPrice += 0;
             } else {
               totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /

src/plug/index.js

@@ -91,7 +91,6 @@ export default {
             }
           })
         } catch (error) {
-          console.log(error)
         }
         return Math.floor(yuHeight / itemHeight)
       }
@@ -112,10 +111,7 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        // domainUrl = "http://testapi.oytour.com";
-        // domainUrl = "http://192.168.2.214:8082";
-        domainUrl = "http://192.168.2.65:8025";
-        // domainUrl = "http://192.168.2.16:8083";
+        domainUrl = "http://192.168.2.214:8082";
         let locationName = window.location.hostname;
 
         let javaUrldo="";
@@ -140,7 +136,7 @@ export default {
           //阿里服务器地址
           AliUrl: "https://reborndev.oss-cn-hangzhou.aliyuncs.com",
           //本站文件流下载地址
-          LocalFileStreamDownLoadUrl: domainUrl + "/·api/file/GetFileFromWebApi",
+          LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
           //PDF文件预览地址
           PDFViewUrl: domainUrl + "/plug/pdf/web/viewer.html?file=",
           //SocketUrl
@@ -661,7 +657,7 @@ export default {
               successCall(result);
             }
           }).catch(function (err) {
-            console.log(err);
+            
           });
         }
       },
@@ -686,7 +682,7 @@ export default {
                 })
             }
           }).catch(function (err) {
-            console.log("上传文件出错" + err);
+  
           });
         }
       }