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

src/App.vue

@@ -108,7 +108,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_0whkhalyx8tm.css";
+  @import "//at.alicdn.com/t/font_635492_p33f7rq158p.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -404,6 +404,9 @@ tr._item_list td:last-child {
   border-radius: 4px;
   margin-bottom: 10px;
 }
+.year .el-date-editor.el-input{
+    width: auto;
+}
 </style>
 
 <template>
@@ -463,11 +466,12 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" class="year">
             <el-form-item label="年份：">
                <el-date-picker
                     v-model="msg.QStartDate"
                     type="year"
+                    value-format="yyyy"
                     placeholder="选择年">
                 </el-date-picker>
             </el-form-item>
@@ -482,7 +486,7 @@ tr._item_list td:last-child {
       <ul class="clearfix">
         <li class="hight_query">
           <button class="normalBtn" @click="togbu()">{{$t('pub.searchBtn')}}</button>
-          <button class="hollowFixedBtn" @click="method5()">导出</button>
+          <!-- <button class="hollowFixedBtn" @click="method5()">导出</button> -->
         </li>
       </ul>
     </div>
@@ -690,7 +694,7 @@ export default {
             {
               field: "LineName",
               title: "线路",
-              width: 80,
+              width: 120,
               titleAlign: "left",
               columnAlign: "left",
               isResize: true,
@@ -701,7 +705,7 @@ export default {
             {
               field: "Digest",
               title: "摘要",
-              width: 160,
+              width: 120,
               titleAlign: "left",
               columnAlign: "left",
               isResize: true,
@@ -908,7 +912,6 @@ export default {
       if (field === "Total") return this.priceFormat(rowData.Total );
     },
     priceFormat(value) {
-        console.log("value",value)
       if (value == null) {
         return 0.0;
       }
@@ -928,7 +931,7 @@ export default {
       this.GetLocalFile(
         "financestatistics_post_OutToExcelYearReportList",
         this.msg,
-        "年度营收报表.xls"
+        "月度营收报表.xls"
       );
         this.loading = false;
     },

src/components/FinancialModule/addFinancialDocuments.vue

@@ -189,6 +189,7 @@
                         <el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37'>资金池</el-radio>
                         <el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>平台虚拟账户</el-radio>
                         <el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>地接虚拟账户</el-radio>
+                        <el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>收支相抵</el-radio>
                         <!-- <el-radio :label="3">资金池</el-radio> -->
                     </el-radio-group>
                 </div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -981,12 +981,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1316,12 +1316,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -3255,10 +3255,11 @@ submitYSZEForm(){
           Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) +
           Number(this.addMsg.OldPeopleNum);
-        this.addMsg.YSeatNum =
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.OldPeopleNum);
+
+          var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+            (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+          this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
+
         let totalNum =
           Number(this.addMsg.AirticketNum) +
           Number(this.addMsg.ManNum) +

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -480,7 +480,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="isExists(item.CostTypeList,'邀请函') || isExists(item.CostTypeList,'名单表')">
+            <tr v-if="isExists(item.CostTypeList,'邀请函费用') || isExists(item.CostTypeList,'名单表费')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -669,7 +669,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="isExists(item.CostTypeList,'签证费')">
+            <tr v-if="isExists(item.CostTypeList,'签证费') || isExists(item.CostTypeList,'签证佣金')" >
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -857,7 +857,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票')  && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
+            <tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票')  && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>

src/components/index.vue

@@ -104,7 +104,7 @@
                       <i class="iconfont icon-menu-shezhi"></i>
                       设置
                     </el-dropdown-item> -->
-                    <el-dropdown-item class="clearfix _dropdown_other" @click.native="exit">
+                    <el-dropdown-item class="clearfix _dropdown_other" @click. ="exit">
                       <i class="iconfont icon-menu-tuichu"></i>
                       退出
                     </el-dropdown-item>
@@ -118,7 +118,18 @@
 							<!--<i class="iconfont icon-imessage_top"  @click="togglebox($event)"></i>-->
 						</li>
 			    		<li><i class="iconfont icon-help_top"></i></li>
-			    		<li><i class="iconfont icon-language_top"></i></li>
+			    		<li>
+                <el-dropdown trigger="click">
+                  <span class="el-dropdown-link">
+                    <i v-if="language=='zh-CN'" class="iconfont icon-language_top"></i>
+                    <i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i>
+                  </span>
+                  <el-dropdown-menu  class="changelanguage" slot="dropdown">
+                    <el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
+                    <el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </li>
 			    	</ul>
 			    </div>
 			</div>
@@ -774,6 +785,7 @@ export default {
   },
   data() {
     return {
+      language:'zh-CN',
       douTimer:null,
       defaultHeadImg:
         'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
@@ -1313,6 +1325,10 @@ export default {
     }
   },
   methods: {
+    ChangeLan(str){
+      this.language=str;
+      this.$i18n.locale = str;
+    },
     settingSys: function () {
       this.MsgBus.$emit('settingOpen')
     },
@@ -3170,6 +3186,26 @@ export default {
 @import "../assets/css/main.less";
 @import "../assets/css/cssReset.css";
 @import "../assets/css/message.css";
+.changelanguage{
+  width:124px;
+}
+.changelanguage .el-dropdown-menu__item .icon-duigou{
+  color:#000000;
+  position: absolute;
+  right: 10px;
+  font-size: 14px;
+}
+.changelanguage .el-dropdown-menu__item{
+  padding:0;
+  padding-left:15px;
+  font-size: 14px;
+  position: relative;
+  color:#333333;
+}
+.changelanguage .el-dropdown-menu__item:hover{
+  background: #D9D9D9;
+  color:#333333;
+}
 ._dropdown.el-dropdown-menu {
   padding: 0;
   background-color: #1f2533 !important;

src/router/config.js

@@ -2404,12 +2404,12 @@ export default {
                 title: '年度营收报表'
               },
             },
-            { //财务 报表 月度营收报表
+            { //财务 报表 团队营收统计
               path: '/MonthReport',
               name: 'MonthReport',
               component: resolve => require(['@/components/FinancialModule/ReportForm/MonthReport'], resolve),
               meta: {
-                title: '月度营收报表'
+                title: '团队营收统计'
               },
             }, {
               path: '/JumpReport',