Skip to content

S
SuperMan
Commit e52d6023 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents f90b053f a6318bb8
Show whitespace changes
Inline Side-by-side
Showing with 766 additions and 341 deletions
src/components/DomesticTravelcontract.vue
View file @ e52d6023
......@@ -260,49 +260,49 @@
<tr>
<td>
<el-form-item label="姓名" prop="clientName">
<el-input type="text" v-model="CtObj.clientName" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_Name" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="证件号码">
<el-input type="text" v-model="CtObj.clientIdcardnum" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_IDNum" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="住所">
<el-input type="text" v-model="CtObj.clientAddress" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_Addres" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="联系电话" prop="clientCall">
<el-input type="text" v-model="CtObj.clientCall" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_Tel" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="邮箱">
<el-input type="text" v-model="CtObj.clientEmail" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_Email" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="传真">
<el-input type="text" v-model="CtObj.clientFax" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_Fax" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="邮编">
<el-input type="text" v-model="CtObj.clientPostCode" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="CtObj.Tourists_PostNum" maxlength="100" class="w300"></el-input>
</el-form-item>
</td>
</tr>
......@@ -314,63 +314,63 @@
<tr>
<td>
<el-form-item label="公司名称">
<el-input type="text" v-model="CtObj.company" :disabled="true" class="w300"></el-input>
<el-input type="text" v-model="CtObj.TravelAgency_Name" :disabled="true" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="经营许可证编号">
<el-input type="text" class="w300" :disabled="true" v-model="CtObj.businessCertificate"></el-input>
<el-input type="text" class="w300" :disabled="true" v-model="CtObj.TravelAgency_LicenseNum"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="经办人" prop="agentName">
<el-input type="text" class="w300" v-model="CtObj.agentName"></el-input>
<el-form-item label="经办人" prop="TravelAgency_DealMan">
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_DealMan"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="营业地址">
<el-input type="text" class="w300" v-model="CtObj.companyAddress"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_Address"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="联系电话">
<el-input type="text" class="w300" v-model="CtObj.companyCall"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_Tel"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="传真">
<el-input type="text" class="w300" v-model="CtObj.companyFax"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_Fax"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="邮编">
<el-input type="text" class="w300" v-model="CtObj.companyPostCode"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_PostNum"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="电子邮箱">
<el-input type="text" class="w300" v-model="CtObj.companyEmail"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_Email"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="签约地点">
<el-input type="text" class="w300" v-model="CtObj.contractPlace"></el-input>
<el-input type="text" class="w300" v-model="CtObj.TravelAgency_SignAddress"></el-input>
</el-form-item>
</td>
</tr>
......@@ -392,42 +392,42 @@
<tr>
<td>
<el-form-item label="团号">
<el-input type="text" class="w300" v-model="CtObj.tCNum"></el-input>
<el-input type="text" class="w300" v-model="CtObj.C_TCNUM"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="旅游产品名称" prop="productName">
<el-input type="text" class="w300" v-model="CtObj.productName"></el-input>
<el-form-item label="旅游产品名称" prop="C_ProductName">
<el-input type="text" class="w300" v-model="CtObj.C_ProductName"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="出发日期" prop="startDate">
<el-date-picker class="w300" v-model="CtObj.startDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w300" v-model="CtObj.C_StartDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="返回日期" prop="returnDate">
<el-date-picker class="w300" v-model="CtObj.returnDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w300" v-model="CtObj.C_EndDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="共" prop="dayNum">
<el-input type="text" class="w300"></el-input>&nbsp;天
<el-form-item label="共" prop="C_DayNum">
<el-input type="text" class="w300" v-model="CtObj.C_DayNum"></el-input>&nbsp;天
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="酒店住宿" prop="nightNum">
<el-input type="text" class="w300"></el-input>&nbsp;晚
<el-form-item label="酒店住宿" prop="C_NightNum">
<el-input type="text" class="w300" v-model="CtObj.C_NightNum"></el-input>&nbsp;晚
</el-form-item>
</td>
</tr>
......@@ -439,49 +439,57 @@
<tr>
<td>
<el-form-item label="成人" prop="adultPrice">
<el-input type="text" class="w300" v-model="CtObj.adultPrice"></el-input> 元/人
<el-input type="text" class="w300" v-model="CtObj.C_AdultPrice"></el-input> 元/人
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="儿童(不满14岁的)">
<el-input type="text" class="w300" v-model="CtObj.childPrice"></el-input> 元/人
<el-input type="text" class="w300" v-model="CtObj.C_ChildrenPrice"></el-input> 元/人
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="导游服务费" prop="servicePrice">
<el-input type="text" class="w300" v-model="CtObj.servicePrice"></el-input> 元/人
<el-form-item label="导游服务费" prop="C_GuideServicePrice">
<el-input type="text" class="w300" v-model="CtObj.C_GuideServicePrice"></el-input> 元/人
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="合计" prop="orderPrice">
<el-input type="text" class="w300" v-model="CtObj.orderPrice"></el-input> 元
<el-form-item label="合计" prop="C_TotalPrice">
<el-input type="text" class="w300" v-model="CtObj.C_TotalPrice"></el-input> 元
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="旅游费用支付日期" prop="payDate">
<el-date-picker class="w300" v-model="CtObj.payDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-form-item label="旅游费用支付日期" prop="C_PayDate">
<el-date-picker class="w300" v-model="CtObj.C_PayDate" type="date" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="支付方式" prop="payType">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.payType">
<el-form-item label="支付方式" prop="C_PayType">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.C_PayType">
<el-option label="现金" :value='1'></el-option>
<el-option label="转账" :value='2'></el-option>
<el-option label="支票" :value='3'></el-option>
<el-option label="支票" :value='2'></el-option>
<el-option label="信用卡" :value='3'></el-option>
<el-option label="其他" :value='4'></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr v-if="CtObj.C_PayType==4">
<td>
<el-form-item label="备注">
<el-input type="text" class="w300" v-model="CtObj.C_PayTypeRemark"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
<div class="createTableTitle">人身意外伤害保险</div>
......@@ -490,7 +498,7 @@
<tr>
<td>
<el-form-item label="旅游者">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.insuranceOpinion">
<el-select placeholder="请选择" filterable class='w300' v-model="CtObj.C_InsuranceType">
<el-option label="委托出境社购买" :value='1'></el-option>
<el-option label="自行购买" :value='2'></el-option>
<el-option label="放弃购买" :value='3'></el-option>
......@@ -500,8 +508,8 @@
</tr>
<tr>
<td>
<el-form-item label="保险产品名称" prop="insuranceProduct">
<el-input type="text" class="w300" v-model="CtObj.insuranceProduct"></el-input>
<el-form-item label="保险产品名称" prop="C_InsuranceName">
<el-input type="text" class="w300" v-model="CtObj.C_InsuranceName"></el-input>
</el-form-item>
</td>
</tr>
......@@ -512,8 +520,8 @@
<tbody>
<tr>
<td>
<el-form-item label="最低成团人数" prop="minNumber">
<el-input type="text" class="w150" v-model="CtObj.minNumber"></el-input> 人
<el-form-item label="最低成团人数" prop="C_LowNum">
<el-input type="text" class="w150" v-model="CtObj.C_LowNum"></el-input> 人
</el-form-item>
</td>
</tr>
......@@ -523,21 +531,21 @@
<tr>
<td>
<el-form-item label="1、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.insteadOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.C_IsAgreeTravel">
<el-option label="同意" :value='0'></el-option>
<el-option label="不同意" :value='1'></el-option>
</el-select>
出境社委托
<el-input type="text" class="w300" v-model="CtObj.insteadCompany"></el-input> 出境社履行合同；
<el-input type="text" class="w300" v-model="CtObj.C_AgreeTravelName"></el-input> 出境社履行合同；
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="2、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.delayOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.C_IsAgreeDelay">
<el-option label="不同意" :value='1'></el-option>
<el-option label="同意" :value='0'></el-option>
</el-select>
延期出团；
</el-form-item>
......@@ -546,9 +554,9 @@
<tr>
<td>
<el-form-item label="3、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.changeOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.C_IsAgreeCndorse">
<el-option label="不同意" :value='1'></el-option>
<el-option label="同意" :value='0'></el-option>
</el-select>
改签其他线路出团；
</el-form-item>
......@@ -557,9 +565,9 @@
<tr>
<td>
<el-form-item label="4、">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.terminateOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.C_IsAgreeRemove">
<el-option label="不同意" :value='1'></el-option>
<el-option label="同意" :value='0'></el-option>
</el-select>
解除合同。
</el-form-item>
......@@ -573,12 +581,12 @@
<tr>
<td>
<el-form-item label="旅游者">
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.carpoolOpinion">
<el-option label="同意" :value='1'></el-option>
<el-option label="不同意" :value='2'></el-option>
<el-select placeholder="请选择" filterable class='w150' v-model="CtObj.C_IsAgreeSpellGroup">
<el-option label="不同意" :value='1'></el-option>
<el-option label="同意" :value='0'></el-option>
</el-select>
采用拼团方式拼至
<el-input type="text" class="w300" v-model="CtObj.carpoolCompany"></el-input> 旅行社成团。
<el-input type="text" class="w300" v-model="CtObj.C_SpellGroupName"></el-input> 旅行社成团。
</el-form-item>
</td>
</tr>
......@@ -590,14 +598,17 @@
<tr>
<td>
<div style="margin:20px 0 10px 50px">本合同履行过程中发生争议，由双方协商解决；亦可向合同签订地的旅游质监执法机构、消费者协会等有关部门或者机构申请调解解决。</div>
<el-form-item label-width="0" prop="settleDisputeMode" style="margin-left:50px;">
<el-form-item label-width="0" style="margin-left:50px;">
<span style="color:red;">*</span> 争议解决方式选择：协商或调解不成，按下列第
<el-select placeholder="请选择" filterable class='w210' v-model="CtObj.settleDisputeMode">
<el-select placeholder="请选择" filterable class='w210' v-model="CtObj.C_SolveType">
<el-option label="1" :value='1'></el-option>
<el-option label="2" :value='2'></el-option>
</el-select>
种方式解决
</el-form-item>
<el-form-item label="1、提交" v-if="CtObj.C_SolveType==1" label-width="110px">
<el-input type="text" class="w300" v-model="CtObj.C_SolveRemark"></el-input>&nbsp;仲裁委员会仲裁；
</el-form-item>
<div style="margin:0 0 20px 50px;">2、依法向人民法院起诉。</div>
</td>
</tr>
......@@ -608,36 +619,13 @@
<tbody>
<tr>
<td width='450'>
<el-form-item label="本合同一式" prop="totalNumber">
<el-select placeholder="请选择" filterable v-model="CtObj.totalNumber" class='w210'>
<el-option label="壹" :value='1'></el-option>
<el-option label="贰" :value='2'></el-option>
<el-option label="叁" :value='3'></el-option>
<el-option label="肆" :value='4'></el-option>
<el-option label="伍" :value='5'></el-option>
<el-option label="陆" :value='6'></el-option>
<el-option label="柒" :value='7'></el-option>
<el-option label="捌" :value='8'></el-option>
<el-option label="玖" :value='9'></el-option>
<el-option label="拾" :value='10'></el-option>
</el-select>
份
<el-form-item label="本合同一式" prop="C_ContractTotal">
<el-input type="text" class="w300" v-model="CtObj.C_ContractTotal"></el-input>份
</el-form-item>
</td>
<td>
<el-form-item label="双方各持" prop="eachNumber" label-width="120">
<el-select placeholder="请选择" filterable v-model="CtObj.eachNumber" class='w210'>
<el-option label="壹" :value='1'></el-option>
<el-option label="贰" :value='2'></el-option>
<el-option label="叁" :value='3'></el-option>
<el-option label="肆" :value='4'></el-option>
<el-option label="伍" :value='5'></el-option>
<el-option label="陆" :value='6'></el-option>
<el-option label="柒" :value='7'></el-option>
<el-option label="捌" :value='8'></el-option>
<el-option label="玖" :value='9'></el-option>
<el-option label="拾" :value='10'></el-option>
</el-select>
<el-form-item label="，双方各持" prop="C_ContractPer" label-width="120">
<el-input type="text" class="w300" v-model="CtObj.C_ContractPer"></el-input>
份，具有同等法律效力，自双方当事人签字或者盖章之日起生效。
</el-form-item>
</td>
......@@ -655,7 +643,7 @@
</h2>
</div>
<div style="padding:10px;">未尽事宜，经旅游者和出境社双方协商一致，可以列入补充条款。(如合同空间不够，可以另附纸张，由双方签字或者盖章确认。)</div>
<el-input type="textarea" resize="none" v-model="CtObj.otherMatter" rows="13"></el-input>
<el-input type="textarea" resize="none" v-model="CtObj.OtherConvention" rows="13"></el-input>
</div>
<div class="block mtop15" id="anchor-3" ref="anchor3">
<div class="blockTitle">
......@@ -671,45 +659,45 @@
<tr>
<td>
<el-form-item label="旅行社监督、投诉电话">
<el-input type="text" class="w300" v-model="CtObj.regulatorComplainCall"></el-input>
<el-input type="text" class="w300"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item style="display:inline-block;">
<el-input type="text" class="w138"></el-input>&nbsp;省
<el-input type="text" class="w138" v-model="CtObj.C_ComplaintProvince"></el-input>&nbsp;省
</el-form-item>
<el-form-item label-width="0" style="display:inline-block;">
<el-input type="text" class="w138"></el-input>&nbsp;市旅游质监执法机构
<el-input type="text" class="w138" v-model="CtObj.C_ComplaintCity"></el-input>&nbsp;市旅游质监执法机构
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="投诉电话">
<el-input type="text" class="w300" v-model="CtObj.companyComplainCall"></el-input>
<el-input type="text" class="w300" v-model="CtObj.C_ComplaintTel"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="电子邮箱">
<el-input type="text" class="w300" v-model="CtObj.regulatorWebsite"></el-input>
<el-input type="text" class="w300" v-model="CtObj.C_ComplaintEmail"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="地址">
<el-input type="text" class="w300" v-model="CtObj.regulatorAddress"></el-input>
<el-input type="text" class="w300" v-model="CtObj.C_ComplaintAddress"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="邮编">
<el-input type="text" class="w300" v-model="CtObj.regulatorPostCode"></el-input>
<el-input type="text" class="w300" v-model="CtObj.C_ComplaintPostNum"></el-input>
</el-form-item>
</td>
</tr>
......@@ -753,7 +741,7 @@
</div>
<table class="singeRowTable TcNewTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>序号</th>
<th width="80">序号</th>
<th>姓名</th>
<th>性别</th>
<th>证件类型</th>
......@@ -762,45 +750,117 @@
<th>身体状况</th>
<th>操作</th>
</tr>
<tr>
<td>1</td>
<td><el-input type="text"></el-input></td>
<tr v-for="(item, index) in CtObj.ContractGuestList" :key="index">
<td>{{ index + 1 }}</td>
<td>
<span v-if="item.IsShow == 0">{{ item.CGuestName }}</span>
<el-input
type="text"
class="w150"
v-model="item.CGuestName"
v-else
></el-input>
</td>
<td>
<el-select>
<el-option label="男" :value="1"></el-option>
<el-option label="女" :value="2"></el-option>
<span v-if="item.IsShow == 0">{{ item.CGuestSex }}</span>
<el-select v-model="item.CGuestSex" v-else>
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
</td>
<td>
<el-select>
<el-option label="护照" :value="1"></el-option>
<el-option label="港澳通行证" :value="2"></el-option>
<el-option label="赴台证" :value="3"></el-option>
<el-option label="身份证" :value="4"></el-option>
<el-option label="其他" :value="5"></el-option>
<span v-if="item.IsShow == 0">{{
item.CGuestCertificateType
}}</span>
<el-select v-model="item.CGuestCertificateType" v-else>
<el-option label="护照" value="护照"></el-option>
<el-option label="港澳通行证" value="港澳通行证"></el-option>
<el-option label="赴台证" value="赴台证"></el-option>
<el-option label="身份证" value="身份证"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
</td>
<td><el-input type="text"></el-input></td>
<td><el-input type="text"></el-input></td>
<td><el-input type="text" placeholder="健康"></el-input></td>
<td>
<!-- <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle></el-button>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button type="primary" icon="iconfont icon-baocun" circle></el-button>
<span v-if="item.IsShow == 0">{{
item.CGuestCertificateNum
}}</span>
<el-input
type="text"
v-model="item.CGuestCertificateNum"
v-else
></el-input>
</td>
<td>
<span v-if="item.IsShow == 0">{{ item.CGuestTel }}</span>
<el-input
type="text"
v-model="item.CGuestTel"
v-else
></el-input>
</td>
<td>
<span v-if="item.IsShow == 0">{{ item.CGuestHealth }}</span>
<el-input
type="text"
placeholder="健康"
v-model="item.CGuestHealth"
v-else
></el-input>
</td>
<td>
<el-tooltip
class="item"
effect="dark"
content="修改"
v-if="item.IsShow == 0"
placement="top-start"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="item.IsShow = 1"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="保存"
v-if="item.IsShow == 1"
placement="top-start"
>
<el-button
type="primary"
icon="iconfont icon-baocun"
@click="item.IsShow = 0"
circle
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-button type="danger" icon="el-icon-delete" circle ></el-button>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top-start"
>
<el-button
type="danger"
icon="el-icon-delete"
circle
@click="delTouristArr(index)"
></el-button>
</el-tooltip>
</td>
</tr>
<tr>
<td colspan="9" style="text-align:right;">
<input type="button" class="TC_NewAddBtn" value="+添加游客" />
<input
type="button"
class="TC_NewAddBtn"
@click="addTourist()"
value="+添加游客"
/>
</td>
</tr>
</tr>
</table>
</div>
......@@ -826,7 +886,7 @@
<th width="12%">旅游者签名同意</th>
<th width="100">操作</th>
</tr>
<tr v-for="(item,index) in VoluntaryArr">
<tr v-for="(item,index) in CtObj.ContractShopList">
<td>
{{index+1}}
</td>
......@@ -960,34 +1020,6 @@
import moment from 'moment'
export default {
data() {
let valiTotalNumber = (rule, value, callback) => {
if (this.CtObj.totalNumber == 0||this.CtObj.totalNumber =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validateEach = (rule, value, callback) => {
if (this.CtObj.eachNumber == 0||this.CtObj.eachNumber =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validatepayType = (rule, value, callback) => {
if (this.CtObj.payType == 0||this.CtObj.payType =='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
let validatesettleDisputeMode = (rule, value, callback) => {
if (this.CtObj.settleDisputeMode == 0 ||this.CtObj.settleDisputeMode=='') {
return callback(new Error('请选择'));
} else {
callback();
}
}
return {
//选中切换
cked:1,
......@@ -1004,110 +1036,118 @@
},
//参数
CtObj:{
//基本信息
clientName:'',
clientIdcardnum:'',
clientCall:'',
clientFax:'',
clientEmail:'',
clientPostCode:'',
clientCountryid:0,
clientProvinceid:0,
clientCityid:0,
clientAddress:'',
company:'',
businessCertificate:'',
companyCall:'',
companyFax:'',
companyEmail:'',
companyPostCode:'',
companyCountryid:0,
companyProvinceid:0,
companyCityid:0,
companyAddress:'',
agentName:'',
agentCall:'',
contractPlace:'',
//合同条款
totalNumber:2,
eachNumber:1,
productName:'',
startDate:'',
returnDate:'',
dayNum:'',
nightNum:'',
adultPrice:'',
childPrice:'',
servicePrice:'',
orderPrice:'',
payDate:'',
payType:'',
//客户同意
insuranceOpinion:'',
insuranceCompany:'',
insuranceProduct:'',
insuranceAmount:'',
minNumber:0,
insteadOpinion:'',
insteadCompany:'',
delayOpinion:'',
changeOpinion:'',
terminateOpinion:'',
carpoolOpinion:'',
carpoolCompany:'',
settleDisputeMode:2,
arbitrationCommission:'',
court:'',
otherMatter:'',
//投诉信息
companyComplainCall:'',
regulatorName:'',
regulatorComplainCall:'',
regulatorWebsite:'',
regulatorPostCode:'',
regulatorCountryid:0,
regulatorProvinceid:0,
regulatorCityid:0,
regulatorAddress:'',
//行程信息
travelContent:'',
//旅客信息
togetherRemark:'',
singleRemark:'',
nobedRemark:'',
aloneRemark:'',
tcid:0,
orderId:0,
tCNum:'',
payProtocol:'',
shopProtocol:''
CType:2,//合同类型:(1-单项委托协议[平台版2018]，2大陆境内旅游合同2014,3-全国版国内旅游一日游旅游合同示范文本[2015版])
Tourists_Name: "",
Tourists_IDNum: "",
Tourists_Addres: "",
Tourists_Tel: "",
Tourists_Email: "",
Tourists_PostNum: "",
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "",
TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号",
TravelAgency_Tel: "",
TravelAgency_Fax: "",
TravelAgency_PostNum: "",
TravelAgency_Email: "",
TravelAgency_Scope:"出境游/境内游",//旅行社经营范围
TravelAgency_SignAddress: "",
Guide_Name: "",
Guide_Num: "",
Guide_Tel: "",
C_TCNUM: "", //团号
C_ProductName: "",
C_StartDate: "", //出发时间
C_EndDate: "",
C_DayNum: "",
C_NightNum: "",
C_AdultNum: "",
C_AdultPrice: "", //成人价格
C_ChildrenNum: "",
C_ChildrenPrice: "",
C_GuideServicePrice: "",
C_TotalPrice: "",
C_PayDate: "",
C_PayType: 1, // 旅游费用支付方式(1-现金,2-支票,3-信用卡,4-其他,5-转账)
C_PayTypeRemark: "",//转账填写转账账号和备注
C_InsuranceType: 1, // 旅游者保险购买方式(1-委托旅行社购买,2-自行购买,3-放弃购买)
C_InsuranceName: "",
C_LowNum: "",
C_IsAgreeTravel: 1, // 是否同意旅行社委托(1-不同意，0同意）
C_AgreeTravelName: "", // 是否同意旅行社名称
C_IsAgreeDelay: 1, /// 是否同意延期出团(1-不同意，0同意）
C_IsAgreeCndorse: 1, /// 是否同意改签(1-不同意，0同意）
C_IsAgreeRemove: 1, // 是否同意解除合同(1-不同意，0同意）
C_IsAgreeSpellGroup: 1, // 是否同意拼团(1-不同意，0同意）
C_SpellGroupName: "", // 拼团旅行社名称
C_SolveType: "", // 争议解决方式
C_SolveRemark: "", // 争议解决方式备注
C_ContractTotal: "贰", // 合同总分数
C_ContractPer: '壹', // 各持几份
C_StartAddress: "", // 出发地点
C_ReturnAddress: "", //返回地点
C_TrafficType: 1, // 交通方式(1-合车游，2-包车游)
C_BusCode: "", // 车牌号
C_DriverName: "", // 驾驶员姓名
C_IsHaveKongTiao: 1, // 是否有空调(0-有空调，1-无空调)
C_BusType: 1, // 车辆类型(1-面包车,2-中巴车,3-大巴车)
C_BreakfastAddress: "", // 早餐地点
C_BreakfastBasic: "", // 早餐标准
C_LunchAddress: "", // 午餐地点
C_LunchBasic: "", // 午餐标准
C_DinnerAddress: "", // 晚餐地点
C_DinnerBasic: "", // 晚餐标准
C_IncludeRemark: "", // 费用包含
C_NonIncludeRemark: "", // 费用不包含
TravelAgency_ServiceTel: "", // 旅行社客服电话
C_ComplaintProvince: "", // 投诉省
C_ComplaintCity: "", // 投诉市
C_ComplaintTel: "", // 投诉电话
C_ComplaintEmail: "", // 投诉电子邮箱
C_ComplaintAddress: "", // 投诉地址
C_ComplaintPostNum: "", // 投诉邮编
C_ZhiFaTel: "", // 执法机构电话
C_XFZXHTSTel: "", // 消费者协会投诉电话
C_TicketDayNum: "", // 几日内出票
C_OrderDayNum: "", // 几日内下单
C_PayDayNum: "", // 几日内缴费
C_SignType: "", // 获取签证资料及领取签证方式
OtherConventionPrice: "", // 其他服务费用合计
OtherConvention: "", // 其他约定事项
TripJson: "",
GuestJson: '', // 游客信息【json】
ShopJson: '', // 购物信息【json】
SelfFeeJson: '', // 自费信息【Json】
TicketJson: '', // 机票信息
TicketTotalNum: 0, // 机票总数量
TicketOutDayNum: 0, // 机票几日内出票
TicketTotalDepositPrice: 0, // 机票预订总费用
HotelBookJson: "", // 酒店预订
HotelTotal: "", // 酒店多少间、晚
HotelCheckInType: "", // 酒店入住方式
HotelNotice: "", // 下订单后通知旅游者的方式
HotelTotalPrice: "0", // 酒店费用总计
PickUpJson: "", // 接送信息
PickUpTotalPrice: "0", // 接送总费用
VisaJson: "", // 签证信息
VisaTotalPrice: "0", // 签证总费用
TicketAndHotelJson: "", // 机票与酒店信息
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单
ContractTripList: [], //行程列表
ContractSelfFeeList:[], //自愿付费项目补充协议
},
//旅客名单
guestList:[],
tripList: [],
rules: {
clientName: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
clientCall: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
agentName: [{ required: true, message: "请输入经办人", trigger: "blur" }],
agentCall: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
totalNumber: [{ validator: valiTotalNumber,trigger: 'change',required: true,}],
eachNumber:[{ validator: validateEach, trigger: "change",required: true, }],
productName:[{ required: true, message: "请填写产品名称", trigger: "blur" }],
startDate:[{ required: true, message: "请选择出发日期", trigger: "change" }],
returnDate:[{ required: true, message: "请选择返回日期", trigger: "blur" }],
dayNum:[{ required: true, message: "请选择天数", trigger: "change" }],
nightNum:[{ required: true, message: "请选择晚数", trigger: "change" }],
adultPrice:[{ required: true, message: "请填写成人价", trigger: "blur" }],
orderPrice:[{ required: true, message: "请填写费用合计", trigger: "blur" }],
payDate:[{ required: true, message: "请选择支付日期", trigger: "change" }],
payType:[{ validator: validatepayType , trigger: "change",required: true, }],
servicePrice:[{required: true, message: "请输入导游服务费", trigger: "blur" }],
insuranceProduct:[{ required: true, message: "请填写保险名称", trigger:'blur'}],
minNumber:[{ required: true, message: "请填写最低成团人数", trigger: "change" }],
settleDisputeMode:[{ required: true, validator: validatesettleDisputeMode, trigger: "change" }],
},
//自愿购物活动补充协议
VoluntaryArr:[],
......@@ -1124,9 +1164,6 @@
var anchor = this.$el.querySelector(selector)
document.documentElement.scrollTop = anchor.offsetTop-70
},
getDate(date){
return moment(date).format("YYYY-MM-DD");
},
//提交数据
SaveMsg(){
this.CtObj.status = 1;
......@@ -1204,11 +1241,11 @@
travelSign:'',
IsShow:1
}
this.VoluntaryArr.push(obj);
this.CtObj.ContractShopList.push(obj);
},
//删除补充协议1
delVoluntray(index){
this.VoluntaryArr.splice(index, 1);
this.CtObj.ContractShopList.splice(index, 1);
},
//添加自愿付费协议
addWilling(){
......@@ -1228,6 +1265,27 @@
delWilling(index){
this.WillingPayArr.splice(index, 1);
},
//添加游客信息
addTourist() {
this.CtObj.ContractGuestList.forEach((x, index) => {
x.IsShow = 0;
});
let obj = {
CGuestName: "",
CGuestSex: "男",
CGuestCertificateType: "身份证",
CGuestCertificateNum: "",
CGuestTel: "",
CGuestHealth: "健康",
IsShow: 1
};
this.CtObj.ContractGuestList.push(obj);
},
//删除游客
delTouristArr(index) {
this.CtObj.ContractGuestList.splice(index, 1);
},
//滚动条滚动选中tab
menu() {
var _self = this;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ e52d6023
......@@ -13,7 +13,14 @@
.rq_disImNote {
color: #ea6d6d;
}
.piliangPop .roomReserSet tr{
height:30px;
}
.piliangPop .roomReserSet tr th{
background-color: #eee;
text-align: center;
margin-bottom:10px;
}
</style>
<template>
......@@ -36,8 +43,44 @@
class="ownScrollbarStyle" ref="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<tr>
<th class="fz14" colspan="5">{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
<th class="fz14" colspan="17">{{$t('ground.dijiecaozuoxinxi')}}</th>
<th class="fz14" colspan="5">{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.
</th>
<th class="fz14" colspan="17">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start" style="float:left;margin-left:20px;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click" v-model="isShowPiliangPop">
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>日期</th>
<th>酒店名称</th>
</tr>
<template v-for="(lItem,lIndex) in list" >
<tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex">
<td style="width:100px;">
{{lItem.UseTimeStr}}
</td>
<td style="width:280px;">
<el-checkbox :checked="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox>
</td>
</tr>
</template>
<tr>
<td colspan="2" style="text-align:center">
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" style="margin-top:10px;">
选择文件</el-button>
</el-upload>
</td>
</tr>
</table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252" type="primary">
批量上传手配书
</el-button>
</el-popover>
</el-tooltip>
<span style="margin-top:6px;display:inline-block;">{{$t('ground.dijiecaozuoxinxi')}}</span>
</th>
</tr>
<tr>
<th width="120">{{$t('hotel.table_CheckInDate')}}</th>
......@@ -102,7 +145,6 @@
</td>
</tr>
</table>
</td>
<!-- 机位总数/(Y/E/F) -->
<td v-if="childIndex==0" :rowspan="6">
......@@ -171,8 +213,7 @@
</template>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>
{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</td>
</tr>
......@@ -267,7 +308,6 @@
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="true"></el-input> %
</template>
</td>
<!--返佣金额-->
<td>
......@@ -438,12 +478,8 @@
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;">
</td>
</tr>
<tr>
......@@ -556,7 +592,9 @@
allCurrencyList: [], //币种列表
checkedIndex: '',
checkedsubIndex: '',
XiaoFeiTaxFee:0.1
XiaoFeiTaxFee:0.1,
IsMoreUpdate:0,//批量上传手配书0-单个上传,1-批量上传
isShowPiliangPop:false //是否显示批量上传popover
}
},
components: {
......@@ -565,6 +603,11 @@
commonPHInfo: commonPHlInfo
},
methods: {
MoreUpdate(subItem)
{
subItem.IsChecked=!subItem.IsChecked;
this.IsMoreUpdate=1;
},
//付款方式切换
PayChange(subItem) {
if (subItem.PayStyle > 0) {
......@@ -711,9 +754,25 @@
let path = '/Upload/DMC/Hotel'
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
var fileUrl=this.domainManager()
.ViittoFileUrl + x.data.FilePath;
var fileUrl=this.domainManager().ViittoFileUrl + x.data.FilePath;
//批量上传
if(this.IsMoreUpdate==1)
{
this.list.forEach((sItem,sIndex)=>{
sItem.HotelOrderList.forEach((subItem,subIndex)=>{
if(subItem.IsChecked){
subItem.ContractUrl=fileUrl;
}
subItem.IsChecked=false;
});
});
this.isShowPiliangPop=false;
}
else
{
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl;
}
this.IsMoreUpdate=0;
this.$forceUpdate()
})
},
......@@ -755,6 +814,7 @@
IsCombine: this.IsCombine,
NewTCIDs: this.NewTCIDs
}, res => {
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
this.IsEditHotel = res.data.data.IsEditHotel;
......
src/components/administrative/ContractManage.vue
View file @ e52d6023
......@@ -3,82 +3,274 @@
<div class="query-box">
<ul>
<li>
<span>
<span
><em>合同编号</em
><el-input
class="w210"
v-model="msg.T_ContractNum"
placeholder="请输入合同编号"
@keyup.enter.native="getList"
></el-input
></span>
</li>
<li>
<span
><em>客户名称</em
><el-input
class="w210"
v-model="msg.Tourists_Name"
placeholder="请输入客户名称"
@keyup.enter.native="getList"
></el-input
></span>
</li>
<li>
<span
><em>客户电话</em
><el-input
class="w210"
v-model="msg.Tourists_Tel"
placeholder="请输入客户电话"
@keyup.enter.native="getList"
></el-input
></span>
</li>
<li>
<span
><em>{{ $t("sm.Date") }}</em>
<el-date-picker
v-model="msg.StartDate"
class="w135"
value-format="yyyy-MM-dd"
type="date"
:picker-options="pickerBeginDateBefore"
></el-date-picker>
-
<el-date-picker
v-model="msg.EndDate"
class="w135"
value-format="yyyy-MM-dd"
type="date"
:picker-options="pickerBeginDateAfter"
></el-date-picker>
</span>
</li>
<li>
<input type="button" @click="" class="normalBtn" value="一日游合同" />
<input type="button" @click="" class="normalBtn" value="境内旅游合同" />
<input type="button" @click="" class="normalBtn" value="单项委托合同" />
<span
><em>合同状态</em>
<el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
<el-option label="请选择" :value="-1" :key="-1"> </el-option>
<el-option label="正常" :value="0" :key="0"> </el-option>
<el-option label="删除" :value="1" :key="1"> </el-option>
</el-select>
</span>
</li>
<li>
<input
type="button"
class="normalBtn"
:value="$t('pub.searchBtn')"
@click="
getList();
resetPageIndex();
"
/>
</li>
<li>
<input
type="button"
@click="goContract('onedayTripContract')"
class="normalBtn"
value="一日游合同"
/>
<input
type="button"
@click="goContract('DomesticTravelcontract')"
class="normalBtn"
value="境内旅游合同"
/>
<input
type="button"
@click="goContract('SingleContract')"
class="normalBtn"
value="单项委托合同"
/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<table
class="singeRowTable"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr>
<th width="300">编号</th>
<th width="800">地址</th>
<th width="100">城市</th>
<th>操作</th>
<th width="80">编号</th>
<th width="120">合同编号</th>
<th width="150">客户名称</th>
<th width="150">客户联系电话</th>
<th width="150">客户地址</th>
<th width="150">合同状态</th>
<th width="100">创建人</th>
<th width="120">创建时间</th>
<th width="130">操作</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.C_BusCode}}</td>
<td>{{item.C_BreakfastAddress}}</td>
<td>{{item.C_ComplaintCity}}</td>
<tr v-for="(item, index) in dataList" :key="index">
<td>{{ item.ID }}</td>
<td>{{ item.T_ContractNum }}</td>
<td>{{ item.Tourists_Name }}</td>
<td>{{ item.Tourists_Tel }}</td>
<td>{{ item.Tourists_Addres }}</td>
<td>{{ item.StatusStr }}</td>
<td>{{ item.CreateByName }}</td>
<td>{{ item.CreateTimeStr }}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="goContract('onedayTripContract',item)"></el-button>
<el-tooltip
class="item"
effect="dark"
content="修改"
placement="top-start"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="goContract('onedayTripContract', item.ID)"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top-start"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="DeleteContract(item)"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
>
</el-pagination>
</div>
</template>
<script>
export default {
export default {
data() {
return {
total: 0,
currentPage: 1,
dataList: [],
loading: false, //页面加载
msg: {
T_ContractNum: "", //合同编号
Tourists_Name: "", //客户名称
Tourists_Tel: "", //客户电话
StartDate: "", //开始日期
EndDate: "", //结束日期
Status: -1, //合同状态
pageIndex: 1,
pageSize: 15,
pageSize: 15
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
return false;
} else {
let endTime = new Date(this.msg.EndDate);
return endTime.getTime() < time.getTime();
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate);
return startTime.getTime() >= time.getTime();
}
}
};
},
mounted() {
this.getList()
this.getList();
},
methods: {
getList() { //获取列表数据
this.apipost("travelcontract_get_GetPageListService", this.msg, res => {
console.log(res,'resss');
//删除合同
DeleteContract(item) {
var that = this;
this.Confirm("是否此合同删除?", function() {
var msg = {
ID: item.ID
};
that.apipost(
"travelcontract_post_RemoveTravelContractService",
msg,
res => {
if (res.data.resultCode == 1) {
that.Success("删除成功！");
that.getList();
} else {
that.Error(res.data.message);
}
},
null
);
});
},
getList() {
this.loading = true;
//获取列表数据
this.apipost(
"travelcontract_get_GetPageListService",
this.msg,
res => {
this.loading = false;
console.log("res.data.data", res.data.data);
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {}
}, err => {})
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
goContract(path,item) {
goContract(path, Id) {
var nId = 0;
if (Id && Id > 0) {
nId = Id;
}
this.$router.push({
name: path,
query: {
"id": item.ID,
blank: 'y',
id: nId,
blank: "y",
tab: "一日游合同"
}
})
},
});
}
}
};
</script>
src/components/busManagement/BusInfo.vue
View file @ e52d6023
......@@ -414,7 +414,7 @@
<input v-if="IsEditBus==0" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
@click="SaveList(0)" :disabled="disButton" :value="$t('ground.baocuncaogao')" />
<input v-if="IsEditBus==1" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
@click="SaveList(1)" :disabled="disButton" :value="$t('pub.saveBtn')" />
@click="SaveList(0)" :disabled="disButton" :value="$t('pub.saveBtn')" />
<span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
{{$t('ground.xzdanbuneng')}}
</span>
......
src/components/commonPage/commonTripList.vue 0 → 100644
View file @ e52d6023
<style>
.leftDayList{
display:inline-block;
}
.dayNum{
font-weight: bold;
font-size: 16px;
margin-left: -42px;
position: relative;
z-index: 2;
margin-bottom: 5px;
display: block;
}
.siteList{
display: inline-block;
position: relative;
border-left: 2px solid #ebebec;
position: relative;
padding: 0 0 20px;
margin-left: 10px;
}
</style>
<template>
<div>
<div class="leftDayList">
<span class="dayNum">第1天</span>
</div>
<div class="siteList">
<el-form-item label="前往地" label-width='100px'>
<el-input type="text" class="w300"></el-input
>&nbsp;仲裁委员会仲裁；
</el-form-item>
</div>
</div>
</template>
src/components/onedayTripContract.vue
View file @ e52d6023
......@@ -271,6 +271,26 @@
.onedayAccount .el-form-item__label {
margin-top: 5px;
}
.ContractNum{
font-size:16px!important;
color:#5882bb;
margin-left:20px;
}
.Tc_ExchangeBtn{
padding:3px 10px;
background-color: #006dcc;
color:#fff;
float:right;
margin-top:10px;
border: none;
outline: none;
cursor: pointer;
}
.Tc_ExchangeBtn:hover{
color: #ffffff;
background-color: #0044cc;
*background-color: #003bb3;
}
</style>
<template>
<div class="TC-MainContent">
......@@ -288,6 +308,7 @@
<div class="contractTit">
<span>
全国版国内旅游一日游合同示范文本
<span class="ContractNum">合同编号：{{CtObj.T_ContractNum}}</span>
<span style="color:blue;font-size:14px;"></span>
</span>
<div class="pull-right">
......@@ -960,7 +981,19 @@
</div>
</td>
</tr>
<tr>
<tr v-if="CtObj.C_SolveType==1">
<td>
<el-form-item label="1.将争议提交" label-width='225px'>
<el-input
type="text"
class="w300"
v-model="CtObj.C_SolveRemark"
></el-input
>&nbsp;仲裁委员会仲裁；
</el-form-item>
</td>
</tr>
<tr v-if="CtObj.C_SolveType==2">
<td>
<div style="margin:0 0 20px 130px;">
2.依法向人民法院提起民事诉讼。
......@@ -996,6 +1029,7 @@
</span>
<h2>
<em>行程信息</em>
<input type="button" class="Tc_ExchangeBtn" @click="exchangeTrip()" :value="tripStr"/>
</h2>
</div>
<div style="padding:10px;background:#f9f9f9;color:red;">
......@@ -1010,10 +1044,12 @@
（8）行程安排的娱乐活动（明确娱乐活动的时间、地点和项目内容）；
《行程单》用语须准确清晰，在表明服务标准用语中不应当出现“准×星级”、“豪华”、“仅供参考”、“以××为准”、“与××同级”等不确定用语。
</div>
<div>
123
<div v-if="CtObj.TripType==0">
<el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input>
</div>
<div v-if="CtObj.TripType==1">
<commonTripList></commonTripList>
</div>
<!-- <el-input type="textarea" rows="26" resize="none" v-model="CtObj.travelContent"></el-input> -->
</div>
<div class="block mtop15" id="anchor-4" ref="anchor4">
<div class="blockTitle">
......@@ -1109,7 +1145,7 @@
type="primary"
icon="el-icon-edit"
circle
@click="item.IsShow = 1"
@click="getItem(item)"
></el-button>
</el-tooltip>
<el-tooltip
......@@ -1310,7 +1346,7 @@
</div>
</template>
<script>
import moment from "moment";
import commonTripList from "./commonPage/commonTripList.vue";
export default {
data() {
return {
......@@ -1320,6 +1356,7 @@ export default {
CtObj: {
ID: 0,
CType: 3, //合同类型:(1-单项委托协议[平台版2018]，2大陆境内旅游合同2014,3-全国版国内旅游一日游旅游合同示范文本[2015版])
T_ContractNum:'',
Tourists_Name: "",
Tourists_IDNum: "",
Tourists_Addres: "",
......@@ -1369,7 +1406,7 @@ export default {
C_IsAgreeRemove: 1, // 是否同意解除合同(1-不同意，0同意）
C_IsAgreeSpellGroup: 1, // 是否同意拼团(1-不同意，0同意）
C_SpellGroupName: "", // 拼团旅行社名称
C_SolveType: "", // 争议解决方式
C_SolveType: 2, // 争议解决方式
C_SolveRemark: "", // 争议解决方式备注
C_ContractTotal: "", // 合同总分数
C_ContractPer: 1, // 各持几份
......@@ -1405,6 +1442,7 @@ export default {
OtherConventionPrice: "", // 其他服务费用合计
OtherConvention: "", // 其他约定事项
TripJson: "",
TripType:0, //行程类型(0-简易行程，1-标准行程)
GuestJson: "", // 游客信息【json】
ShopJson: "", // 购物信息【json】
SelfFeeJson: "", // 自费信息【Json】
......@@ -1448,7 +1486,7 @@ export default {
{ required: true, message: "请输入返回地点", trigger: "change" }
]
},
tripStr:'切换到标准行程录入',
//菜单列表
menuArr: [
"合同基本信息",
......@@ -1471,9 +1509,12 @@ export default {
CGuestHealth: "健康",
IsShow: 1
}
]
],
};
},
components: {
commonTripList: commonTripList
},
methods: {
//跳转锚点
goAnchor(selector) {
......@@ -1574,6 +1615,12 @@ export default {
this.ckedIndex = 5;
}
},
getItem(item){
item.IsShow=1;
this.$forceUpdate();
},
GetData() {
this.apipost(
"travelcontract_get_GetTravelContractService",
......@@ -1581,8 +1628,10 @@ export default {
res => {
if (res.data.resultCode == 1) {
var tempObj = res.data.data;
console.log(tempObj,'tempobj');
this.CtObj.ID = tempObj.ID;
this.CtObj.CType = tempObj.CType;
this.CtObj.T_ContractNum = tempObj.T_ContractNum;
this.CtObj.Tourists_Name = tempObj.Tourists_Name;
this.CtObj.Tourists_IDNum = tempObj.Tourists_IDNum;
this.CtObj.Tourists_Addres = tempObj.Tourists_Addres;
......@@ -1717,7 +1766,7 @@ export default {
gItem.IsShow = 0;
});
}
console.log(this.CtObj.ContractGuestList,'this.CtObj.ContractGuestList');
if (
tempObj.ContractTripList &&
tempObj.ContractTripList != null &&
......@@ -1733,6 +1782,16 @@ export default {
},
err => {}
);
},
//点击切换行程
exchangeTrip(){
if(this.CtObj.TripType==0){
this.CtObj.TripType=1;
this.tripStr='切换到简易行程录入';
}else{
this.CtObj.TripType=0;
this.tripStr='切换到标准行程录入';
}
}
},
mounted() {
......
src/components/platformModule/companyManagement.vue
View file @ e52d6023
......@@ -107,6 +107,8 @@
<th>{{$t('admin.admin_isshow')}}</th>
<th>B2B是否显示</th>
<th>公司类型</th>
<th>是否服务费收费</th>
<th v-if="userInfoList.EmployeeId==1||userInfoList.EmployeeId==5||userInfoList.RB_Branch_id==49">服务费用</th>
<th width="200">{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList" v-loading='loading'>
......@@ -117,6 +119,8 @@
<td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.B2BShow==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td>{{item.IsFreeFee==0?'付费':'免费'}}</td>
<td v-if="userInfoList.EmployeeId==1||userInfoList.EmployeeId==5||userInfoList.RB_Branch_id==49">{{item.ServiceFee}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
......@@ -200,6 +204,17 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class='w400' label='是否服务费收费'>
<el-select v-model='addMsg.IsFreeFee' :placeholder="$t('pub.pleaseSel')"
class='w280'>
<el-option label="付费" :value='0'></el-option>
<el-option label="免费" :value='1'></el-option>
</el-select>
</el-form-item>
<el-form-item class='w400' label='服务费用' v-if="addMsg.IsFreeFee==0">
<el-input type="text" v-model="addMsg.ServiceFee"></el-input>
</el-form-item>
<el-form-item label='公司确认章'>
<el-upload class="avatar-uploader" :http-request="UploadImage" :show-file-list="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
......@@ -363,19 +378,23 @@
GatheringAddress: '',
TravelLogo: '',
CompanyTitle: '',
IsFreeFee:0,
ServiceFee:0
},
updateMsg: {
GroupId: '1'
},
userInfoList:{},
}
},
mounted() {
let userInfo = this.getLocalStorage(); //获取用户登录信息
var userInfo = this.getLocalStorage(); //获取用户登录信息
if (this.$route.query.id != undefined) { //如果用户从集团页面跳到 公司页面， 那查询公司使用的是 选中集团id. 如果直接进入公司页面， 默认使用该用户登录信息中的 集团id
this.addMsg.RB_Group_Id = this.msg.RB_Group_Id = this.$route.query.id;
} else {
this.addMsg.RB_Group_Id = this.msg.RB_Group_Id = userInfo.RB_Group_id
}
this.userInfoList=userInfo;
this.getProvince();
this.getList();
this.getGroup();
......@@ -509,6 +528,7 @@
this.addMsg.TravelLogo = '';
this.imageUrl = '';
this.imageUrlLogo = '';
this.addMsg.ServiceFee = 0;
},
//获取城市列表
getProvince() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment