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

src/components/FinancialModule/FinancialDocuments.vue

@@ -763,11 +763,12 @@
             </span>
           </li>
           <!--  v-show="msg.Type==2" -->
+          <!--  @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w150">-->
           <li>
             <span>
               <em>{{$t('fnc.dxleixing')}}</em>
               <el-select filterable v-model='msg.ClientType'
-                @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w150">
+                @change="ClaerClientAccountList(),msg.ClientID=''" class="w150">
                 <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option v-for='item in ClientTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
                 </el-option>
@@ -778,11 +779,23 @@
           <li>
             <span>
               <em>{{$t('fnc.fkduixiang')}}</em>
-              <el-select filterable v-model='msg.ClientID' class="w150">
+              <el-select
+    v-model="msg.ClientID" class="w150"
+    filterable
+    remote
+    reserve-keyword
+    placeholder="请输入关键词"
+    :remote-method="GetClientAccountListByKeyWord"
+    >
+    <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
+    <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                </el-option>
+  </el-select>
+              <!-- <el-select filterable v-model='msg.ClientID' class="w150">
                 <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
                 <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
                 </el-option>
-              </el-select>
+              </el-select> -->
             </span>
           </li>
           <li>
@@ -2419,6 +2432,43 @@
           err => {}
         );
       },
+
+      ClaerClientAccountList(){
+        this.ClientAccountList=[];
+        //this.transTax.ClientID='';
+      },
+      GetClientAccountListByKeyWord(query) {
+        if (query !== '') {
+        // 获取对象类型
+        let msg = {
+                  Type: this.transTax.ClientType,
+                  ObjID: 0,
+                  CardNum: "",
+                  KeyWord:query,
+                };
+        this.apipost(
+          "financeinfo_post_GetClientAccountList",
+          msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              let data = res.data.data;
+              let ClientAccountList = [];
+              data.forEach(x => {
+                let obj = {
+                  ID: x.ID,
+                  Name: x.AccountAlias,
+                  Nom: x.CardNum
+                };
+                ClientAccountList.push(obj);
+              });
+              this.ClientAccountList = ClientAccountList;
+            }
+          },
+          err => {}
+        );
+        }
+      },
+
       GetClientAccountList(i) { //获取客户名称并且根据费用类型和付款对象获取客户账号
         this.msg.AccountNumber = '';
         this.transTax.ClientID = ''

src/components/FinancialModule/RecPayQuery.vue

@@ -91,6 +91,33 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="4">
+              <el-form-item :label="$t('fnc.dxleixing')">
+                <el-select filterable v-model='msg.ClientType'
+                @change="ClaerClientAccountList(),msg.ClientID=''" class="w150">
+                <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option v-for='item in ClientTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                </el-option>
+              </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item :label="$t('fnc.fkduixiang')">
+                <el-select
+    v-model="msg.ClientID" class="w150"
+    filterable
+    remote
+    reserve-keyword
+    placeholder="请输入关键词"
+    :remote-method="GetClientAccountListByKeyWord"
+    >
+    <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
+    <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
+                </el-option>
+  </el-select>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="4">
               <el-form-item label="收付款账户：">
                 <el-select filterable v-model='msg.BankID'>
@@ -1005,6 +1032,41 @@
       })
     },
     methods: {
+      ClaerClientAccountList(){
+        this.ClientAccountList=[];
+      },
+      GetClientAccountListByKeyWord(query) {
+        if (query !== '') {
+        // 获取对象类型
+        let msg = {
+                  Type: this.transTax.ClientType,
+                  ObjID: 0,
+                  CardNum: "",
+                  KeyWord:query,
+                };
+        this.apipost(
+          "financeinfo_post_GetClientAccountList",
+          msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              let data = res.data.data;
+              let ClientAccountList = [];
+              data.forEach(x => {
+                let obj = {
+                  ID: x.ID,
+                  Name: x.AccountAlias,
+                  Nom: x.CardNum
+                };
+                ClientAccountList.push(obj);
+              });
+              this.ClientAccountList = ClientAccountList;
+            }
+          },
+          err => {}
+        );
+        }
+      },
+
       // 是否需要发票
       EditInvoiceStatus(row){
         let KingdeeInvoice

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -91,6 +91,7 @@
           <th width="60">{{$t('ground.jdrs')}}</th>
           <th width="70">{{$t('sm.company')}}</th>
           <th width="70">{{$t('fnc.a_zongjine')}}</th>
+          <th width="70">佣金总额</th>
           <th width="80">{{$t('ground.ldyj')}}<br />({{$t('fnc.yingfu')}})</th>
           <th width="80">{{$t('ground.dyyj')}}<br />({{$t('fnc.yingfu')}})</th>
           <th width="80">{{$t('ground.picyj')}}<br />({{$t('fnc.yingfu')}})</th>
@@ -159,8 +160,9 @@
                   {{subItem.BName}}
                 </td>
                 <td width="70">
-                  {{subItem.TotalMoney}}
+                  {{subItem.TotalMoney}}  
                 </td>
+                <td> {{(subItem.LeaderCommission+subItem.GuideCommission+subItem.PICCommission+subItem.CompanyCommission).toFixed(2)}}</td>
                 <td width="80">
                   {{subItem.LeaderCommission}}</br>
                   <!-- <span v-if="subItem.LeaderCommission>0&&subItem.LeaderCommissionFrId"

src/components/SingleContract.vue

@@ -579,7 +579,12 @@
                     <el-form-item style="display:inline-block;" label="费用总额（小写）人民币" prop="C_TotalPrice">
                       <el-input type="text" class="w300" v-model="CtObj.C_TotalPrice"
                         @keyup.native="checkPrice(CtObj,'C_TotalPrice'),number_chinese(CtObj.C_TotalPrice)"
-                        maxlength="10"></el-input>&nbsp;元
+                        maxlength="10"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                     <el-form-item style="display:inline-block;" label="（大写）人民币" label-width="120px">
                       <el-input type="text" class="w300" maxlength="50" v-model="AmountMoney"></el-input>&nbsp;元
@@ -686,9 +691,24 @@
                 <th width="15%">出发地</th>
                 <th width="12%">目的地</th>
                 <th width="12%">航班号</th>
-                <th width="12%">机票金额（元/张）</th>
-                <th width="12%">机场建设费（元/张）</th>
-                <th width="12%">定金（元/张）</th>
+                <th width="12%">机票金额（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/张）</th>
+                <th width="12%">机场建设费（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/张）</th>
+                <th width="12%">定金（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/张）</th>
                 <th width="100">操作</th>
               </tr>
               <tr v-for="(item,index) in CtObj.ContractTicketList" :key="index">
@@ -760,7 +780,12 @@
                   <div style="margin-left:50px">
                     <el-form-item label="机票预定费用总额：" label-width="140px">
                       <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'TicketTotalDepositPrice')"
-                        v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;元
+                        v-model="CtObj.TicketTotalDepositPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                   </div>
                 </td>
@@ -792,11 +817,21 @@
                 </th>
                 <th>
                   <div>房费</div>
-                  <div>（元/间/晚）</div>
+                  <div>（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/间/晚）</div>
                 </th>
                 <th>
                   <div>定金</div>
-                  <div>（元/间/晚）</div>
+                  <div>（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/间/晚）</div>
                 </th>
                 <th>入住日期</th>
                 <th>离店日期</th>
@@ -894,7 +929,12 @@
                   <div>
                     <el-form-item style="display:inline-block;" label="费用共计：" label-width="140px">
                       <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'HotelTotalPrice')"
-                        v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;元
+                        v-model="CtObj.HotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                   </div>
                 </td>
@@ -971,7 +1011,12 @@
                   <div style="margin:20px 0 0 50px">
                     <el-form-item style="display:inline-block;" label="费用共计：" label-width="90px">
                       <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'PickUpTotalPrice')"
-                        v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;元
+                        v-model="CtObj.PickUpTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                   </div>
                 </td>
@@ -994,8 +1039,18 @@
                 <th width="60">序号</th>
                 <th>国家（个人签证）</th>
                 <th>停留时间</th>
-                <th>代办签证费用（元/个）</th>
-                <th>交付保证金（元/个）</th>
+                <th>代办签证费用（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/个）</th>
+                <th>交付保证金（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/个）</th>
                 <th width="100">操作</th>
               </tr>
               <tr v-for="(item,index) in CtObj.ContractVisaList" :key="index">
@@ -1040,7 +1095,12 @@
                   <div style="margin:20px 0 0 50px">
                     <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
                       <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'VisaTotalPrice')"
-                        v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;元
+                        v-model="CtObj.VisaTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                   </div>
                 </td>
@@ -1067,8 +1127,18 @@
                 <th>目的地</th>
                 <th>航班号</th>
                 <th>舱位</th>
-                <th>机票金额（元/张）</th>
-                <th>机场建设费（元/张）</th>
+                <th>机票金额（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/张）</th>
+                <th>机场建设费（<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/张）</th>
                 <th width="100">操作</th>
               </tr>
               <tr v-for="(item,index) in CtObj.ContractTicketAndHotel.ContractTickets" :key="index">
@@ -1205,7 +1275,12 @@
                   <div style="margin:20px 0 0 50px">
                     <el-form-item style="display:inline-block;" label="合计金额：" label-width="90px">
                       <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'TicketAndHotelTotalPrice')"
-                        v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;元
+                        v-model="CtObj.TicketAndHotelTotalPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                     </el-form-item>
                   </div>
                 </td>
@@ -1226,7 +1301,12 @@
             <div style="margin:20px 0 0 50px">
               <el-form-item style="display:inline-block;" label="其他服务费用合计：" label-width="140px">
                 <el-input type="text" class="w180" @keyup.native="checkPrice(CtObj,'OtherConventionPrice')"
-                  v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;元
+                  v-model="CtObj.OtherConventionPrice"></el-input>&nbsp;<template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
               </el-form-item>
             </div>
           </div>

src/components/Ticketing/TicketManager.vue

@@ -2648,7 +2648,7 @@
     <!-- 开票费用 -->
     <el-dialog width="1000px" :title="BillingChargeTitle" :visible.sync="BillingChargeDialog" center>
       <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px" :disabled="BillingChargeTitle=='开票费用详情'">
-        <div style="color: red;font-size: 13px;text-align: right;padding: 0 0 5px 0;">注：开票单价*开票数量+升舱增收=总开票金额</div>
+        <div style="color: red;font-size: 13px;text-align: right;padding: 0 0 5px 0;">注：开票单价*开票数量+升舱增收=总开票金额,每月<strong >{{BillingChargeObj.TicketManagerEndDay}}</strong>日之前维护上月的开票费用</div>
         <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0"
           cellpadding="0" v-loading="loading">
           <tr>

src/components/TravelContractConfirm.vue

@@ -2285,10 +2285,25 @@
 
                 <p>旅游费用：
                   成人<font>{{CtObj.C_AdultNum}}</font>人
-                  ×<font>{{CtObj.C_AdultPrice}}</font>元/人
+                  ×<font>{{CtObj.C_AdultPrice}}</font><template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/人
                   +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
-                  ×<font>{{CtObj.C_ChildrenPrice}}</font>元/人
-                  = <font>{{CtObj.C_TotalPrice}}</font>元
+                  ×<font>{{CtObj.C_ChildrenPrice}}</font><template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/人
+                  = <font>{{CtObj.C_TotalPrice}}</font><template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                 </p>
                 <p>
                   含：<font>{{CtObj.C_IncludeRemark}}</font>
@@ -3704,7 +3719,8 @@
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
           Tourists_Sign: '',
           CreateTimeStr: "",
-          IsTravelAgencySignature: 0 //判断是否盖章
+          IsTravelAgencySignature: 0, //判断是否盖章
+          SignType:0,//
         },
       };
     },
@@ -3851,6 +3867,8 @@
               this.CtObj.ZhangImg = tempObj.ZhangImg;
               this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
               this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
+              this.CtObj.TravelAgency_LicenseNum=tempObj.TravelAgency_LicenseNum;
+              this.CtObj.SignType=tempObj.SignType;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (

src/components/TravelContractView.vue

@@ -1642,7 +1642,7 @@
             </div>
             <div class="contract">
               <div class="title">
-                <h1>四川和平国际旅行社有限公司-全国版国内旅游一日游旅游合同示范文本[2015版]</h1>
+                <h1>{{CtObj.TravelAgency_Name}}-全国版国内旅游一日游旅游合同示范文本[2015版]</h1>
                 <p class="contractNo">合同编号：<span>{{CtObj.T_ContractNum}}</span></p>
               </div>
               <div class="menu">
@@ -1729,10 +1729,25 @@
 
                 <p>旅游费用：
                   成人<font>{{CtObj.C_AdultNum}}</font>人
-                  ×<font>{{CtObj.C_AdultPrice}}</font>元/人
+                  ×<font>{{CtObj.C_AdultPrice}}</font> <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/人
                   +儿童<font>{{CtObj.C_ChildrenNum}}</font>人
-                  ×<font>{{CtObj.C_ChildrenPrice}}</font>元/人
-                  = <font>{{CtObj.C_TotalPrice}}</font>元。
+                  ×<font>{{CtObj.C_ChildrenPrice}}</font> <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/人
+                  = <font>{{CtObj.C_TotalPrice}}</font> <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>。
                 </p>
                 <p>
                   含：<font>{{CtObj.C_IncludeRemark}}</font>
@@ -2073,6 +2088,7 @@
           Tourists_Fax: "",
           Tourists_EmergencyLinkMan: "",
           Tourists_EmergencyLinkTel: "",
+
           TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
@@ -2175,6 +2191,7 @@
           IsTravelAgencySignature: 0, //是否盖章
           ZhangImg: "", //合同章
           CreateByName: "", //合同创建人
+          SignType: 0,
         },
       };
     },
@@ -2233,6 +2250,9 @@
                 tempObj.Tourists_EmergencyLinkMan;
               this.CtObj.Tourists_EmergencyLinkTel =
                 tempObj.Tourists_EmergencyLinkTel;
+              this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
+              this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
+              this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
               this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
               this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
               this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
@@ -2303,6 +2323,7 @@
               this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
               this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
               this.CtObj.C_SignType = tempObj.C_SignType;
+              this.CtObj.SignType = tempObj.SignType;
               this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
               this.CtObj.OtherConvention = tempObj.OtherConvention;
               this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;

src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue

@@ -125,7 +125,7 @@
                                   v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
                                   :h="524" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
                                   :active="false" :parent="false" axis="y" @activated="onActivated(0)"
-                                  :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
+                                  :x="0"
                                   :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
                                   :z="2" @dragstop="onViewSpotDragstop">
                                   <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
@@ -175,7 +175,7 @@
                                     v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
                                     :h="524" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
                                     :active="false" :parent="false" axis="y" @activated="onActivated(1)"
-                                    :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
+                                    :x="0"
                                     :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
                                     :z="2" @dragstop="onViewSpotDragstop">
                                     <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
@@ -597,6 +597,9 @@
         this.$refs[
           "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
         ]._data.top = y;
+        this.$refs[
+          "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
+        ]._data.left = 0;
       },
       onViewSpotDragstopY(x, y) {
         let imgWidth = document.querySelector(
@@ -636,6 +639,9 @@
         this.$refs[
           "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
         ]._data.left = x;
+        this.$refs[
+          "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
+        ]._data.top = 0;
       },
 
       SelectImg(index) {

src/components/onedayTripContract.vue

@@ -429,6 +429,18 @@
           <div class="createTableTitle">乙方(旅行社)</div>
           <table class="createTable">
             <tbody>
+              <tr>
+                <td>
+                  <el-form-item label="合同章">
+                    <el-select v-model="CtObj.SignType" placeholder="请选择" @change="changeSignType">
+                      <el-option key="0" label="和平章" :value="0">
+                      </el-option>
+                      <el-option key="1" label="日本公司章" :value="1">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+              </tr>
               <tr>
                 <td>
                   <el-form-item label="名称">
@@ -709,7 +721,14 @@
                   </el-form-item>
                   <el-form-item label-width="0" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_AdultPrice')"
-                      v-model="CtObj.C_AdultPrice"></el-input>&nbsp;元/人&nbsp;+&nbsp;儿童
+                      v-model="CtObj.C_AdultPrice"></el-input>&nbsp;
+                    <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
+                    /人&nbsp;+&nbsp;儿童
                   </el-form-item>
                   <el-form-item label-width="0" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkInteger(CtObj,'C_ChildrenNum')"
@@ -717,11 +736,21 @@
                   </el-form-item>
                   <el-form-item label-width="0" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_ChildrenPrice')"
-                      v-model="CtObj.C_ChildrenPrice"></el-input>&nbsp;元/人 =
+                      v-model="CtObj.C_ChildrenPrice"></el-input>&nbsp; <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>/人 =
                   </el-form-item>
                   <el-form-item label-width="0" style="display:inline-block;">
                     <el-input type="text" class="w150" @keyup.native="checkPrice(CtObj,'C_TotalPrice')"
-                      v-model="CtObj.C_TotalPrice"></el-input>&nbsp;元
+                      v-model="CtObj.C_TotalPrice"></el-input>&nbsp; <template v-if="CtObj.SignType==0">
+                      元
+                    </template>
+                    <template v-else>
+                      円
+                    </template>
                   </el-form-item>
                 </td>
               </tr>
@@ -1051,6 +1080,7 @@
           Tourists_Fax: "",
           Tourists_EmergencyLinkMan: "",
           Tourists_EmergencyLinkTel: "",
+          SignType: 0, //合同章类型
           TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
           TravelAgency_LicenseNum: "L-SC-CJ00015",
           TravelAgency_DealMan: "",
@@ -1215,6 +1245,17 @@
       commonTripList: commonTripList
     },
     methods: {
+      changeSignType() {
+        if (this.CtObj.SignType == 0) {
+          this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
+          this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
+          this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
+        } else {
+          this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル";
+          this.CtObj.TravelAgency_Address = "";
+          this.CtObj.TravelAgency_LicenseNum = "";
+        }
+      },
       //跳转锚点
       goAnchor(selector) {
         var anchor = this.$el.querySelector(selector);
@@ -1340,10 +1381,12 @@
               this.CtObj.Tourists_Email = tempObj.Tourists_Email;
               this.CtObj.Tourists_PostNum = tempObj.Tourists_PostNum;
               this.CtObj.Tourists_Fax = tempObj.Tourists_Fax;
-              this.CtObj.Tourists_EmergencyLinkMan =
-                tempObj.Tourists_EmergencyLinkMan;
-              this.CtObj.Tourists_EmergencyLinkTel =
-                tempObj.Tourists_EmergencyLinkTel;
+              this.CtObj.Tourists_EmergencyLinkMan = tempObj.Tourists_EmergencyLinkMan;
+              this.CtObj.Tourists_EmergencyLinkTel = tempObj.Tourists_EmergencyLinkTel;
+
+              this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
+              this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
+              this.CtObj.TravelAgency_LicenseNum = tempObj.TravelAgency_LicenseNum;
               this.CtObj.TravelAgency_DealMan = tempObj.TravelAgency_DealMan;
               this.CtObj.TravelAgency_IDNum = tempObj.TravelAgency_IDNum;
               this.CtObj.TravelAgency_Tel = tempObj.TravelAgency_Tel;
@@ -1414,6 +1457,7 @@
               this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
               this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
               this.CtObj.C_SignType = tempObj.C_SignType;
+              this.CtObj.SignType = tempObj.SignType;
               this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
               this.CtObj.OtherConvention = tempObj.OtherConvention;
               this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;

src/components/resetPassword.vue

@@ -611,7 +611,6 @@
     border: 1px solid #e95252 !important;
     color: #e95252 !important;
   }
-
 </style>
 
 <template>
@@ -619,7 +618,8 @@
       <!-- 修改密码 -->
       <div class="Per_Shouji">
         <div class="Shouji_Conteng">
-        <div class="Shouji_Top">修改密码</div>
+        <div class="Shouji_Top">修改密码 <span style="width:120px; font-size:12px;color:red;">为了账户的安全，建议定期更换密码</span></div>
+       
           <el-form :model="passWordMsg" ref="passWordMsg" label-position="right" :rules="rules2" label-width="100px">
             <el-form-item v-if="sureOldPwd" label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
               <el-input type="password" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
@@ -660,6 +660,8 @@
             </el-form-item>
           </el-form>
           <el-button type="primary" style="margin:30px 0 0 100px; width:120px" @click="submitForm2('passWordMsg')">确定</el-button>
+          <span type="primary" style="margin:30px 0 0 100px; width:120px; font-size:12px;cursor: pointer;text-decoration: underline;" @click="skipChangePwd('passWordMsg')">跳过</span>
+         
         </div>
       </div>
   </div>
@@ -700,6 +702,24 @@
       };
     },
     methods: {
+
+ //修改密码方法
+ skipChangePwd() {
+       
+        this.apipost('admin_get_SkipSelfResetPwd', this.passWordMsg, res => {
+          if (res.data.resultCode == 1) {
+            // //修改成功后退出登录
+            setTimeout(() => {
+              this.$router.push({
+                path: "/personalCenter"
+              });
+            }, 1000);
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
+      },
+
       //修改密码
       submitForm2(formName) {
         this.$refs[formName].validate((valid) => {