Skip to content

S
SuperMan
Commit dac8e513 authored by youjie's avatar youjie
Browse files
Options

no message

parent da591fe7
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 57 deletions
src/components/DomesticModule/FinancialOrder.vue
View file @ dac8e513
......@@ -92,7 +92,7 @@
</style>
<template>
<div class="flexOne page_SettlementOrder page_FinancialOrder">
<p>{{Name}}</p>
<p>{{Name}}收入</p>
<div class="_content">
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading='loading'>
......@@ -108,7 +108,7 @@
<th>凭证</th>
<th>状态</th>
</tr>
<template v-for="(item,index) in dataList">
<template v-for="(item,index) in SRDataList">
<tr :key="index" v-if="type&&item.Type==type&&(item.Status==2||(item.Status==1&&item.TradeDate))">
<td><span class="_jump_page" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td>{{item.TradeDate}}</td>
......@@ -168,9 +168,90 @@
</template>
<tr>
<td>总计</td>
<td :colspan="9" class="allMoney PingFangSC" :class="Money>0?'_color_red':'_color_green'">{{Money}}</td>
<td :colspan="9" class="allMoney PingFangSC" :class="Money>0?'_color_red':'_color_green'">{{SRMoney}}</td>
</tr>
</table>
</div>
<p style="margin-top: 15px;">{{Name}}支出</p>
<div class="_content">
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading='loading'>
<tr>
<th>财务单号</th>
<th>交易日期</th>
<th>单据类型</th>
<th>费用类型</th>
<th>付款批次</th>
<th>代垫项目</th>
<th>{{$route.query.type==1?'实收':'应付'}}金额</th>
<th>制单人</th>
<th>凭证</th>
<th>状态</th>
</tr>
<template v-for="(item,index) in ZCDataList">
<tr :key="index" v-if="type&&item.Type==type&&(item.Status==2||(item.Status==1&&item.TradeDate))">
<td><span class="_jump_page" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td>{{item.TradeDate}}</td>
<td>{{item.Type==1?'收入':'支出'}}</td>
<td>
<span v-for="(son,sIndex) in item.DetailList" :key="sIndex">{{son.CostTypeName}}</span>
</td>
<td>{{item.TicketNum}}</td>
<td width="600">
<span v-for="(son,sIndex) in item.DetailList" :key="sIndex">{{son.Remark}}</span>
</td>
<td>{{item.Money}}</td>
<td>
<span> {{ item.EmName }} </span><br />
<span> {{ item.CreateDate }} </span>
</td>
<td>
<template v-for="(son,sIndex) in item.VorcherInos">
<template v-if="son.Type==1||son.Type==2">
<i class="iconfont icon-excel" @click="showUpLoadFile(son)" :key="sIndex"></i>
</template>
<template v-if="son.Type==3">
<img class="_VorcherInos_img" @click="showImg(item.VorcherInos)" :src="son.Content" alt="" :key="sIndex" />
</template>
</template>
</td>
<td>{{item.StatusStr}}</td>
</tr>
<tr :key="index" v-else>
<td><span class="_jump_page" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td>{{item.TradeDate}}</td>
<td>{{item.Type==1?'收入':'支出'}}</td>
<td>
<span v-for="(son,sIndex) in item.DetailList" :key="sIndex">{{son.CostTypeName}}</span>
</td>
<td>{{item.TicketNum}}</td>
<td width="600">
<span v-for="(son,sIndex) in item.DetailList" :key="sIndex">{{son.Remark}}</span>
</td>
<td>{{item.Money}}</td>
<td>
<span> {{ item.EmName }} </span><br />
<span> {{ item.CreateDate }} </span>
</td>
<td>
<template v-for="(son,sIndex) in item.VorcherInos">
<template v-if="son.Type==1||son.Type==2">
<i class="iconfont icon-excel" @click="showUpLoadFile(son)" :key="sIndex"></i>
</template>
<template v-if="son.Type==3">
<img :key="sIndex" class="_VorcherInos_img" @click="showImg(item.VorcherInos)" :src="son.Content" alt="" />
</template>
</template>
</td>
<td>{{item.StatusStr}}</td>
</tr>
</template>
<tr>
<td>总计</td>
<td :colspan="9" class="allMoney PingFangSC" :class="Money>0?'_color_red':'_color_green'">{{ZCMoney}}</td>
</tr>
</table>
</div>
<div v-if='picIsShow' class="viewBigPicLayer" @click="picIsShow=false,picObj=[]">
<el-carousel height="600px" :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index">
......@@ -179,13 +260,16 @@
</el-carousel>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
SRMoney: 0,
ZCMoney: 0,
SRDataList: [],
ZCDataList: [],
dataList: [],
loading: true,
picIsShow: false,
......@@ -249,6 +333,34 @@
} else {
this.noData = true;
}
this.SRMoney = 0,
this.ZCMoney = 0,
this.SRDataList = [],
this.ZCDataList = [],
r.data.data.forEach(item=>{
if(item.Type==1){
this.SRDataList.push(item)
}else{
this.ZCDataList.push(item)
}
})
let SRMoney = 0;
this.SRDataList.forEach(x => {
if ((this.type && this.type == x.Type && (x.Status == 2 || (x.Status == 1 && x.TradeDate))) ||
this.type == null) {
SRMoney = x.Money + SRMoney;
}
})
this.SRMoney = SRMoney
let ZCMoney = 0;
this.ZCDataList.forEach(x => {
if ((this.type && this.type == x.Type && (x.Status == 2 || (x.Status == 1 && x.TradeDate))) ||
this.type == null) {
ZCMoney = x.Money + ZCMoney;
}
})
this.ZCMoney = ZCMoney
this.dataList = r.data.data;
let Money = 0;
this.dataList.forEach(x => {
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ dac8e513
......@@ -825,6 +825,11 @@
</el-option>
</el-select>
</span></li>
<li>
<span>
<em>订单ID</em>
<el-input v-model='msg.OrderId'></el-input>
</span></li>
<li>
<span>
<em>订单状态</em>
......@@ -991,19 +996,15 @@
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.FinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.FinanceList&&item.FinanceList.length == 0" class="c9e fz12">
暂无收款单据
<span v-if="item.FinanceList&&item.FinanceList.length == 0" class="c9e fz12 mr">
暂无
</span>
<div class="item right20 top0" v-if="item.visaOrderStatus!=2">
<el-tooltip class="" effect="dark" content="制单"
<div class="item right20 top0">
<el-tooltip v-if="item.visaOrderStatus!=2" class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"></i>
</el-tooltip>
</div>
</div>
<div class="row relative" style="margin-top: 5px;">
......@@ -1012,19 +1013,15 @@
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.RefundFinanceList&&item.RefundFinanceList.length == 0" class="c9e fz12">
暂无收款单据
<span v-if="item.RefundFinanceList&&item.RefundFinanceList.length == 0" class="c9e fz12 mr">
暂无
</span>
<div class="item right20 top0" v-if="item.visaOrderStatus!=2">
<el-tooltip class="" effect="dark" content="制单"
<div class="item right20 top0">
<el-tooltip v-if="item.visaOrderStatus!=2" class="" effect="dark" content="制单"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 2)"></i>
</el-tooltip>
</div>
</div>
<div class="row relative" style="margin-top: 5px;">
......@@ -1033,8 +1030,8 @@
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.CostFinanceList&&item.CostFinanceList.length == 0" class="c9e fz12">
暂无收款单据
<span v-if="item.CostFinanceList&&item.CostFinanceList.length == 0" class="c9e fz12 mr">
暂无
</span>
<div class="item right20 top0" v-if="item.visaOrderStatus!=2">
<el-tooltip class="" effect="dark" content="制单"
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ dac8e513
......@@ -521,14 +521,16 @@
</div>
</div>
<div class="row c9e fz12">
<span class="mr" v-if="item.CreateName">创建人：</span>
<span class="mr" v-if="item.CreateName">{{ item.CreateName }}
<el-image
<div class="row-c" v-if="item.createName">
<span class="mr">创建人：</span>
<span class="mr">{{ item.createName }}</span>
<el-image class="mr" v-if="item.createPhoto"
style="width: 20px; height: 20px;border-radius: 50%;"
:src="item.CreatePhoto"
:preview-src-list="[item.CreatePhoto]">
:src="item.createPhoto"
:preview-src-list="[item.createPhoto]">
</el-image>
</span>
</div>
<span>下单时间：</span>
<span class="mr">{{ item.createTime }}</span>
<!-- <div class="">
......@@ -616,7 +618,9 @@
</el-table-column>
<el-table-column label="待收" style="background:#EAEAEA">
<template slot-scope="scope">
<span :class="{'cF1416C':scope.row.dueInMoney>0}">
￥<span class="fz15 fbold">{{ moneyFormat(scope.row.dueInMoney) }}</span>
</span>
</template>
</el-table-column>
<!-- <el-table-column label="小计" min-width="70" style="background:#EAEAEA">
......@@ -624,27 +628,29 @@
<span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
</template>
</el-table-column> -->
<template slot="append" v-if="item.remark">
<template slot="append" >
<div class="row justify-sb " style="padding:10px;">
<div class="cF1416C">
<div style="min-width: 200px;min-width: 300px;" v-if="item.remark">
{{$t('pub.pubRemark')}}：{{ item.remark }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')"
placement="top-start">
<i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(item,true)'></i>
</el-tooltip>
</div>
</div>
<div class="row justify-sb">
<div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative">
<div class="row-c">
<div class="fz12">收款单据</div>
<div class="fz12 flex-s">收款单据</div>
<div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr px5"
<span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.financeList"
@click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.financeList&&item.financeList.length == 0" class="c9e fz12 mr">
暂无收款单据
暂无
</span>
</div>
</div>
......@@ -655,14 +661,14 @@
</div>
<div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative">
<div class="row-c">
<div class="fz12">退款单据</div>
<div class="fz12 flex-s">退款单据</div>
<div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr px5"
<span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.refundFinanceList"
@click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.refundFinanceList&&item.refundFinanceList.length == 0" class="c9e fz12 mr">
暂无退款单据
暂无
</span>
</div>
</div>
......@@ -673,14 +679,14 @@
</div>
<div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative">
<div class="row-c">
<div class="fz12">成本单据</div>
<div class="fz12 flex-s">成本单据</div>
<div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr px5"
<span class="cursor-pointer radius5 mr px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.costFinanceList"
@click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.costFinanceList&&item.costFinanceList.length == 0" class="c9e fz12 mr">
暂无成本单据
暂无
</span>
</div>
</div>
......@@ -703,7 +709,7 @@
<span class="c059FF6">签证详情</span>
</div>
<div class="row-c cursor-pointer radius5 change py5" @click="getDetail(item,false)"
v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1">
v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1&&pagesTitle=='销售'">
<span class="c059FF6">{{$t('system.table_edit')}}订单</span>
</div>
<div class="row-c cursor-pointer radius5 cancel py5" @click='cancelOrder(item)'
......@@ -711,12 +717,12 @@
<span class="cF1416C">{{ $t('pub.cancelBtn') }}</span>
</div>
<div class="row-c cursor-pointer radius5 change py5" @click='goUrlT(item)'
v-if="(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1">
v-if="(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1&&pagesTitle=='销售'">
<span class="c059FF6">{{ $t('salesModule.LKMD') }}</span>
</div>
<div class="row-c cursor-pointer radius5 change1 py5"
@click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.customerId, 2)'
v-if="qjGroupId==userInfo.RB_Group_id || F_InvoiceManagement">
v-if="(qjGroupId==userInfo.RB_Group_id || F_InvoiceManagement)&&pagesTitle=='销售'">
<span class="c20C997">{{ $t('salesModule.ApplyInvoice') }}</span>
</div>
<template v-if="pagesTitle!='销售'">
......
src/router/config.js
View file @ dac8e513
......@@ -4420,7 +4420,7 @@ export default {
name: 'VisaProductEditOrder',
component: resolve => require(['@/components/SalesVisa/VisaProductEditOrder'], resolve),
meta: {
title: '修改签证订单列表'
title: '签证订单'
},
},
{ // 操作 修改签证订单列表
......@@ -4428,7 +4428,7 @@ export default {
name: 'VisaProductEditOrderOP',
component: resolve => require(['@/components/SalesVisa/VisaProductEditOrderOP'], resolve),
meta: {
title: '修改签证订单列表'
title: '签证订单'
},
},
{ // 签证 修改签证订单列表
......@@ -4436,7 +4436,7 @@ export default {
name: 'VisaProductEditOrderQZ',
component: resolve => require(['@/components/SalesVisa/VisaProductEditOrderQZ'], resolve),
meta: {
title: '修改签证订单列表'
title: '签证订单'
},
},
{ // 销售 签证产品下单
......
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