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

src/assets/common/lang/EN/fill.js

@@ -3101,6 +3101,7 @@ export const obj = {
       yonglefksxf: 'Yongle Payment Fee ',
       yufkyezymx: 'Advance Payment Balance Transfer Details ',
       oyzhgld: 'Eurasian and Zhaohong related documents',
+      yxhfgld: 'Impression kimono related sheet',
       yufudan: 'Prepaid order ',
       yufujine: 'Prepaid amount ',
       zhuanyidan: 'Transfer order ',
@@ -4445,6 +4446,7 @@ export const obj = {
       ribenxcgtqk: 'The Situation of regular regiments on the Japanese Line ',
       ouzhoussft: 'Loss Sharing in Europe ',
       crmzkbwdt: 'CRM Direct Customer Outbound group ',
+      hftyIncome: 'Kimono experience income',
       tongbind: 'Year-over-year ',
       gouwdtj: 'Shopping Store Statistics ',
       lindudypm: 'Tour Leader Rankings ',

src/assets/common/lang/Japan/fill.js

@@ -3100,7 +3100,8 @@ export const obj = {
       chehangbydd: '車屋の月極注文',
       yonglefksxf: '永楽支払い手数料',
       yufkyezymx: '前払金残高振替明細',
-      oyzhgld: 'ユーラシア、メガホン関連リスト',
+      oyzhgld: 'イメージ着物関連シート',
+      yxhfgld: '印象和服关联单',
       yufudan: '前払い金',
       yufujine: '前払金',
       zhuanyidan: '振替伝票',
@@ -4445,6 +4446,7 @@ export const obj = {
       ribenxcgtqk: '日本線通常団状況',
       ouzhoussft: 'ヨーロッパの損失配分',
       crmzkbwdt:'CRM直客部外失団',
+      hftyIncome: '和服体験収入',
       tongbind: '前年同期比',
       gouwdtj: 'ショッピング店統計',
       lindudypm: 'ガイドランキング',

src/assets/common/lang/zhCN/fill.js

@@ -3101,6 +3101,7 @@ export const obj = {
       yonglefksxf: '永乐付款手续费',
       yufkyezymx: '预付款余额转移明细',
       oyzhgld: '欧亚、兆鸿关联单',
+      yxhfgld: '印象和服关联单',
       yufudan: '预付单',
       yufujine: '预付金额',
       zhuanyidan: '转移单',
@@ -4445,6 +4446,7 @@ export const obj = {
       ribenxcgtqk: '日本线常规团情况',
       ouzhoussft: '欧洲损失分摊',
       crmzkbwdt: 'CRM直客部外丢团',
+      hftyIncome: '和服体验收入',
       tongbind: '同比年度',
       gouwdtj: '购物店统计',
       lindudypm: '领队导游排名',

src/assets/common/lang/zhTW/fill.js

@@ -3101,6 +3101,7 @@ export const obj = {
       yonglefksxf: '永樂付款手續費',
       yufkyezymx: '預付款餘額轉移明細',
       oyzhgld: '欧亚、兆鸿关联单',
+      yxhfgld: '印象和服關聯單',
       yufudan: '預付單',
       yufujine: '預付金額',
       zhuanyidan: '轉移單',
@@ -4445,6 +4446,7 @@ export const obj = {
       ribenxcgtqk: '日本線常規團情況',
       ouzhoussft: '歐洲損失分攤',
       crmzkbwdt: 'CRM直客部外丟團',
+      hftyIncome: '和服體驗收入',
       tongbind: '同比年度',
       gouwdtj: '購物店統計',
       lindudypm: '領隊導遊排名',

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -119,6 +119,37 @@
                 </table>
             </div>
         </div>
+        <div v-if="details.SpecialType && details.SpecialType==13">
+            <div class="_tit">
+                <span class="_text">{{$t('objFill.v101.BasicDocuments.yxhfgld')}}</span>
+                <div>
+                    <span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
+                    <span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
+                </div>
+            </div>
+            <div v-show="tableShow" class="sanjiao-box _padding_20_15">
+                <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
+                    <tr>
+                        <th>{{$t('sm.company')}}</th>
+                        <th>{{$t('advmanager.v_type')}}</th>
+                        <th>{{$t('fnc.danhao')}}</th>
+                        <th>{{$t('fnc.feiyongleixing')}}</th>
+                        <th>{{$t('fnc.yuanbi')}}</th>
+                        <th>{{$t('fnc.bweibi')}}</th>
+                        <th>{{$t('hotel.hotel_status')}}</th>
+                    </tr>
+                    <tr class="_color_b" v-for="(item,index) in KimonoList" :key="index">
+                        <td>{{item.BranchName}}</td>
+                        <th>{{item.TypeName}}</th>
+                        <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
+                        <th>{{item.CostTypeIdStr}}</th>
+                        <td>{{item.WBMoney}}</td>
+                        <td>{{item.Money}}</td>
+                        <td>{{item.Status}}</td>
+                    </tr>
+                </table>
+            </div>
+        </div>
         <div v-if="IsAdvanceFinance==1" style="border-top: 1px solid #DDDDDD;">
             <div class="_tit">
                 <span class="_text">{{$t('objFill.chongdidanju')}}</span>
@@ -349,6 +380,7 @@ export default {
           Area_Name: '',
           matchTransferList: [],
           zhaohongList: [],
+          KimonoList: [],
           JapanCarModel: {}
         }
     },watch:{
@@ -431,6 +463,8 @@ export default {
                 this.getJapanCarDetails();
             }else if(this.details.SpecialType && this.details.SpecialType==12){
                 this.getZhaoHongList();
+            }else if(this.details.SpecialType && this.details.SpecialType==13){
+                this.getKimonoList();
             }
       },
       goTravelControlList(id){
@@ -509,6 +543,22 @@ export default {
             }
         }, err => {})
       },
+      getKimonoList(){
+        this.loading = true
+        let msg={
+          FrId:this.FrID
+        };
+        this.apipost('Financial_post_GetYXKimonoReList', msg, res => {
+            this.loading = false
+            if (res.data.resultCode == 1) {
+                let data=res.data.data;
+                this.KimonoList=data;
+            }
+            else{
+                this.Error(res.data.message)
+            }
+        }, err => {})
+      },
     //   OtherType=7详情
       getDetails(){
         this.loading = true;

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -653,7 +653,7 @@ export default {
       if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0)
         this.msg.OutBranchId = -1;
       if (!this.msg.TCID) this.msg.TCID = 0;
-      if (this.msg.QStartDate == "") this.msg.QStartDate = "2023";
+      if (this.msg.QStartDate == "") this.msg.QStartDate = new Date().getFullYear().toString();
       this.apipost('financestatistics_get_GetTravelMonthReportList', this.msg, res=>{
 
         if (res.data.resultCode == 1) {

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -519,6 +519,7 @@ tr._item_list td:last-child {
                 <el-option value="23" :label="$t('objFill.ouzhoudtfrsr')"></el-option>
                 <el-option value="24" :label="$t('objFill.v101.FinancialModule.ouzhoussft')"></el-option>
                 <el-option value="25" :label="$t('objFill.v101.FinancialModule.crmzkbwdt')"></el-option>
+                <el-option value="27" :label="$t('objFill.v101.FinancialModule.hftyIncome')"></el-option>
               </el-select>
               <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150"  v-if="isShowGrounding==false">
                 <el-option value="6" v-if="isShowType" :label="$t('objFill.ribendjbzh')"></el-option>
@@ -772,6 +773,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===23"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===24"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===25">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===27" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCID}}</span>
   </div>
 
   `,
@@ -933,6 +935,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===24"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===25" @click="goHand('planeTicketOrder',rowData,16)">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===27" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -2639,6 +2642,12 @@ export default {
     if(this.msg.LineId==-25){
       this.msg.DataType="25";
     }
+    if(this.msg.LineId==-26){
+      this.msg.DataType="26";
+    }
+    if(this.msg.LineId==-27){
+      this.msg.DataType="27";
+    }
     let userInfo = this.getLocalStorage();
     if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;