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

src/components/Hotel/roomReservationsDetails.vue

@@ -493,6 +493,7 @@
                           <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
                           <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
                           <el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option>
+                           <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
                         </el-select>
                       </td>
                     </tr>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -165,6 +165,7 @@
           <span v-else-if="item.PayType === 7">自由活动-无用车</span>
           <span v-else-if="item.PayType === 6">合团公司支付</span>
           <span v-else-if="item.PayType === 8">酒店接送</span>
+          <span v-else-if="item.PayType === 15">{{$t('ground.enterpriseAlipay')}}</span>
           <span v-else></span>
           <br />
           <span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
@@ -364,10 +365,10 @@
             </td>
             <td style="white-space:nowrap; ">
               <span v-if="childItem.HouseType != 5">
-                {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
+                {{subItem.PayStyle === 1||subItem.PayStyle === 11||subItem.PayStyle === 15 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
               </span>
               <span v-else>
-                {{(subItem.DMCPayType === 1||subItem.DMCPayType === 11) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
+                {{(subItem.DMCPayType === 1||subItem.DMCPayType === 11||subItem.DMCPayType === 15) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
               </span>
             </td>
             <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
@@ -434,6 +435,7 @@
               <span v-else-if="subItem.PayStyle === 11">刷卡</span>
               <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
               <span v-else-if="subItem.PayStyle === 14">转账</span>
+              <span v-else-if="subItem.PayStyle === 15">{{$t('ground.enterpriseAlipay')}}</span>
               <span v-else></span>
               <br />
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
@@ -457,6 +459,7 @@
               <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
               <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
               <span v-else-if="subItem.DMCPayType === 14">转账</span>
+              <span v-else-if="subItem.DMCPayType === 15">{{$t('ground.enterpriseAlipay')}}</span>
               <br />
               <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
@@ -473,6 +476,7 @@
                   <span v-else-if="subItem.SupplierPayType == 9">月结</span>
                   <span v-else-if="subItem.SupplierPayType == 11">刷卡</span>
                   <span v-else-if="subItem.SupplierPayType == 10">领队导游垫付</span>
+                  <span v-else-if="subItem.SupplierPayType === 15">{{$t('ground.enterpriseAlipay')}}</span>
                 </template>
               </span>
               <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">无手配费</div>
@@ -603,7 +607,7 @@
               </p>
             </td>
             <td>
-              {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
+              {{subItem.PayStyle === 1||subItem.PayStyle === 11||subItem.PayStyle === 15 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
@@ -618,6 +622,7 @@
               <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
               <span v-else-if="subItem.PayStyle === 11">刷卡</span>
               <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
+              <span v-else-if="subItem.PayStyle === 15">{{$t('ground.enterpriseAlipay')}}</span>
               <span v-else></span>
               <br />
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
@@ -737,7 +742,7 @@
               </p>
             </td>
             <td>
-              {{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
+              {{subItem.PayStyle === 1||subItem.PayStyle === 15 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
@@ -752,6 +757,7 @@
               <span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
               <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
               <span v-else-if="subItem.PayStyle === 12">网订</span>
+              <span v-else-if="subItem.PayStyle === 15">{{$t('ground.enterpriseAlipay')}}</span>
               <span v-else></span>
               <br />
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
@@ -1800,8 +1806,8 @@
           if (obj.TaxType == 2) {
             coefficient = 1 + 0.1;
           }
-          if (obj.PayStyle === 1 || obj.PayStyle === 11) {
-            if (index == 4 && obj.DMCPayType !== 1 && obj.DMCPayType !== 11) {
+          if (obj.PayStyle === 1 || obj.PayStyle === 11|| obj.PayStyle === 15) {
+            if (index == 4 && obj.DMCPayType !== 1 && obj.DMCPayType !== 11&& obj.DMCPayType !== 15) {
               totalPrice += 0;
             } else {
               totalPrice +=
@@ -1827,7 +1833,7 @@
             (x.UsePeopleNum - x.Discount) *
             (1 - x.DiscountPrice / 100);
         });
-        if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
+        if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11|| sObj.PayStyle === 15)) {
           totalPrice = 0;
         }
         return this.moneyFormat(totalPrice);
@@ -1840,7 +1846,7 @@
             (x.UsePeopleNum - x.Discount) *
             (1 - x.DiscountPrice / 100);
         });
-        if (sObj.PayStyle !== 1) {
+        if (sObj.PayStyle !== 1||sObj.PayStyle !== 15) {
           totalPrice = 0;
         }
         return this.moneyFormat(totalPrice);

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -195,6 +195,7 @@
                         <el-option :label='$t("ground.lingduidydf")' :value='10'></el-option>
                         <el-option :label='$t("ground.gongsihetzf")' :value='6'></el-option>
                         <el-option :label='$t("ground.shuaka")' :value='11'></el-option>
+                         <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
                       </el-select>
                     </td>
                   </tr>

src/components/busManagement/BusInfo.vue

@@ -324,6 +324,7 @@
                   <el-option :label="$t('ground.htgszf')" :value='6'></el-option>
                   <el-option :label="$t('ground.zyhdwyc')" :value='7'></el-option>
                   <el-option :label="$t('ground.jdjiesong')" :value='8'></el-option>
+                   <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
                 </el-select>
               </div>
             </template>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -155,6 +155,7 @@
                         <el-option label='实物抵扣' value='5'></el-option>
                         <el-option label='预付' value='4'></el-option>
                         <el-option label='网订' value='12'></el-option>
+                         <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
                       </el-select>
                     </td>
                   </tr>