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

src/components/FinancialModule/RecPayQuery.vue

@@ -480,6 +480,7 @@
         <el-table-column prop="" :label="$t('fnc.jine')">
           <template slot-scope="scope">
             <span>
+              <p v-if="scope.row.IsForeignCurrency==1" style="line-height:20px">原币：<span>{{scope.row.WBMoney}}{{scope.row.CurrencyName}}</span></p>
               <p style="line-height:20px">{{scope.row.Type==1?$t('fnc.yingshou'):$t('fnc.yingfu')}}：<span>{{scope.row.Money}}</span></p>
               <p style="line-height:20px">{{scope.row.Type==1?$t('fnc.shishou'):$t('fnc.shifu')}}：<span>{{scope.row.PayMoney}}</span></p>
               <p v-if="scope.row.IsAdvanceFinance==1" style="line-height:20px">{{$t('objFill.balanceout')}}：<span>{{scope.row.MatchMoney}}</span>

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -122,8 +122,8 @@
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
-                  <el-input class='w135' v-model='childItem.UsePeopleNum'
-                    @keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
+                  <el-input class='w135' v-model='childItem.UsePeopleNum' @input='calculationPrice(subItem)'
+                    @keyup.native="checkInteger(childItem,'UsePeopleNum')"  type="text"></el-input>
                 </template>
                 <template v-else>
                   {{childItem.UsePeopleNum}}
@@ -131,7 +131,7 @@
               </td>
               <td>
                 <template v-if="EditBtn||LineId==90">
-                  <el-input class='w135' v-model='childItem.PeoplePrice'
+                  <el-input class='w135' v-model='childItem.PeoplePrice' @input='calculationPrice(subItem)'
                     @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
                 </template>
                 <template v-else>

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -215,17 +215,29 @@
             <span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'"
               @click="goUrlTCList(item)">{{item.TCID}}</span>
             <br />
-            <template v-if="item.TeamType==0">
-              <span style="font-weight:blod;">散拼(<template v-if="item.OrderLeaderGuestNum>0">V</template><template
-                  v-else>S</template>)</span>
+            <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName!=''">
+              <span style="font-weight:blod;">{{item.PriceTeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
+                  <el-tooltip class="item" effect="dark" content="需要领队" placement="top">
+                    <font>V</font>
+                  </el-tooltip>
+                </template><template v-else>
+                  <el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
+                    <font>S</font>
+                  </el-tooltip>
+                </template>)</span>
             </template>
-            <template v-if="item.TeamType==1">
-              <span style="font-weight:blod;">小包团(<template v-if="item.OrderLeaderGuestNum>0">V</template><template
-                  v-else>S</template>)</span>
-            </template>
-            <template v-if="item.TeamType==2">
-              <span style="font-weight:blod;">当地游(<template v-if="item.OrderLeaderGuestNum>0">V</template><template
-                  v-else>S</template>)</span>
+            <template v-else>
+              <span style="font-weight:blod;">{{item.TeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
+                  <el-tooltip class="item" effect="dark" content="需要领队" placement="top">
+                    <font>V</font>
+                  </el-tooltip>
+                </template>
+                <template v-else>
+                  <el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
+                    <font>S</font>
+                  </el-tooltip>
+                </template>)
+              </span>
             </template>
           </td>
           <td>{{item.InOut}}</td>

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -195,14 +195,29 @@
           <td>
             <span>{{item.TCNUM}}({{item.TCID}})</span>
             <br />
-            <template v-if="item.TeamType==0">
-              <span style="font-weight:blod;">散拼</span>
+           <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName!=''">
+              <span style="font-weight:blod;">{{item.PriceTeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
+                  <el-tooltip class="item" effect="dark" content="需要领队" placement="top">
+                    <font>V</font>
+                  </el-tooltip>
+                </template><template v-else>
+                  <el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
+                    <font>S</font>
+                  </el-tooltip>
+                </template>)</span>
             </template>
-            <template v-if="item.TeamType==1">
-              <span style="font-weight:blod;">小包团</span>
-            </template>
-            <template v-if="item.TeamType==2">
-              <span style="font-weight:blod;">当地游</span>
+            <template v-else>
+              <span style="font-weight:blod;">{{item.TeamTypeName}}(<template v-if="item.OrderLeaderGuestNum>0">
+                  <el-tooltip class="item" effect="dark" content="需要领队" placement="top">
+                    <font>V</font>
+                  </el-tooltip>
+                </template>
+                <template v-else>
+                  <el-tooltip class="item" effect="dark" content="不需要领队" placement="top">
+                    <font>S</font>
+                  </el-tooltip>
+                </template>)
+              </span>
             </template>
           </td>
           <td>{{item.StartDateStr}}</td>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -100,7 +100,7 @@
               <td>
                 <template v-if="EditBtn||LineId==90">
                   <el-input class='w135' v-model='childItem.PeoplePrice'
-                    @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
+                    @keyup.native="checkPrice(childItem,'PeoplePrice')"  @input='calculationPrice(subItem)' type="text"></el-input>
                 </template>
                 <template v-else>
                   <span class="spanlink" v-if='childItem.PeoplePrice==0'
@@ -116,7 +116,7 @@
               <td>
                 <template v-if="EditBtn||LineId==90">
                   <el-input class='w135' v-model='childItem.DiscountPrice'
-                    @keyup.native="checkPrice(childItem,'DiscountPrice')" type="text"></el-input>
+                    @keyup.native="checkPrice(childItem,'DiscountPrice')"  @input='calculationPrice(subItem)' type="text"></el-input>
                 </template>
                 <template v-else>
                   <span class="spanlink" v-if='childItem.DiscountPrice==0'