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

src/assets/css/cssReset.css

@@ -623,4 +623,7 @@ vertical-align:middle
     font-size: 120px;
     color: #ccc;
 }
+.column-cell-class-text-red{
+    color: red !important
+}
 /************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file

src/components/Ticketing/TicketManager.vue

@@ -2069,6 +2069,14 @@
                 <el-input v-model="sales.B2CPrice" @keyup.native="checkPrice(sales,'B2CPrice')"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="是否特惠" prop="IsDiscounts">
+                 <el-select v-model="sales.IsDiscounts" :placeholder="$t('pub.pleaseSel')">
+                  <el-option label="否" value="0" selected></el-option>
+                  <el-option label="是" value="1"></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
         </ul>
       </div>
 
@@ -2255,7 +2263,8 @@
           AirTicketId:0,
           AirTicketNum:0,
           B2BPrice:'',
-          B2CPrice:''
+          B2CPrice:'',
+          IsDiscounts:'0'
         },
 
         //1-一般导入，2-多航段导入
@@ -3104,6 +3113,11 @@
         this.sales.AirTicketNum = item.AirTicketScatterNum;
         this.sales.B2BPrice = item.ScatterB2BPrice;
         this.sales.B2CPrice = item.ScatterB2CPrice;
+        if(item.IsDiscounts!=null){
+          this.sales.IsDiscounts=item.IsDiscounts.toString();
+        }else{
+          this.sales.IsDiscounts='0';
+        }
       },
       //保存
       saveSales(){

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -30,6 +30,16 @@
             </el-select>
           </span>
         </li>
+        
+        <li>
+          <span>
+            <em>报名公司</em>
+            <el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
+               <el-option label="不限" :value="-1"></el-option>
+               <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <span>
             <em>人员选择</em>
@@ -407,6 +417,7 @@ export default {
       companyList: [],
       msg: {
         OutBranchId: -1,
+        BranchId:-1,
         LineId: -1,
         LineIdStr:"",//线路字符串
         RB_Department_Id: null,

src/router/config.js

@@ -2345,6 +2345,13 @@ export default {
               meta: {
                 title: '简易报表'
               },
+            },{ //财务 报表 年度营收报表
+              path: '/YearReport',
+              name: 'YearReport',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/YearReport'], resolve),
+              meta: {
+                title: '年度营收报表'
+              },
             }, { // 销售   制作广告
               path: '/advert',
               name: 'advert',