Skip to content

S
SuperMan
Commit 1d0cfa54 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 9c6a44d4 ff8407ef
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 39 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 1d0cfa54
......@@ -840,7 +840,7 @@
<div class="_explain">
<div class="illustrate-text">
<p class="illustrate-left">附加说明：
<span class="fr" v-if="GetDetail.Course_Name">
<span class="fr" v-if="isReceivablesAccount&&GetDetail.Course_Name">
收款类型：{{GetDetail.Course_Name}}/{{GetDetail.PayReceipt_No}}
</span>
<span class="fr" v-if="GetDetail.ComplainID > 0"
......@@ -1988,6 +1988,9 @@
<img v-for="(src,index) in images" :src="src" :key="index">
</viewer>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<!-- 跟团订单、当地游订单，获取订单客户签约信息 -->
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
</div>
</template>
<script>
......@@ -2012,6 +2015,7 @@
import SamePayment from './components/SamePayment';
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall'
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
export default {
data() {
return {
......@@ -2185,7 +2189,9 @@
LeadState: false,
huijiShow: false,
F_PayMoney_CapitalPool: false,
is_financeShow: false
is_financeShow: false,
isReceivablesAccount: false,
clientData: {}
}
},
components: {
......@@ -2208,11 +2214,29 @@
CostmonthDetails,
SamePayment,
UserCredit,
RollCall
RollCall,
OrderReceivablesAccount
},
methods: {
// 获取订单客户收款账号
getReceivablesAccount(OrderID){
this.apipost('Financial_post_GetCanActivityContractInfo', {
OrderId: OrderID
}, res => {
if (res.data.resultCode == 1) {
this.clientData = res.data.data
if(res.data.data.State==1){
this.isReceivablesAccount = true
}
}else{
this.Error(res.data.message)
}
}, err => {})
},
getCourseId(){
if(!this.AuditOrRefundMsg.CourseId){
this.AuditOrRefundMsg.PayReceiptNo = ''
this.AuditOrRefundMsg.CourseName = ''
return
}
......@@ -3572,10 +3596,11 @@
}
this.chongJudge(data)
this.GetDetail = data;
if(data.TemplateId==27&&data.Course_Name) {
if(data.TemplateId==27&&data.Course_Name&&data.OrderID>0&&data.TCIDList&&data.TCIDList.length>0) {
this.AuditOrRefundMsg.CourseName = data.Course_Name
this.AuditOrRefundMsg.CourseId = data.Course_Name=='银行卡'?1:12
this.AuditOrRefundMsg.PayReceiptNo = data.PayReceipt_No
this.getReceivablesAccount(this.GetDetail.OrderID)
}
let list = this.GetDetail.AuditSteps.filter(x => x.NextStep === 1);
if (list.length) {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 1d0cfa54
......@@ -1445,7 +1445,7 @@
</div>
<div style="padding-left: 75px;">
<button class="hollowFixedBtn"
v-if="(bossID===1 || bossID===5||bossID===1903) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)"
v-if="(bossID===1 || bossID===5||bossID===1903 || bossID===2786) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)"
@click="bohui()">驳回</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button>
</div>
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 1d0cfa54
......@@ -376,7 +376,7 @@
</p>
<div class="rb_top_row _r_mb5">
<p>{{$t('fnc.fkuanzhanghu')}}：
<el-select filterable v-model='bankType' placeholder="" @change="getAccountList(bankType)"
<el-select filterable v-model='bankType' placeholder="" @change="getAccountList(bankType),getCourseId()"
class="w100 _border_b_1">
<el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
......@@ -600,7 +600,8 @@
</el-option>
</el-select>
</span></p>
<template v-if="msg.TemplateId==27">
<!-- msg.TemplateId==27&&msg.CourseId&&orderObj&&orderObj.OrderID&&orderObj.OrderSource==8 -->
<template v-if="isReceivablesAccount">
<!--
<p style="margin-left: 15px;">
<el-tooltip class="item" effect="dark" content="请输入参加活动的转账卡号/平台用户名，不输入则此单不参与" placement="top">
......@@ -616,21 +617,29 @@
</el-select>
</span>
</p> -->
<p v-if="msg.CourseId" style="margin-left: 15px;">
<el-tooltip class="item" effect="dark" :content="AccountPrompt" placement="top">
<p style="margin-left: 15px;">
<el-tooltip v-if="(msg.CourseId!=12||(PlatformUserNameList&&PlatformUserNameList.length>0))&&msg.CourseId>0" class="item" effect="dark"
:content="AccountPrompt" placement="top">
<i class="el-icon-warning-outline" style="cursor: pointer;"></i>
</el-tooltip>
<span>
<template v-if="msg.CourseId!=12&&msg.CourseId>0">
卡号：
</template>
<template v-if="msg.CourseId==12">
<template v-if="msg.CourseId==12&&PlatformUserNameList&&PlatformUserNameList.length>0">
平台用户名称：
</template>
</span>
<span>
<el-input type="text" class="w135 _border_b_1"
v-model="msg.PayReceipt_No" :placeholder="msg.CourseId!=12&&msg.CourseId>0?'输入银行卡号后四位':'输入平台用户名'" style="width: 364px;" clearable></el-input>
<el-input v-if="msg.CourseId!=12&&msg.CourseId>0" type="text" class="w135 _border_b_1"
v-model="msg.PayReceipt_No" placeholder="输入银行卡号后四位" style="width: 364px;" clearable></el-input>
<el-select v-if="msg.CourseId==12&&PlatformUserNameList&&PlatformUserNameList.length>0"
v-model="msg.PayReceipt_No" placeholder="选择平台用户名称" clearable
class="w135 _border_b_1"
style="width: 100%;">
<el-option v-for="(item,index) in PlatformUserNameList" :key="index" :label="item"
:value="item"></el-option>
</el-select>
</span>
</p>
</template>
......@@ -774,11 +783,16 @@
</div>
</div>
</div>
<!-- 跟团订单、当地游订单，获取订单客户签约信息 -->
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
</div>
</template>
<script>
import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
import TicketingModule from "../commonPage/TicketingModule.vue";
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
export default {
data() {
return {
......@@ -940,16 +954,33 @@
StoredCustomerList: [],
isDepositCustomer: false,
AccountPrompt: '',
isReceivablesAccount: false,
clientData: {},
PlatformUserNameList: []
}
},
methods: {
// 获取订单客户收款账号
getReceivablesAccount(OrderID){
this.apipost('Financial_post_GetCanActivityContractInfo', {
OrderId: OrderID
}, res => {
if (res.data.resultCode == 1) {
this.clientData = res.data.data
this.PlatformUserNameList = res.data.data.PlatformUserNameList
if(res.data.data.State==1){
this.isReceivablesAccount = true
}
}else{
this.Error(res.data.message)
}
}, err => {})
},
// 客户平台名称
getCourseId(){
this.msg.PayReceipt_No = ''
if(!this.msg.CourseId){
this.msg.Course_Name = ''
return
}
let list = this.PaymentMethodList.filter(x=>{ return x.Id==this.msg.CourseId })
this.msg.Course_Name = list[0].Name
this.$forceUpdate()
......@@ -1248,14 +1279,16 @@
},
getAccountList(i, t) { //获取账户类型对应下的账户列表
// 1 银行卡号 12平台用户名称
if(i&&i!=12){
if(i!=12){
this.msg.CourseId = 1
this.AccountPrompt = '请输入参加活动的转账卡号，不输入则此单不参与'
this.msg.Course_Name = '银行卡'
}if(i==12){
this.msg.CourseId = 12
this.AccountPrompt = '请输入参加活动的平台用户名称，不输入则此单不参与'
this.AccountPrompt = '请选择参加活动的平台用户名称，不输入则此单不参与'
this.msg.Course_Name = '平台'
}
this.getCourseId()
if (!t) {
this.msg.BankList[0].AccountId = '';
this.AccountNumber = '';
......@@ -1451,9 +1484,9 @@
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z) { //保存
if(this.msg.TemplateId==27&&this.msg.CourseId&&!this.msg.PayReceipt_No){
return this.Error(`请输入${this.msg.CourseId!=12&&this.msg.CourseId>0?'银行卡号后四位':'请输入平台用户名'}`)
}
// if(this.msg.TemplateId==27&&this.msg.CourseId&&!this.msg.PayReceipt_No){
// return this.Error(`请输入${this.msg.CourseId!=12&&this.msg.CourseId>0?'银行卡号后四位':'平台用户名称'}`)
// }
if ((this.orderObj && !this.orderObj.isPrestore) || this.msg.DepositCustomerId) {
let To = Number(this.allPrice + this.msg.Fee)
let totalAmount = 0;
......@@ -1856,10 +1889,11 @@
this.msg.TemplateId = data.TemplateId
if(data.TemplateId==27&&data.Course_Name){
if(data.TemplateId==27&&data.Course_Name&&data.OrderID>0&&data.TCIDList&&data.TCIDList.length>0){
this.msg.Course_Name = data.Course_Name
this.msg.CourseId = data.Course_Name=='银行卡'?1:12
this.msg.PayReceipt_No = data.PayReceipt_No
this.getReceivablesAccount(this.msg.OrderID)
}
......@@ -2171,6 +2205,8 @@
this.AuditState.IsTravel=true;
}
}
},
mounted() {
this.getCustomerIdList();
......@@ -2211,10 +2247,15 @@
this.returnCode = this.$route.query.Conditon;
}
this.BankAccount_post_GetAccountType();
// 跟团订单、当地游订单，获取订单客户签约信息
if(this.orderObj&&this.orderObj.OrderID&&this.orderObj.OrderSource==8&&this.msg.TemplateId==27){
this.getReceivablesAccount(this.orderObj.OrderID)
}
},
components: {
"my-FlowChartModule": myFlowChartModule,
"TicketingModule": TicketingModule,
OrderReceivablesAccount,
}
}
......
src/components/FinancialModule/components/OrderReceivablesAccount.vue 0 → 100644
View file @ 1d0cfa54
<style scoped>
.OrderReceivablesAccount-form{
width: 330px;
position: fixed;
z-index: 2;
right: 16px;
top: 100px;
background: #fff;
padding: 14px 26px 14px 13px;
border-radius: 8px;
}
.OrderReceivablesAccount-title{
font-size: 18px;
font-weight: bold;
padding: 0 0 10px 0;
}
.OrderReceivablesAccount-center>div{
/* display: flex;
flex-wrap: nowrap; */
padding: 0 0 10px 0;
font-size: 14px;
}
.OrderReceivablesAccount-center>div:last-child{
padding: 0;
}
.OrderReceivablesAccount-center>div>span{
/* color: #949695; */
width: 70px;
display: inline-block;
margin-right: 10px;
text-align: right;
/* flex-shrink: 0; */
}
.OrderReceivablesAccount-contract{
display: flex;
flex-wrap: wrap;
}
.OrderReceivablesAccount-imgBox{
width: 50px;
height: 50px;
margin-right: 5px;
margin-bottom: 3px;
overflow: hidden;
position: relative;
border: 1px dashed #d1d1d1;
border-radius: 6px;
}
.imgBox-imgs img{
width: 100%;
height: 100%;
display: block;
}
.ClosePopup{
position: fixed;
right: 30px;
top: 110px;
z-index: 3;
font-size: 20px;
cursor: pointer;
}
.OrderReceivablesAccount-imgBox{
cursor: pointer;
}
.OrderReceivablesAccount-imgBox ._see_img{
opacity: 0;
}
.OrderReceivablesAccount-imgBox ._see_img {
position: absolute;
top: 0;
width: 50px;
height: 50px;
padding-top: 0;
line-height: 34px;
text-align: center;
background-color: rgba(2, 2, 2, 0.3);
display: inherit;
opacity: 0;
transition: all linear .5s
}
.OrderReceivablesAccount-imgBox:hover ._see_img {
opacity: 1;
}
.OrderReceivablesAccount-imgBox ._see_img .icon-sousuo{
margin-top: 8px;
}
.OrderReceivablesAccount-imgBox ._see_img i.iconfont {
display: inline-block;
width: 32px;
height: 32px;
border-radius: 50%;
color: #FFFFFF !important;
background-color: rgba(255, 255, 255, 0.5);
}
</style>
<template>
<div class="OrderReceivablesAccount-form" v-if="clientData&&clientData.State==1">
<div class="OrderReceivablesAccount-title">签约信息</div>
<div class="ClosePopup" @click="clickClosePopup"><i class="el-icon-close"></i> </div>
<div class="OrderReceivablesAccount-center">
<div><span>客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</span> {{clientData.CustomerName}} ({{clientData.Contact}})</div>
<div style="display: flex;">
<span>合&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;同：</span>
<div class="OrderReceivablesAccount-contract">
<div class="OrderReceivablesAccount-imgBox" v-for="(img,imgI) in clientData.ContractList" >
<div class="imgBox-imgs" v-if="img&&verificationFile(img,3)">
<el-image
style="height: 50px;"
:src="img"
:preview-src-list="[img]">
</el-image>
</div>
<div class="OrderReceivablesAccount-PDF" v-if="img&&verificationFile(img,1)"
style="width: 50px; line-height: 50px;text-align: center;">
<span class="_wenjian_P iconfont"
:class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
<div v-if="img&&verificationFile(img,1)" class="_see_img" @click="showUpLoadFile2(img)">
<i class="iconfont icon-sousuo"></i>
</div>
</div>
</div>
</div>
<div v-if="clientData.OpenBankName">
<span>签约银行：</span> {{clientData.OpenBankName}}({{clientData.CardNum}} {{clientData.AccountHolder}})
</div>
<div v-if="clientData.PlatformUserNameList&&clientData.PlatformUserNameList.length>0">
<span>签约平台：</span>
<p style="display: inline;">
<el-tag
:key="tag"
v-for="tag in clientData.PlatformUserNameList"
:disable-transitions="false"
size="mini"
style="margin-right: 5px;margin-bottom: 3px;">
{{tag}}
</el-tag>
</p>
</div>
</div>
</div>
</template>
<script>
export default {
props:['clientData'],
data() {
return {
// clientData: {}
}
},
watch: {
clientData:{
handler(val, oldVal){
},
deep: true,
immediate: true
}
},
created() {
},
methods: {
// 获取订单客户收款账号
getReceivablesAccount(){
this.apipost('Financial_post_GetCanActivityContractInfo', {
OrderId: this.orderObj.OrderID
}, res => {
if (res.data.resultCode == 1) {
this.clientData = res.data.data
if(!this.clientData.State){
this.Error(res.data.data.Msg)
this.clickClosePopup()
}
}else{
this.Error(res.data.message)
}
}, err => {})
},
showUpLoadFile2(i) { // 预览上传文件
if (i.substring(i.lastIndexOf('.') + 1, i.length).toUpperCase() == 'PDF') {
this.previewPDF(i)
} else {
window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i)
}
},
clickClosePopup(){
this.$emit('ClosePopup')
}
},
mounted() {
}
}
</script>
src/components/SalesModule/MyCustomer.vue
View file @ 1d0cfa54
......@@ -4,7 +4,7 @@
}
._info_img ul li {
height: 59px;
height: 52px;
float: left;
position: relative;
cursor: pointer
......@@ -15,16 +15,15 @@
}
._info_img ul li img {
width: 88px;
height: 59px;
width: 50px;
height: 50px;
}
._see_img {
position: absolute;
top: 0;
width: 100%;
height: 59px;
padding-top: 16px;
height: 50px;
line-height: 34px;
text-align: center;
background-color: rgba(2, 2, 2, 0.3);
......@@ -37,6 +36,7 @@
display: inline-block;
width: 32px;
height: 32px;
margin-top: 8px;
border-radius: 50%;
color: #FFFFFF !important;
background-color: rgba(255, 255, 255, 0.5);
......@@ -675,7 +675,7 @@
:preview-src-list="[img]">
</el-image>
<div v-if="img&&verificationFile(img,1)"
style="width: 88px; line-height: 59px;text-align: center;">
style="width: 50px; line-height: 50px;text-align: center;">
<span class="_wenjian_P iconfont"
:class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
......@@ -724,7 +724,7 @@
:disable-transitions="false"
@close="handleClose(tag,1)"
size="medium"
style="margin-right: 5px;">
style="margin-right: 5px;margin-bottom: 3px;">
{{tag}}
</el-tag>
<div>
......@@ -790,7 +790,7 @@
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.SigningType">
<el-col :span="6" v-show="addMsg.SigningType">
<el-form-item label="签约资料" prop="SigningFile">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
......@@ -970,7 +970,8 @@
<div style="display: flex;flex-wrap: wrap;">
<div class="_info_img" v-if="updateMsg.BusinessCardPhotos&&updateMsg.BusinessCardPhotos.length>0">
<ul class="clearfix">
<li v-for="(img,imgI) in updateMsg.BusinessCardPhotos" style="margin-right: 5px;position: relative;border:1px dashed #d1d1d1;border-radius: 6px;">
<li v-for="(img,imgI) in updateMsg.BusinessCardPhotos"
style="margin-right: 5px;position: relative;border:1px dashed #d1d1d1;border-radius: 6px;">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<el-image
v-if="img&&verificationFile(img,3)"
......@@ -978,7 +979,7 @@
:preview-src-list="[img]">
</el-image>
<div v-if="img&&verificationFile(img,1)"
style="width: 88px; line-height: 59px;text-align: center;">
style="width: 50px; line-height: 50px;text-align: center;">
<span class="_wenjian_P iconfont"
:class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
......@@ -1025,7 +1026,7 @@
:disable-transitions="false"
@close="handleClose(tag)"
size="small"
style="margin-right: 5px;">
style="margin-right: 5px;margin-bottom: 3px;">
{{tag}}
</el-tag>
<el-input
......
src/components/SalesModule/customerApproval.vue
View file @ 1d0cfa54
......@@ -4,11 +4,12 @@
}
._info_img ul li {
width: 50px;
height: 50px;
width: 52px;
height: 52px;
float: left;
position: relative;
cursor: pointer
cursor: pointer;
margin-right: 5px;border:1px dashed #d1d1d1;border-radius: 6px;
}
._info_img ul li:hover ._see_img {
......@@ -37,6 +38,7 @@
display: inline-block;
width: 32px;
height: 32px;
margin-top: 8px;
border-radius: 50%;
color: #FFFFFF !important;
background-color: rgba(255, 255, 255, 0.5);
......@@ -137,7 +139,7 @@
<p class="pImg" v-else>
<div class="_info_img" v-if="detailList.businessCardPhotos&&detailList.businessCardPhotos.length>0">
<ul class="clearfix">
<li v-for="(img,imgI) in detailList.businessCardPhotos" style="margin-right: 5px;position: relative;">
<li v-for="(img,imgI) in detailList.businessCardPhotos">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<el-image
v-if="img&&verificationFile(img,3)"
......@@ -149,7 +151,7 @@
<span class="_wenjian_P iconfont"
:class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
<div v-if="img&&verificationFile(img,1)" class="_see_img" @click="verificationFile(img,3)?'':showUpLoadFile2(img)">
<div v-if="img&&verificationFile(img,1)" class="_see_img" @click="showUpLoadFile2(img)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......
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