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

src/components/Hotel/HotelProductManage2.vue

@@ -665,6 +665,8 @@
             return 'hasStock_5';
           } else if (type === 6) {
             return 'hasStock_6';
+          } else {
+            return 'hasStock_7';
           }
         } else {
           return;
@@ -1167,6 +1169,10 @@
     background-color: #808000;
   }
 
+ .hotelProductManage2_calendarItem>.calendarItem_day>div>.hasStock_7 {
+    background-color: #DDA0DD;
+  }
+
   /* 页面编辑 */
   .hotelProductManage2_edit2 {
     margin: 20px 0 0 0;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -807,7 +807,7 @@
                       </template>
                     </font>
                     =<font style="color:red">
-                      {{Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))}}
+                      {{(Number(getLocalJpyTotalMoney(subItem.PeopleNumber))+Number(getLocalJpyChangeTotalMoney(subItem.PeopleNumber))).toFixed(2)}}
                     </font>
                   </template>
                 </td>
@@ -840,6 +840,7 @@
                         </template>
                       </font>
                       =<font style="color:red">
+                        
                         {{Number(getLocalTotalMoney(subItem.PeopleNumber))+Number(getLocalChangeTotalMoney(subItem.PeopleNumber))}}
                       </font>
                     </template>

src/components/activity/CouponList.vue

@@ -120,16 +120,27 @@
           <span>
             <em>{{$t('MarketingActi.usingRange')}}</em>
             <el-select filterable v-model="msg.couponsUseScope">
-              <el-option :label="$t('active.cl_tongyong')" :value="1"></el-option>
+               <el-option :label="$t('system.ph_buxian')" value=""></el-option>
+              <el-option v-for="(item,index) in ScopeOfUseList" :key="index" :label="item.Name" :value="item.Id"></el-option>
+              <!-- <el-option :label="$t('active.cl_tongyong')" :value="1"></el-option>
               <el-option :label="$t('active.cl_team')" :value="2"></el-option>
               <el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
               <el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
               <el-option :label="$t('scen.sc_piao')" :value="5"></el-option>
               <el-option :label="$t('MarketingActi.car')" :value="6"></el-option>
-              <!-- <el-option :label="$t('MarketingActi.free')" :value="7"></el-option> -->
               <el-option :label="$t('MarketingActi.local')" :value="8"></el-option>
               <el-option :label="$t('hotel.hotel')" :value="9"></el-option>
-                <el-option :label="$t('op.smallteam')" :value="10"></el-option>
+                <el-option :label="$t('op.smallteam')" :value="10"></el-option> -->
+            </el-select>
+          </span>
+        </li>
+         <li>
+          <span>
+            <em>{{$t('objFill.v102.fafangkeix')}}</em>
+            <el-select filterable  v-model="msg.CustomerType">
+              <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
+              <el-option :label="$t('Operation.Op_fellow')" value="0"></el-option>
+                <el-option :label="$t('Operation.Op_direct')" value="1"></el-option>
             </el-select>
           </span>
         </li>
@@ -169,7 +180,7 @@
       </tr>
       <tbody v-loading="loading">
         <tr v-for="(item,index) in DataList" :key="index">
-          <td><span style="color:red;">({{item.customerType==0?$t('Operation.Op_fellow'): $t('Operation.Op_direct')}})</span> {{item.couponsName}}</td>
+          <td>{{item.couponsName}}<span style="color:red;">({{item.customerType==0?$t('Operation.Op_fellow'): $t('Operation.Op_direct')}})</span> </td>
           <td>{{item.couponCount}}</td>
           <td>
             <span class="_couponReceiveCount"
@@ -609,6 +620,7 @@
           groupId: '',
           branchId: '',
           couponsUseScope: "",
+          CustomerType:"-1",
         },
         rules: {
           branchId: [{
@@ -824,6 +836,9 @@
         this.addMsg = Object.assign({}, item);
         console.log("item",item.customerType);
         if (item.couponPriceLists || item.lineId || item.lineteamId || item.effectDate || item.expirationDate) {
+        if(item.lineId>0){
+          this.getLineTeamList(item.lineId);
+        }
           this.getTravelPrciePageList()
         }
       },