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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1291,9 +1291,9 @@
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }
                 if (x.CostTypeName.indexOf('房费送客手数料') != -1 && y.Type == 5) {
-                  if(x.UnitPrice<0){  y.Unit_Price=- x.UnitPrice}
+                  if(x.UnitPrice<0){  y.Unit_Price=this.RoundItUp(parseFloat(-(x.UnitPrice*0.55)).toFixed(2))}
                   else{
-                    y.Unit_Price=x.UnitPrice
+                    y.Unit_Price=this.RoundItUp(parseFloat(x.UnitPrice*0.55).toFixed(2))
                   }
                   y.Num=x.Number
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
@@ -1301,17 +1301,17 @@
                 if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) {
                   y.Num=x.Number
                   if(x.UnitPrice<0){
-                    y.Unit_Price=-x.UnitPrice;   }
+                    y.Unit_Price=this.RoundItUp(parseFloat(-(x.UnitPrice*0.55)).toFixed(2))}
                   else{
-                    y.Unit_Price=x.UnitPrice
+                    y.Unit_Price=this.RoundItUp(parseFloat(x.UnitPrice*0.55).toFixed(2))
                   }
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }
                 if (x.CostTypeName.indexOf('门票送客手数料') != -1 && y.Type == 7) {
                   y.Num=x.Number
-                  if(x.UnitPrice<0){  y.Unit_Price=-x.UnitPrice}
+                  if(x.UnitPrice<0){  y.Unit_Price=this.RoundItUp(parseFloat(-(x.UnitPrice*0.55)).toFixed(2))}
                   else{
-                    y.Unit_Price=x.UnitPrice
+                    y.Unit_Price=this.RoundItUp(parseFloat(x.UnitPrice*0.55).toFixed(2))
                   }
                   y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
                 }

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -307,7 +307,7 @@
         if(type&&type==1){
           this.TemplateUrl=`${href}?uid=${this.userInfo.EmployeeId}&model=1`
         }else{
-          this.TemplateUrl=`${href}?ConfigId=${this.FeatureData.ConfigId}`
+          this.TemplateUrl=`${href}?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}`
         }
         this.dialogPptistVisible = true
       },