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

src/assets/common/lang/zh.js

@@ -847,7 +847,7 @@ export const fnc = {
   fyleixing: '费用类型：',
   kuisun: '亏损：',
   yingli: '盈利：',
-  kuisun: '盈亏：',
+  yingkui: '盈亏：',
   bieming: '别名',
   khuren: '开户人',
   zhyue: '账户余额',
@@ -2172,6 +2172,21 @@ export const salesModule={
   AuditCompleted:'已完成审核',
   Passport:'护照',
   Age:'年龄',
+  HotelOrderNum:'酒店订单号',
+  StartJoin:'入住开始时间',
+  EndJoin:'入住结束时间',
+  TotalPrice:'总价格',
+  TotalIncome:'总收入',
+  DKJE:'抵扣金额',
+  LeaveTime:'离店时间',
+  CancelFee:'取消费用',
+  UnionTeam:'关联团',
+  PlayTime:'游玩开始时间',
+  PlayOverTime:'游玩结束时间',
+  CreateTime:'创建开始时间',
+  CreateOverTime:'创建结束时间',
+  ThirdOrderNum:'第三方订单号',
+  BigBag:'大红包',
 }
 
 

src/components/FinancialModule/CashAccount.vue

@@ -322,9 +322,9 @@
                         </el-form-item>  
                     </el-col>
                     <el-col :span="4" :gutter="35" class="_yingkui">
-                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
+                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.yingkui')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
                         <p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
-                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p> 
+                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p> 
                     </el-col>
                 </el-row>
             </el-form>

src/components/FinancialModule/CompanyAccount.vue

@@ -397,9 +397,9 @@
                         </el-form-item>  
                     </el-col>
                     <el-col :span="4" :gutter="35" class="_yingkui">
-                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
+                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.yingkui')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
                         <p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
-                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p> 
+                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p> 
                     </el-col>
                 </el-row>
             </el-form>

src/components/FinancialModule/PlatformAccount.vue

@@ -541,7 +541,7 @@
           </el-col>
           <el-col :span="4" :gutter="35" class="_yingkui">
             <p v-if="moneyDate.ProfitLoss<0">
-              {{$t('fnc.kuisun')}}
+              {{$t('fnc.yingkui')}}
               <span class="fc_red">{{moneyDate.ProfitLoss}}</span>
             </p>
             <p v-if="moneyDate.ProfitLoss>0">
@@ -549,7 +549,7 @@
               <span class="fc_green">{{moneyDate.ProfitLoss}}</span>
             </p>
             <p v-if="moneyDate.ProfitLoss==0">
-              {{$t('fnc.kuisun')}}
+              {{$t('fnc.yingkui')}}
               <span class="fc_green">0</span>
             </p>
           </el-col>

src/components/FinancialModule/PoolAccount.vue

@@ -322,9 +322,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="4" :gutter="35" class="_yingkui">
-                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
+                        <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.yingkui')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
                         <p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
-                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p> 
+                        <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p> 
                     </el-col>
                 </el-row>
             </el-form>

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -172,12 +172,12 @@
                     </el-col>
                     <el-col :span="4">
                         <el-form-item label="订单号：">
-                            <el-input placeholder="" class="" v-model="msg.OrderId" @keyup.native="checkInteger(msg,'OrderId')"></el-input>
+                            <el-input placeholder="" class="" v-model="msg.OrderId" @keyup.native="checkInteger(msg,'OrderId')" maxlength="8"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">
                         <el-form-item label="团队编号：">
-                            <el-input v-model="msg.TCID" class=""></el-input>
+                            <el-input v-model="msg.TCID" class="" @keyup.native="checkInteger(msg,'TCID')" maxlength="7"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">

src/components/SalesModule/CustomerCertification.vue

@@ -146,7 +146,7 @@
         <th width="10%">{{$t('salesModule.storeName')}}</th>
         <th width="10%">{{$t('hotel.suplier_contact')}}</th>
         <th width="10%">{{$t('hotel.table_tel')}}</th>
-        <th width="10%">{{$t('salesModule.TransactionMon')}}</th>
+        <th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
         <th width="10%">{{$t('admin.admin_address')}}</th>
         <th width="10%">{{$t('salesModule.belongUnion')}}</th>
         <th width="10%">{{$t('salesModule.ApplyTime')}}</th>

src/components/SalesModule/planeTicketInquiry.vue

@@ -1574,7 +1574,7 @@
             <el-row :gutter="0">
               <el-col :span="24">
                 <div class="TCID_cont PingFangSC">
-                  {{$t('salesModule.tuanqi')}}：
+                  {{$t('fnc.tuanqi')}}：
                   <span v-show="item.TCIDList.length==0">{{$t('active.cl_zanwu')}}</span>
                   <span class="Ticket_TCID" style="display:inline-block;margin-right: 10px;cursor: pointer;" v-for="(subItem, subIndex) in item.TravelInfo" :key="subIndex" @click="goUrlP(subItem.TCID)">{{subItem.TCNUM}}({{subItem.TCID}})</span>
                 </div>

src/components/SalesModule/publicCustomer.vue

@@ -58,8 +58,8 @@
 					<th width="20%">{{$t('admin.admin_address')}}</th>
 					<th width="10%">{{$t('salesModule.belongUnion')}}</th>
 					<th width="10%">{{$t('salesModule.Laiyuan')}}</th>
-					<th width="8%">{{$t('salesModule.VisitCount')}}</th>
-					<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
+					<th width="8%">{{$t('MarketingActi.VisitCount')}}</th>
+					<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
 					<th width="10%">{{$t('active.cl_addPp')}}</th>
 					<th width="5%">{{$t('hotel.table_operat')}}</th>
 				</tr>

src/components/SalesModule/salesHotelOrder.vue

@@ -45,20 +45,20 @@
     <div class="query-box">
       <ul>
         <li>
-          <span><em>酒店订单号</em>
+          <span><em>{{$t('salesModule.HotelOrderNum')}}</em>
             <el-input v-model='msg.ThirdOrderNo' :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
         <li>
           <span>
-            <em>入住开始时间</em>
+            <em>{{$t('salesModule.StartJoin')}}</em>
             <el-date-picker class="w150" type="date" v-model="msg.StartTime"
             :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
           </span>
         </li>
         <li>
           <span>
-            <em>入住结束时间</em>
+            <em>{{$t('salesModule.EndJoin')}}</em>
             <el-date-picker class="w150" type="date" v-model="msg.EndTime"
             :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
            </span>
@@ -70,21 +70,21 @@
     </div>
     <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th>订单号</th>
-        <th>团号</th>
-        <th>客户信息</th>
-        <th>房间数</th>
-        <th>总价格</th>
-        <th>总收入</th>
-        <th>抵扣金额</th>
-        <th>优惠金额</th>
-        <th>待收金额</th>
-        <th>订单状态</th>
-        <th>创建时间</th>
-        <th>入住时间</th>
-        <th>离店时间</th>
-        <th>取消费用</th>
-        <th>操作</th>
+        <th>{{$t('hotel.order_Number')}}订单号</th>
+        <th>{{$t('visa.v_tuanhao')}}</th>
+        <th>{{$t('fnc.khxinxi')}}</th>
+        <th>{{$t('hotel.hotel_roomnumber')}}</th>
+        <th>{{$t('salesModule.TotalPrice')}}</th>
+        <th>{{$t('salesModule.TotalIncome')}}</th>
+        <th>{{$t('salesModule.DKJE')}}</th>
+        <th>{{$t('sm.youhuijine')}}</th>
+        <th>{{$t('Operation.Op_daishou')}}</th>
+        <th>{{$t('hotel.hotel_OrderStates')}}</th>
+        <th>{{$t('fnc.cjshijian')}}</th>
+        <th>{{$t('hotel.table_CheckInDate')}}</th>
+        <th>{{$t('salesModule.LeaveTime')}}</th>
+        <th>{{$t('salesModule.CancelFee')}}</th>
+        <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tbody v-for="(item,index) in dataList">
         <tr>
@@ -108,22 +108,22 @@
              <td>
                 <el-row>
                   <el-button-group>
-                    <el-tooltip class="item" effect="dark" content="收付款" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('salesModule.SFK')" placement="top-start">
                       <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消订单" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start">
                       <el-button type="info" v-if="item.IsCanOrder"  icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
                     </el-tooltip> 
-                    <el-tooltip class="item" effect="dark" content="确定" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('pub.sureBtn')" placement="top-start">
                       <el-button  type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消确认" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('sm.exitsure')" placement="top-start">
                       <el-button type="info" icon=" iconfont icon-quxiao1" v-if="item.IsCanClear == 1" @click="queren(0, item.OrderID)"></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="关联团" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('salesModule.UnionTeam')" placement="top-start">
                       <el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
+                    <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top-start">
                       <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></el-button>
                     </el-tooltip>
                   </el-button-group>
@@ -134,7 +134,7 @@
             <td colspan="7" style="text-align:left;width:600px">
                 <div class="clearfix">
                     <div class="SH_beizhu" style="">
-                        备注：
+                        {{$t('pub.pubRemark')}}：
                     </div>
                     <div class="SH_beizhuInner">
                         {{item.Remark}}
@@ -143,21 +143,21 @@
             </td>
             <td colspan="7" style="text-align:left;width:600px">
                 <div class="SH_OrderDan">
-                    <div>收款单据：</div>
+                    <div>{{$t('fnc.skdanju')}}：</div>
                     <div>
                         <span v-for="subItem in item.FinanceList">
                             {{subItem.FrID}}
                         </span>
-                        <span v-if="item.FinanceList.length < 1">暂无数据</span>
+                        <span v-if="item.FinanceList.length < 1">{{$t('system.content_noData')}}</span>
                     </div>
                 </div>
                 <div  class="SH_OrderDan">
-                    <div>付款单据：</div>
+                    <div>{{$t('fnc.fkdanju')}}：</div>
                     <div>
                         <span v-for="subItem in item.RefundFinanceList">
                             {{subItem.FrID}}
                         </span>
-                        <span v-if="item.RefundFinanceList.length < 1">暂无数据</span>
+                        <span v-if="item.RefundFinanceList.length < 1">{{$t('system.content_noData')}}</span>
                     </div>
                 </div>
 
@@ -168,7 +168,7 @@
     </table>
     <el-dialog title="请选择团号" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie">
       <el-form label-width="110px">
-          <el-form-item label="团号">
+          <el-form-item :label="$t('visa.v_tuanhao')">
               <el-select
                   v-model="TCID"
                   filterable

src/components/SalesModule/workTotal.vue

@@ -14,7 +14,7 @@
 				</span>
 			</li>	
 			<li>
-				<span><em>{{$t('fnc.ryxuanze')}}人员选择</em></span>
+				<span><em>{{$t('fnc.ryxuanze')}}</em></span>
 				<el-select class='w200' v-model="msg.EmployeeId" filterable :placeholder="$t('pub.pleaseSel')" >
 		            <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
 					<el-option v-for='item in employeeList' 
@@ -40,7 +40,7 @@
 				<th width="15%">{{$t('salesModule.Personnel')}}</th>
 				<th width="15%">{{$t('salesModule.Visital')}}</th>
 				<th width="15%">{{$t('salesModule.laxin')}}</th>
-				<th width="15%">{{$t('salesModule.ShouKe')}}</th>
+				<th width="15%">{{$t('MarketingActi.ShouKe')}}</th>
 				<th width="10%">{{$t('fnc.shoukuan')}}</th>
 				<th width="10%">{{$t('salesModule.MakeInquiry')}}</th>
 				<th width="10%">{{$t('salesModule.Complaints')}}</th>

src/components/systemManagement/currencyManagement.vue

@@ -297,9 +297,9 @@
                             </el-form-item>                   
                         </li>
                         <li class="_yingkui">
-                            <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
+                            <p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.yingkui')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
                             <p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
-                            <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p>
+                            <p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.yingkui')}}<span class="fc_green">0</span></p>
                         </li> 
                     </ul>
             </el-form>