Skip to content

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

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

parents f462570f 9e11decc
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 23 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 48dff76a
......@@ -336,8 +336,8 @@
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
<div class="_conten">
<my-Bill v-if="GetDetail.Type!==1" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-Bill v-if="GetDetail.Type!==1 || GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1 || GetDetail.Type===5" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<div class="_explain">
<p>附加说明：</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 48dff76a
......@@ -77,7 +77,7 @@
}
</style>
<template v-if="GetDetail.DetailList.length>0">
<div class="Receipt_box" :class="[GetDetail.Type==1?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<div class="Receipt_box" :class="[GetDetail.Type==1 || GetDetail.Type==5?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<p class="rb_tit" style="font-size: 16px !important;">{{GetDetail.CompanyName}}（{{GetDetail.BranchName}}）</p>
<p class="rb_stit">
<span :class="isPrintPage?'_rb_stit_print':''">{{GetDetail.FinanceName}}</span>
......@@ -88,8 +88,8 @@
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">订单号：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="isPrintPage">打印时间：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1">汇款人(单位)：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
<p v-if="GetDetail.Type==2">付款对象：<span class="_r_name">{{GetDetail.AccountHolder}}</span>
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">汇款人(单位)：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
<p v-if="GetDetail.Type==2 || GetDetail.Type==6">付款对象：<span class="_r_name">{{GetDetail.AccountHolder}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==0">{{'私账'}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==1">{{'公账'}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==2">{{'人民币现金'}}</span>
......@@ -101,12 +101,12 @@
<p style="font-weight: bold"><span class="">编号：</span>{{GetDetail.FrID}}</p>
</div>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1">
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">
<span>付款账户(流水号)：</span>
<span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span>
<span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span>
</p>
<p v-if="GetDetail.Type==2" style="max-width: 500px">
<p v-if="GetDetail.Type==2 || GetDetail.Type==6" style="max-width: 500px">
<span>付款账户：</span>
<span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>
<span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:'无'}}</span>
......@@ -151,7 +151,7 @@
</span>
</p>
</div>
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1 || GetDetail.Type==5?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1|| GetDetail.Type==5?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">费 用 说 明</th>
<th rowspan="2">数量</th>
......@@ -227,13 +227,13 @@
</td>
</tr>
<tr>
<td class="">{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（大写）</span></td>
<td class="">{{GetDetail.Type==1|| GetDetail.Type==5?'收款金额':'付款金额'}}<br/><span class="_font_size12">（大写）</span></td>
<td colspan="3">
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.ChinesePayMoney==''?'零':GetDetail.ChinesePayMoney}}</span>
<span v-else>{{GetDetail.ChineseMoney==''?'零':GetDetail.ChineseMoney}}</span>
</td>
<td class="">
{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（小写）</span>
{{GetDetail.Type==1|| GetDetail.Type==5?'收款金额':'付款金额'}}<br/><span class="_font_size12">（小写）</span>
</td>
<td colspan="3">
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.PayMoney}}</span>
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 48dff76a
......@@ -68,7 +68,7 @@
}
</style>
<template v-if="GetDetail.DetailList.length>0" >
<div class="Receipt_box" :class="[GetDetail.Type==1?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<div class="Receipt_box" :class="[GetDetail.Type==1|| GetDetail.Type==5?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
<!-- <p style="font-size:48px;" @click="senCashierDetaildMsg">{{Num}}</p> //测试传值代码 -->
<p class="rb_tit" style="font-size: 16px !important;">{{GetDetail.CompanyName}}（{{GetDetail.BranchName}}）</p>
......@@ -126,7 +126,7 @@
</span>
</p>
</div>
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<table class="Receipt_table" border="1" :class="[GetDetail.Type==1|| GetDetail.Type==5?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1|| GetDetail.Type==5?'#c94052':'#106BAF'" style="border-collapse:collapse;">
<tr>
<th rowspan="2">费 用 说 明</th>
<th rowspan="2" width="80">数量</th>
......@@ -199,12 +199,12 @@
<td colspan="3" class="_font_size12">{{GetDetail.Fee}}</td>
</tr>
<tr>
<td class="">{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（大写）</span></td>
<td class="">{{GetDetail.Type==1|| GetDetail.Type==5?'收款金额':'付款金额'}}<br/><span class="_font_size12">（大写）</span></td>
<td colspan="3" class="_color_b">
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.ChinesePayMoney==''?'零':GetDetail.ChinesePayMoney}}</span>
<span v-else>{{GetDetail.ChineseMoney==''?'零':GetDetail.ChineseMoney}}</span>
</td>
<td class="">{{GetDetail.Type==1?'收款金额':'付款金额'}}<br/><span class="_font_size12">（小写）</span></td>
<td class="">{{GetDetail.Type==1|| GetDetail.Type==5?'收款金额':'付款金额'}}<br/><span class="_font_size12">（小写）</span></td>
<td colspan="3" class="_color_b">
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.PayMoney}}</span>
<span v-else>{{GetDetail.Money}}</span>
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 48dff76a
......@@ -411,6 +411,22 @@ Vue.component('table-RecPay',{ //收支样式
border-radius: 4px;">
收入
</span>
<span v-if="rowData.Type==5" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
应收
</span>
<span v-if="rowData.Type==6" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
应付
</span>
</span>`,
props:{
rowData:{
......@@ -433,10 +449,10 @@ Vue.component('table-BillRVB',{ //单据样式
popper-class="detailsIT_Journal"
placement="bottom-start"
trigger="click">
<template v-if="rowData.Type!=1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<template v-if="(rowData.Type==2 || rowData.Type==6)&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="rowData.Type==1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<template v-else-if="(rowData.Type==1 || rowData.Type==5)&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
......
src/components/FinancialModule/RecPayQueryV2.vue
View file @ 48dff76a
......@@ -451,10 +451,10 @@ Vue.component('table-BillRVB',{ //单据样式
popper-class="detailsIT_Journal"
placement="bottom-start"
trigger="click">
<template v-if="rowData.Type!=1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<template v-if="(rowData.Type==2||rowData.Type==6)&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="rowData.Type==1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<template v-else-if="(rowData.Type==1 || rowData.Type==5)&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
......@@ -596,8 +596,8 @@ Vue.component('table-TradeWay',{ //交易方式
Vue.component('table-Money',{ //金额
template:`
<span>
<p style="line-height:20px">{{rowData.Type==1?'应收':'应付'}}：<span>{{rowData.Money}}</span></p>
<p style="line-height:20px">{{rowData.Type==1?'实收':'实付'}}：<span>{{rowData.PayMoney}}</span></p>
<p style="line-height:20px">{{rowData.Type==1 || rowData.Type==5?'应收':'应付'}}：<span>{{rowData.Money}}</span></p>
<p style="line-height:20px">{{rowData.Type==1 || rowData.Type==6?'实收':'实付'}}：<span>{{rowData.PayMoney}}</span></p>
</span>`,
props:{
rowData:{
......@@ -614,7 +614,7 @@ Vue.component('table-Money',{ //金额
Vue.component('table-ClientTypeName',{ //付款对象
template:`
<span>
<span style="color: gray">{{rowData.Type==2?rowData.ClientTypeName+'：':'汇款人：'}}</span><span>{{rowData.RemitterName}}</span>
<span style="color: gray">{{rowData.Type==2|| rowData.Type==6?rowData.ClientTypeName+'：':'汇款人：'}}</span><span>{{rowData.RemitterName}}</span>
</span>
`,
props:{
......
src/components/SalesModule/advert.vue
View file @ 48dff76a
......@@ -682,7 +682,7 @@ export default {
}
this.apipost("Advertising_get_GetAdvertisingList", msg, x => {
x.data.data.pageData.forEach(x=>{
x.src=`${x.SamplePicturesUrl}?x-oss-process=image/resize,w_200`
x.src= this.compressImg(x.SamplePicturesUrl, "filt", 200, "")
x.id=x.ID
})
if(x.data.data.pageData.length==0){
......@@ -697,7 +697,7 @@ export default {
},err => {})
},
getcountry(){
this.apipost("dict_post_Destination_GetCountry", {}, x => {
this.apipost("dict_post_Destination_GetCountry", {}, x => {
this.countrys=x.data.data
},err => {})
},
......
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