save

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -486,7 +486,7 @@
                   <div class="TC_TravelSalePlat clearfix" style="font-size: 11px;">
                     <span v-if="item.CustomerName">{{item.CustomerName}}
                     </span>
-                    <span v-if="item.OfferPayType">({{item.OfferPayType}})
+                    <span v-if="item.OfferPayTypeStr">({{item.OfferPayTypeStr}})
                     </span>
                   </div>
                 </div>

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -948,14 +948,14 @@
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.TotalMoney}}</td>
-            <td>{{item.JPYSalePrice}}</td>
+            <td>{{item.JPYTotalMoney}}</td>
             <td colspan="2">
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
             <td colspan="2">
-              <el-input type='text' class="w70" v-model="item.JPYTotalMoney"
-                @keyup.native="checkPrice(item,'JPYTotalMoney',true)" maxlength="8"></el-input>
+              <el-input type='text' class="w70" v-model="item.JPYSalePrice"
+                @keyup.native="checkPrice(item,'JPYSalePrice',true)" maxlength="8"></el-input>
             </td>
             <td colspan="2">
               <el-input type='text' class="w70" v-model="item.ShouPeiFee"
@@ -1557,7 +1557,7 @@
           // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.dayCostPrice)
           // console.log('this.getCurrencyMoney(this.subItem.CurrencyId)', this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId), this.dayCostPrice[0].CurrencyId)
           if(this.dayCostPrice[0] && this.dayCostPrice[0].CurrencyId) {
-            x.JPYSalePrice = ((trip + otherPrice +
+            x.JPYTotalMoney = ((trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           )/this.getCurrencyMoney(this.dayCostPrice[0].CurrencyId)).toFixed(0);
           }

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -687,12 +687,12 @@
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.TotalMoney}}</td>
-            <td>{{item.JPYSalePrice}}</td>
+            <td>{{item.JPYTotalMoney}}</td>
             <td colspan="2">
               {{item.SalePrice}}
             </td>
             <td colspan="2">
-              {{item.JPYTotalMoney}}
+              {{item.JPYSalePrice}}
             </td>
             <td colspan="2">
               {{item.ShouPeiFee}}

src/plug/index.js

@@ -119,8 +119,8 @@ export default {
                 let crmUrl = ""; //crm API
                 let locationName = window.location.hostname;
                 domainUrl = "http://192.168.10.128";
-                domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                 domainUrl = "http://192.168.10.206";
+                // domainUrl = "http://192.168.10.11:8083" // 刘东电脑
+                //  domainUrl = "http://192.168.10.206";
                 // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";