Skip to content

S
SuperMan
Commit ed16327b authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents a8817daf 71aba524
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 9 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ ed16327b
......@@ -93,7 +93,6 @@
}
.cm_content{
width: 100%;
height: 600px;
}
.BalanceBox{
......@@ -173,7 +172,8 @@
</el-row>
</el-form>
<div>
<span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span>
<!-- <span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span> -->
<span>注：均根据填入的银行流水计算得到期末余额</span>
</div>
<ul>
<li>
......@@ -187,7 +187,7 @@
</div>
<div class="cm_content">
<el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600"
style="width: 100%;"
v-loading="loadingTable"
:span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }"
......@@ -206,7 +206,8 @@
:key="index"
align="center">
<template #header>
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i v-if="msg.BankType==1&&(msg.BankId==1||msg.BankId==35)" style="color: #33B3FF" class="el-icon-edit"></i> </div>
<!-- <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i v-if="msg.BankType==1&&(msg.BankId==1||msg.BankId==35)" style="color: #33B3FF" class="el-icon-edit"></i> </div> -->
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center">
......@@ -256,9 +257,9 @@
</el-table-column>
</el-table-column>
</template>
</el-table>
</div>
<div style="height:30px"></div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
<addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
<BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
......@@ -308,6 +309,7 @@ export default {
isShowBankSta: false,
BankStaObj:{
BankId: 0,//银行ID
BankType: 1,
Date: '',// 日期
StartBalance: '',// 期初余额
Image: '',
......@@ -373,6 +375,7 @@ export default {
this.BankStaObj = {
Id: 0,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: '',
StartBalance: 0,
Image: '',
......@@ -392,10 +395,11 @@ export default {
this.isShowBankSta = true
},
getTimeObj(item){
if(!(this.msg.BankType==1&&(this.msg.BankId==1||this.msg.BankId==35))){return;}
// if(!(this.msg.BankType==1&&(this.msg.BankId==1||this.msg.BankId==35))){return;}
this.BankStaObj = {
Id: 1,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: item.StartDate,
StartBalance: item.StartBalance,
Image: '',
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ ed16327b
......@@ -978,7 +978,7 @@
<td @click="gotoTravelList(o)" v-if="GetDetail.CreateBy!=userInfo.EmployeeId"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && GetDetail.CreateBy!=userInfo.EmployeeId"
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && (GetDetail.CreateBy!=userInfo.EmployeeId || ActionMenuCode.indexOf('S_Travel_AirLoss') != -1)"
@click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)">
<span class="_jump_page _font_bold">{{$t('objFill.tdsz')}}</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span
......
src/components/SalesModule/Common/signedClientList.vue
View file @ ed16327b
......@@ -507,7 +507,7 @@
<span>{{ item.contact }}</span>
</td>
<td>{{ item.contactNumber }}</td>
<td>{{ item.customerName }}</td>
<td> {{ item.customerName }} </td>
<td>{{ item.customerStatusStr }}</td>
<td><span @click="goUrlCC(item.customerId,3)"
style="cursor: pointer;text-decoration: underline;">{{item.tradeTotal}}</span></td>
......
src/components/SalesModule/MyCustomer.vue
View file @ ed16327b
......@@ -842,6 +842,12 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" >
<el-checkbox v-model='addMsg.IsGuideOrLeader'>是否领队/导游
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
......@@ -916,6 +922,12 @@
<el-input v-model='updateMsg.Contact'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" >
<el-checkbox v-model='updateMsg.IsGuideOrLeader'>是否领队/导游
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
<el-form-item :label="$t('salesModule.c_email')" prop="Email">
<el-input v-model="updateMsg.email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
......@@ -1113,6 +1125,7 @@
},
addMsg: {
CustomerId: 0,
IsGuideOrLeader:false,
customerName: '',
contact: '',
contactNumber: '',
......@@ -1245,6 +1258,7 @@
contactNumber: '',
CustomerName: '',
CustomerId: 0,
IsGuideOrLeader:false,
Address: '',
Country: 2,
Province: 0,
......@@ -1492,6 +1506,7 @@
this.$message.error(this.$t('objFill.qingsrxqdz'))
return
}
this.updateMsg.IsGuideOrLeader = this.updateMsg.IsGuideOrLeader ? 1 : 0
this.apipost('app_customer_UpdateCustomerAddress', this.updateMsg, res => {
if (res.data.resultCode == 1) {
this.addLayer1 = false;
......@@ -1556,6 +1571,7 @@
this.updateMsg.CustomerName = x.customerName
this.updateMsg.Contact = x.contactName
this.updateMsg.CustomerId = x.customerId
this.updateMsg.IsGuideOrLeader=x.isGuideOrLeader==1?true:false
this.updateMsg.Address = x.address //x.address.split(',')[1]
this.updateMsg.Province = x.province
this.getCityNew()
......@@ -1713,6 +1729,7 @@
this.getRegion1()
this.addMsg.District = x.district
this.addMsg.Duty = x.duty
this.addMsg.IsGuideOrLeader=x.IsGuideOrLeader==1?true:false
this.addMsg.Premises = x.premises
this.addMsg.CustomerSourceType = x.customerSourceType
let dictid = []
......@@ -2016,8 +2033,10 @@
}
this.addMsgS.customerInfo = {
...this.addMsg,
SigningType: this.addMsg.SigningType ? 1 : 0
SigningType: this.addMsg.SigningType ? 1 : 0,
IsGuideOrLeader:this.addMsg.IsGuideOrLeader ? 1 : 0,
}
this.loadingSave = true
this.apipost('app_add_new_visit_customer', this.addMsgS, res => {
if (res.data.resultCode == 1) {
......@@ -2041,6 +2060,7 @@
},
cancelData() {
this.addMsg.CustomerId = 0;
this.addMsg.IsGuideOrLeader=false;
this.addMsg.customerName = "";
this.addMsg.contact = "";
this.addMsg.contactNumber = "";
......
src/components/TravelContractConfirm.vue
View file @ ed16327b
......@@ -1408,6 +1408,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br>
<p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
......@@ -1938,6 +1939,7 @@
</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
......@@ -2565,6 +2567,7 @@
<p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p>
<p>使用形式</p>
<p>
......
src/components/TravelContractDetail.vue
View file @ ed16327b
......@@ -831,6 +831,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>第二十二条 人身意外伤害保险</h3>
<p>1.出境社提示旅游者购买人身意外伤害保险；</p>
<p>
......
src/components/TravelContractView.vue
View file @ ed16327b
......@@ -890,6 +890,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br>
<p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
......@@ -1363,6 +1364,7 @@
</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
......@@ -1914,6 +1916,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p>
<p>使用形式</p>
<p>
......
src/components/clientConfirm.vue
View file @ ed16327b
......@@ -970,6 +970,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">第二十二条 人身意外伤害保险</p>
</h3>
......
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