Skip to content

S
SuperMan
Commit 7c09ad44 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 8b0f1f9a 72c14ff6
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 16 deletions
src/assets/css/tripIndexNewHV.css
View file @ 7c09ad44
.LeaveGroupDownload-form.LeaveGroupDownload-formHV .flight_list td{
background: none !important;
}
.LeaveGroupDownload-form.LeaveGroupDownload-formHV{
background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat;
}
.hangban-info.hangban-infoHV{
background: none !important;
}
......@@ -15,6 +18,7 @@
border-radius: 60px 0px 60px 0px;
}
.travelDaysHV-Description{
height: 160px;
font-size: 24px;
line-height: 34px;
color: #484647;
......@@ -29,8 +33,8 @@
margin-top: 10px;
}
.travelDaysHV-Description.travelDaysHV-Description3{
height: 295px;
-webkit-line-clamp: 9;
height: 275px;
-webkit-line-clamp:8;
margin-top: 20px;
}
.travelDaysHV-CouponsName span.CouponsNameM{
......@@ -111,6 +115,7 @@
.travelDaysHVContent-text .textBold{
font-size: 30px;
margin-bottom: 29px;
font-weight: bold;
}
.travelDaysHVContent-text:last-child{
margin-bottom: 0;
......@@ -118,7 +123,7 @@
.travelDaysHVContent-text{
font-size: 26px;
font-family: DengXian;
font-weight: bold;
font-weight: 400;
color: #FFFFFF;
line-height: 40px;
margin-bottom: 40px;
......@@ -133,6 +138,7 @@
padding: 0 47px 40px 47px;
}
.travelDaysHVContent{
max-height: 695px;
padding: 42px 55px;
background: rgba(23,23,23,0.4);
margin: 0 57px;
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 7c09ad44
......@@ -2080,6 +2080,9 @@
<!-- 跟团订单、当地游订单，获取订单客户签约信息 -->
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
<!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount"
:clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
</div>
</template>
<script>
......@@ -2105,6 +2108,7 @@
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall'
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
import ClientBankAccount from "./components/ClientBankAccount.vue";
export default {
data() {
return {
......@@ -2285,7 +2289,9 @@
is_financeShow: false,
isReceivablesAccount: false,
clientData: {},
InvoiceLoading: false
InvoiceLoading: false,
isClientBankAccount:false,
clientBankAccountData:{},
}
},
components: {
......@@ -2309,7 +2315,8 @@
SamePayment,
UserCredit,
RollCall,
OrderReceivablesAccount
OrderReceivablesAccount,
ClientBankAccount
},
methods: {
// 发票审核
......@@ -3668,6 +3675,17 @@
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (data.Type==2){
this.isClientBankAccount=true;
}
this.clientBankAccountData={
AccountHolder:data.AccountHolder,
AccountNumber:data.AccountNumber,
SupplierName:data.SupplierName,
DutyNo:data.DutyNo,
AccountTypeStr:data.AccountTypeStr,
AccountCreateTime:data.AccountCreateTime
}
this.benMoney = 0
this.AuditOrRefundMsg.KingdeeInvoice=data.KingdeeInvoice+"";
data.DetailList.forEach(x => {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 7c09ad44
......@@ -1048,6 +1048,7 @@
@click="goSigningCustomer(GetDetail.SigningCustomerId,GetDetail.SigningCustomerName)">
签约客户：{{GetDetail.SigningCustomerName}}</span></a>
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
:isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
......@@ -1534,6 +1535,9 @@
<!-- 跟团订单、当地游订单，获取订单客户签约信息 -->
<OrderReceivablesAccount v-if="isReceivablesAccount"
:clientData="clientData" @ClosePopup="isReceivablesAccount=false"></OrderReceivablesAccount>
<!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount"
:clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
</div>
</template>
<script>
......@@ -1562,6 +1566,7 @@
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall';
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
import ClientBankAccount from "./components/ClientBankAccount.vue";
export default {
data() {
return {
......@@ -1645,7 +1650,9 @@
CostTypeState: false,
huijiShow: false,
clientData: {},
clientBankAccountData:{},
isReceivablesAccount: false,
isClientBankAccount:false,
ActionMenuCode: ''
}
},
......@@ -1673,7 +1680,8 @@
SamePayment,
UserCredit,
RollCall,
OrderReceivablesAccount
OrderReceivablesAccount,
ClientBankAccount
},
created() {
// // crm自动登陆传过来的参数
......@@ -2627,6 +2635,18 @@
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (data.Type==2){
this.isClientBankAccount=true;
}
this.clientBankAccountData={
AccountHolder:data.AccountHolder,
AccountNumber:data.AccountNumber,
SupplierName:data.SupplierName,
DutyNo:data.DutyNo,
AccountTypeStr:data.AccountTypeStr,
AccountCreateTime:data.AccountCreateTime
}
//2023-11-23 add by:W
if(data.InvoiceVoucherInfo){
this.InvoiceVoucherList=data.InvoiceVoucherInfo;
......
src/components/FinancialModule/components/ClientBankAccount.vue 0 → 100644
View file @ 7c09ad44
<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="clientBankAccountData">
<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;商：</span> {{clientBankAccountData.AccountTypeStr==='0'?clientBankAccountData.SupplierName:"非供应商"}} </div>
<div v-if="clientBankAccountData.AccountTypeStr==='0'"><span>税&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</span> {{clientBankAccountData.DutyNo}} </div>
<div >
<span>账户信息：</span> {{clientBankAccountData.AccountHolder}}({{clientBankAccountData.AccountNumber}} )
</div>
<div >
<span>创建日期：</span> {{clientBankAccountData.AccountCreateTime}}
</div>
</div>
</div>
</template>
<script>
export default {
props:['clientBankAccountData'],
data() {
return {
// clientBankAccountData: {}
}
},
// watch: {
// clientData:{
// handler(val, oldVal){
// },
// deep: true,
// immediate: true
// }
// },
created() {
},
methods: {
clickClosePopup(){
this.$emit('ClosePopup')
}
},
mounted() {
}
}
</script>
src/components/administrative/empBankAccount.vue
View file @ 7c09ad44
......@@ -27,6 +27,7 @@
:style="{'height':accountList.length>0?'355px':'188px'}">
<p>
{{dialogTitle}}
<span style="font-size:12px;color:red;">*如果是个人则无需填写税号，如是供应商则必填税号；</span>
<span class="fr">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
......@@ -49,18 +50,20 @@
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.AccountClassify!=3 && addMsg.AccountClassify!=4' :gutter="35">
<el-form-item :label="nameA" prop="OpenBankName">
<el-form-item :label="nameA" prop="OpenBankName">
<el-input type="text" v-model="addMsg.OpenBankName" :placeholder="$t('ground.liruzhihang')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='addMsg.AccountClassify!=3 && addMsg.AccountClassify!=4' :gutter="35">
<el-form-item :label="nameB" prop="AccountHolder">
<el-input type="text" v-model="addMsg.AccountHolder"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="nameC" prop="CardNum">
<el-input type="text" v-model="addMsg.CardNum"></el-input>
<el-col :span="4" :gutter="35">
<el-form-item :label="nameC" prop="CardNum" >
<el-input type="text" v-model="addMsg.CardNum" onkeyup="value=value.replace(/[^\w\u4E00-\u9FA5]/g, '')" placeholder="卡号请输入中文、数字、字母"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -84,7 +87,9 @@
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="addMsg.Type!=0&&addMsg.Type!=10&&ClientTypeList.length>0">
<el-form-item label="客户名称" prop="ObjID">
......@@ -108,6 +113,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="税号：" prop="DutyNo" >
<el-input type="text" v-model="addMsg.DutyNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="供应商：" prop="SupplierName" >
<el-input type="text" v-model="addMsg.SupplierName"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if="accountList.length" style="padding: 20px; display: flex; justify-content: center; align-items: center;flex-direction: column">
......@@ -337,6 +352,8 @@
AccountType:'1',
AccountClassify:'2',
Type:'9',
DutyNo:'',
SupplierName:'',
},
rules:{
BankName:[
......@@ -396,6 +413,7 @@
this.supplierList.filter(x=>{
if(x.ID==this.addMsg.ObjID){
this.addMsg.ObjIdStr = x.Name
this.addMsg.SupplierName = x.Name
}
})
},
......@@ -637,6 +655,13 @@
this.$message.error('请选择客户名称')
return
}
console.log("this.addMsg.Type",this.addMsg.Type);
if (this.addMsg.Type!=7&&this.addMsg.Type!=9&&this.addMsg.Type!=10) {
if(this.addMsg.DutyNo==''||this.addMsg.DutyNo==undefined){
this.$message.error('请填写税号')
return
}
}
this.addMsg.ObjID = this.addMsg.ObjID!='-1'&&this.addMsg.ObjID!=null?this.addMsg.ObjID:this.$route.query.id
if(this.addMsg.AccountClassify!='3' && this.addMsg.AccountClassify!='4'){
if(this.addMsg.OpenBankName==''){
......@@ -656,8 +681,8 @@
this.$message.error(this.$t('visaT.Pleasefillin')+this.nameD)
return
}
// 查询是否有冲突的账户信息
this.checkCanAdd()
this.checkCanAdd()
},
addAccount() {
this.apipost("admin_post_SetEmpBankAccount",this.addMsg,res=>{
......@@ -674,7 +699,13 @@
},err=>{})},
checkCanAdd() {
this.apipost('admin_post_GetBackAccount',{RB_Group_Id: this.addMsg.ObjID, ...this.addMsg},res=>{
this.$confirm("客户类型与税号请务必填写正确，避免单据驳回！！", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('admin_post_GetBackAccount',{RB_Group_Id: this.addMsg.ObjID, ...this.addMsg},res=>{
if(res.data.resultCode==1){
if(res.data.data && res.data.data.length) {
this.accountList = res.data.data
......@@ -684,6 +715,8 @@
}else{
this.$message.error(res.data.message)}
},err=>{})
})
.catch(() => {});
},
updateData(id){ //修改角色
this.apipost('admin_get_GetEmpBackAccount',{BAId:id},res=>{
......@@ -694,6 +727,8 @@
this.addMsg.BankId=res.data.data.BankId
this.addMsg.IsOtherEdit = 1
this.supplierMsg.Type = this.addMsg.Type
this.addMsg.DutyNo=res.data.data.DutyNo
this.addMsg.SupplierName=res.data.data.SupplierName
if(this.addMsg.ObjIdStr){
this.supplierMsg.Name = this.addMsg.ObjIdStr
this.getSupplierGetPageList()
......@@ -764,14 +799,15 @@
this.currentPage = 1
},
submitForm(addMsg) {//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData();
this.addData();
} else {
return false;
}
});
},
closeChangeMachie(done){//弹出框关闭初始化弹框内表单
done();
......
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