Skip to content

S
SuperMan
Commit 01f51096 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 521c68f4
Hide whitespace changes
Inline Side-by-side
Showing with 1084 additions and 20 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 01f51096
...@@ -475,6 +475,8 @@ ...@@ -475,6 +475,8 @@
<div class="_tit _tit2 w890px"> <div class="_tit _tit2 w890px">
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" /> <myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" /> <myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
</div> </div>
<template v-if="sonTCIDList"> <template v-if="sonTCIDList">
<div class="w890px"> <div class="w890px">
...@@ -1341,6 +1343,7 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue"; ...@@ -1341,6 +1343,7 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue";
import { truncate } from 'fs'; import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue"; import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue"; import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import huijiBill from "./FinancialSubmodule/huijiBill.vue";
// import MsgBus from '../../assets/utils/msgBus.js'; // import MsgBus from '../../assets/utils/msgBus.js';
export default { export default {
data(){ data(){
...@@ -1508,7 +1511,9 @@ export default { ...@@ -1508,7 +1511,9 @@ export default {
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
'ChongDiPage': ChongDiPage, 'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill, 'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill 'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
}, },
methods:{ methods:{
goPrintPageNew(type,id,Merge,OrderSource){ goPrintPageNew(type,id,Merge,OrderSource){
......
src/components/FinancialModule/DepartmentStatistics.vue 0 → 100644
View file @ 01f51096
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
.OPcommissionPeriods .singeRowTable tr td{
padding: 8px 5px;
}
.OPcommissionPeriods .hoverSpan span:hover{
cursor: pointer;
text-decoration: underline;
color: red;
}
.opUl li em{
font-size:12px;
display:inline-block;
margin-right:15px;
}
.OPcommissionPeriods .underline{
text-decoration:underline;
cursor:pointer;
}
</style>
<template>
<div class="flexOne OPcommissionPeriods">
<div>
<ul class="opUl">
<li>
<em>姓名</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</li>
<li>
<em>时间</em>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="getList">查询</el-button>
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>姓名</th>
<th>审核数量</th>
<th>制单数量</th>
</tr>
<tr v-for="item in dataList">
<td>
<span>{{item.Name}}</span>
</td>
<td>
<span class="underline" @click="goFinal(1)">{{item.AuditNum}}</span>
</td>
<td>
<span class="underline" @click="goFinal(2)">{{item.CreateNum}}</span>
</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
dialogVisible:false,
ErrorMessage:'',
Month:moment().format("YYYY-MM"),
dateList:[],
msg: {
PageIndex: 1,
PageSize: 20,
BranchId:1,
DepartmentId:'',
EmployeeId:0,
StartTime:'',
EndTime:'',
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
btnLoading:false,
btnShow:false,
djList:[],
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}
},
created() {
this.dateList[0]=moment().format("YYYY-MM-DD");
this.dateList[1]=moment().format("YYYY-MM-DD");
},
mounted() {
let userInfo = this.getLocalStorage();
this.msg.BranchId=userInfo.RB_Branch_id;
this.msg.DepartmentId=userInfo.RB_Department_Id;
this.employeeMsg.DepartmentId=userInfo.RB_Department_Id;
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('P_OPCommissionSend')!=-1){
this.btnShow=true;
}
this.getList();
this.getEmployee();
},
methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
goFinal(fin){
document.querySelector("#app").click();
this.$router.push({
name: 'documentsDetail',
query: {
Type: fin,
'blank': 'y',
}
})
},
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
PeriodsId:id,
blank: 'y',
tab: '期数详情'
}
});
},
//获取数据
getList() {
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
this.loading = true;
this.apipost(
"Financial_get_GetDepartmentAuditStatistics",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
}
}
</script>
src/components/FinancialModule/FinancialDocuments.vue
View file @ 01f51096
...@@ -396,8 +396,8 @@ ...@@ -396,8 +396,8 @@
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button> <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button> <button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button> <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button> <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button> <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button> <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
...@@ -751,6 +751,7 @@ export default { ...@@ -751,6 +751,7 @@ export default {
FrIDList:[], FrIDList:[],
Type:1, Type:1,
}, },
hbBtn:false,
hbState:false, hbState:false,
hbShow:false, hbShow:false,
HandMsg:{ HandMsg:{
...@@ -955,18 +956,23 @@ export default { ...@@ -955,18 +956,23 @@ export default {
}, },
methods:{ methods:{
HebingSPLast(){ HebingSPLast(){
console.log("fssf",this.checkList) if(this.checkList.length==0){
this.$confirm("是否合并审批? 合并审批后不可恢复", "提示", { this.Error("请选择单据！");
return;
}
this.$confirm("是否合并审批？合并审批后不可取消合并", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.hbBtn=true;
this.hbMsg.FrIDList=this.checkList; this.hbMsg.FrIDList=this.checkList;
this.apipost("Financial_post_SetAccountantFinanceMerge",this.hbMsg,res => { this.apipost("Financial_post_SetAccountantFinanceMerge",this.hbMsg,res => {
console.log("res,",res) this.hbBtn=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getPageList();
} }
else{ else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -1299,7 +1305,7 @@ export default { ...@@ -1299,7 +1305,7 @@ export default {
this.loading= false; this.loading= false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
this.queryInfoInit(); // this.queryInfoInit();
},err=>{}) },err=>{})
if(this.msg.Conditon==7){ if(this.msg.Conditon==7){
this.getMyRejectFinanceCount(); this.getMyRejectFinanceCount();
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 01f51096
...@@ -383,6 +383,7 @@ ...@@ -383,6 +383,7 @@
申请书{{GetDetail.FApplyForNumber}}下载 申请书{{GetDetail.FApplyForNumber}}下载
</span> </span>
<span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span> <span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
<span v-show="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" class="_Printing" @click="goPrintPage2(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">会计合并打印</span>
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span> <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div> </div>
...@@ -563,6 +564,7 @@ ...@@ -563,6 +564,7 @@
<czBillModule :FrID='ID' /> <czBillModule :FrID='ID' />
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" /> <myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" /> <myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
</div> </div>
<template v-if="sonTCIDList"> <template v-if="sonTCIDList">
<div class="w890px"> <div class="w890px">
...@@ -860,6 +862,8 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue"; ...@@ -860,6 +862,8 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue"; import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue"; import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue"; import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import huijiBill from "./FinancialSubmodule/huijiBill.vue";
import czBillModule from "./FinancialSubmodule/czBillModule.vue"; import czBillModule from "./FinancialSubmodule/czBillModule.vue";
export default { export default {
data(){ data(){
...@@ -951,6 +955,8 @@ export default { ...@@ -951,6 +955,8 @@ export default {
'ChongDiPage': ChongDiPage, 'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill, 'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill, 'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
"czBillModule":czBillModule "czBillModule":czBillModule
}, },
created(){ created(){
...@@ -1163,6 +1169,21 @@ export default { ...@@ -1163,6 +1169,21 @@ export default {
window.open(routeData.href, "_blank"); window.open(routeData.href, "_blank");
} }
}, },
goPrintPage2(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageH',
query: { huiji:true,type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageH',
query: { huiji:true,type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
goPrintPage(type,id,Merge,OrderSource){ goPrintPage(type,id,Merge,OrderSource){
if(type===1){ if(type===1){
// this.$confirm('是否打印客户联？', '提示', { // this.$confirm('是否打印客户联？', '提示', {
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue
View file @ 01f51096
...@@ -383,7 +383,8 @@ ...@@ -383,7 +383,8 @@
EmployeeId:'', EmployeeId:'',
EndDate:'', EndDate:'',
StartDate:'', StartDate:'',
GetDetail: {} GetDetail: {},
disabled:true,
} }
},methods:{ },methods:{
jumpPage(path,id,type){ jumpPage(path,id,type){
...@@ -428,6 +429,7 @@ ...@@ -428,6 +429,7 @@
this.GetDetail = data; this.GetDetail = data;
this.loading=false this.loading=false
this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
console.log("this.GetDetail",this.GetDetail)
} }
}, err => {}) }, err => {})
}, },
......
src/components/FinancialModule/FinancialSubmodule/huijiBill.vue 0 → 100644
View file @ 01f51096
<style scoped>
p{margin: 0;}
.Receipt_box{color: #c94052;width: 100%;background-color: rgba(245, 245, 245, 1);position: relative;margin-top: 15px;}
.Receipt_box tr th{color: #c94052}
.Receipt_box.color_blur tr th{color: #106BAF}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
.rb_tit{font-size: 16px;text-align: center;margin-bottom: 20px;}
.rb_stit{font-size: 14px;text-align: center}
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
.rb_top_row span._r_name{color: #333333}
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table th{font-weight: 200 !important}
.Receipt_table tr th,.Receipt_table tr td{background-color: white}
._r_mt10{margin-top: 10px;}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
._color_b{color: #333333 !important;font-size: 12px}
._font_size12{font-size: 12px !important}
._r_IsPublic{
padding-left: 15px;
}
._guanlian{
font-size: 12px;
color: gray;
}
._guanlian span{
font-size: 14px;
color: #333333;
}
._yewudanju{
position: absolute;
text-align: right;
font-size: 12px;
right: 15px;
top: 15px;
}
._jump_page{
cursor: pointer;
text-decoration: underline;
}
i{
font-style: initial;
}
.Receipt_box._PrintPageStyle tr th{color: #333333}
.Receipt_box._PrintPageStyle{color: #333333;}
.Receipt_box._PrintPageStyle .rb_stit span{border-bottom: 2px solid #333333;}
.Receipt_box._PrintPageStyle{color: #333333;}
.Receipt_box._PrintPageStyle .rb_stit span{border-bottom: 2px solid #333333;}
._border_color_r{
border-color: #c94052;
}
._border_color_b{
border-color: #106BAF;
}
._border_color_p{
border-color: #333333;
}
.Receipt_box .rb_stit span._rb_stit_print{
padding: 0;
padding-top: 10px;
border: none;
}
._sanjiao_{
position: absolute;
top: 0px;
left: 0px;
width: 0px;
height: 0px;
border-top: 20px solid #e73828;
border-bottom: 20px solid transparent;
border-left: 20px solid #e73828;
border-right: 20px solid transparent;
}
._sanjiao_:after{
content: '会';
position: absolute;
top: -15px;
left: -14px;
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
._border_1{
background: #fff;
padding: 15px;
margin-bottom: 20px;
}
.borderColor{
border:1px solid #333;
}
</style>
<template v-if="GetDetail&&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 v-show="disabled">
<div :class="loopNumN!=1?'borderColor':'_border_1'" class="_border_1" v-for="(val,index) in loopNumN" :key="index">
<div class="_sanjiao_"></div>
<p class="rb_tit">{{GetDetail.CompanyName}}</p>
<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;">
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="5">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
<th width="68">到账</th>
<th width="48">手续费</th>
</tr>
<template v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length">
<tr v-for="(item) in GetDetail.AccountantMergeDetailList" class="_color_b">
<td height="34px">{{item.BName}}</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">
<span v-if="GetDetail.Type==1">{{tc.TCNUM}}</span>
<span v-if="GetDetail.Type==2">{{tc.TCID}}</span>
</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
<td height="34px">{{item.CostTypeName}}</td>
<!--<td height="34px">{{item.Number}}</td>-->
<!--<td height="34px">{{item.UnitPrice}}</td>-->
<td height="34px">{{item.CurrencyName}}</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px">{{item.PayMoney}}</td>
<td height="34px">{{item.Fee}}</td>
<td height="34px" style="max-width: 120px;">{{item.Remark}}</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="11" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix"><span class="_bold">{{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span><span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span></p>
</template>
</td>
</tr>
<!-- <tr v-if="GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr> -->
<!-- <tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="4">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="6">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr> -->
<!-- <tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="11">
<span class="_color_b _font_size12">{{GetDetail.Merge.TradeDateV2}}</span>
</td>
</tr> -->
</table>
</div>
</div>
<div v-show="!disabled">
<div class="_border_1" v-for="(val,index) in loopNumN" :key="index">
<div class="_sanjiao_"></div>
<p class="rb_tit">
<el-input size="small" style="width:auto" v-model="GetDetail.CompanyName" placeholder="请输入"></el-input>
</p>
<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;">
<tr>
<th rowspan="2">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<!--<th rowspan="2">数量</th>-->
<!--<th rowspan="2">单 价</th>-->
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="5">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th>
<th width="68">到账</th>
<th width="48">手续费</th>
</tr>
<template v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length">
<tr v-for="(item) in GetDetail.AccountantMergeDetailList" class="_color_b">
<td height="34px">
<el-input size="small" style="width:80px" v-model="item.BName" placeholder="请输入"></el-input>
</td>
<td height="34px">
<template v-for="tc in item.TCIDAndTCNUMList">
<p class="_jump_page">
<el-input v-if="GetDetail.Type==1" size="small" style="width:auto;display:inline-block;width:120px" v-model="tc.TCNUM" placeholder="请输入"></el-input>
<el-input v-if="GetDetail.Type==2" style="display:inline-block;width:120px;" size="small" v-model="tc.TCID" placeholder="请输入"></el-input>
</p>
</template>
</td>
<td height="34px">{{item.FinanceId}}</td>
<td height="34px">
<el-input size="small" style="width:auto;display:inline-block;width:120px" v-model="item.CostTypeName" placeholder="请输入"></el-input>
</td>
<!--<td height="34px">{{item.Number}}</td>-->
<!--<td height="34px">{{item.UnitPrice}}</td>-->
<td height="34px">
<el-input size="small" style="width:80px" v-model="item.CurrencyName" placeholder="请输入"></el-input>
</td>
<td height="34px">{{item.OriginalMoney}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{item.Money}}</td>
<td height="34px">{{item.PayMoney}}</td>
<td height="34px">{{item.Fee}}</td>
<td height="34px" style="max-width: 120px;">
<el-input size="small" style="width:auto" v-model="item.Remark" placeholder="请输入"></el-input>
</td>
<td height="34px">{{item.EmName}}</td>
</tr>
</template>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<2">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<3">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<tr v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length<4">
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
<td height="34px"></td>
</tr>
<!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
<tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="11" class="_color_b">
<template v-for="(item,index) in GetDetail.MergeBankList">
<p class="_fex_cen clearfix">
<span class="_bold">
<el-input size="small" style="width:120px" v-model="item.Alias" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:120px" v-model="item.TypeName" placeholder="请输入"></el-input>
-
<el-input size="small" style="width:120px" v-model="item.AccountType" placeholder="请输入"></el-input>
<el-input size="small" style="width:120px" v-model="item.BankNo" placeholder="请输入"></el-input>
</span>
<!-- {{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span>
<span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">
{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span>
{{item.BankNo?'-':''}} <span>{{item.BankNo}} -->
</p>
</template>
</td>
</tr>
<!-- <tr v-if="GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.wbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="4" class="_color_b">{{GetDetail.Merge.WBMoney==''?$t('fnc.ling'):GetDetail.WBChineseMoney}}（{{GetDetail.Merge.WBMoney}}）</td>
<td height="34px" class="">{{$t('fnc.bwbzjine')}}<span class="_font_size12"></span></td>
<td height="34px" colspan="6" class="_color_b">{{GetDetail.Merge.Money==''?$t('fnc.ling'):GetDetail.ChineseMoney}}（{{GetDetail.Merge.Money}}）</td>
</tr>
<tr class="_huik_info" v-if="GetDetail.Type==1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.huikuanren')}}</td>
<td height="34px" colspan="4">
<span class="_color_b _font_size12">{{GetDetail.Merge.RemitterNameV2}}</span>
</td>
<td height="34px" class="">{{$t('fnc.hkshijian')}}</td>
<td height="34px" colspan="6">
<span class="_color_b _font_size12">
<el-input size="small" style="width:auto" v-model="GetDetail.Merge.TradeDateV2" placeholder="请输入"></el-input>
</span>
</td>
</tr> -->
<!-- <tr class="_huik_info" v-else-if="GetDetail.Type!=1&&GetDetail.Merge">
<td height="34px" class="">{{$t('fnc.jiaoyiriqi')}}</td>
<td height="34px" colspan="11">
<span class="_color_b _font_size12">
<el-input size="small" style="width:auto" v-model="GetDetail.Merge.TradeDateV2" placeholder="请输入"></el-input>
</span>
</td>
</tr> -->
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["ID","width","color","isPrintPage","name","disabled","loopNumN"], //接收参数 ID width color
data(){
return{
loading:false,
// GetDetail:{DetailList:null},
EmployeeId:'',
EndDate:'',
StartDate:'',
GetDetail: {}
}
},methods:{
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
// name: path,
// query: { id:id,orderID:this.GetDetail.OrderID,isShow:false}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
name: path,
query: { id:id,orderID:this.GetDetail.OrderID,isShow:false,blank:'y'}
})
}else if(type==2){
// let routeData = this.$router.resolve({
// name: path,
// query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
name: path,
query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId,blank:'y'}
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
})
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
data.Money = this.$commonUtils.addCommas(Math.round(data.Money * 100) / 100)
data.Merge.TradeDateV2 = new Date(data.Merge.TradeDateV2).Format('yyyy-MM-dd')
data.AuditSteps.reverse()
this.GetDetail = data;
this.loading=false
this.$set(this.$data,"GetDetail",data);
}
}, err => {})
},
},mounted(){
const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let month = myDate.getMonth()+1; //获取当前月份(0-11,0代表1月)
let dateS = myDate.getDate(); //获取当前日(1-31)
this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
handler: function(val, oldVal) {
},
deep: true
},
ID:{
handler: function(val, oldVal) {
this.ID = val
this.Financial_post_GetDetail(this.ID)
},
deep: true
}
}
}
</script>
src/components/FinancialModule/ReportForm/RevenueFileMan.vue
View file @ 01f51096
...@@ -656,15 +656,15 @@ export default { ...@@ -656,15 +656,15 @@ export default {
}, },
getEmployeeList () { getEmployeeList () {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
let msg = { // let msg = {
GroupId: userInfo.RB_Group_id, // GroupId: userInfo.RB_Group_id,
BranchId: '-1', // BranchId: '-1',
DepartmentId: '-1', // DepartmentId: '-1',
PostId: '28', // PostId: '28',
IsLeave: '0' // IsLeave: '0'
} // }
this.apipost( this.apipost(
'admin_get_EmployeeGetList', msg, 'admin_get_GetBranchManagerList', {},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data this.EmployeeList = res.data.data
......
src/components/FinancialModule/documentsDetail.vue 0 → 100644
View file @ 01f51096
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
.OPcommissionPeriods .singeRowTable tr td{
padding: 8px 5px;
}
.OPcommissionPeriods .hoverSpan span:hover{
cursor: pointer;
text-decoration: underline;
color: red;
}
.opUl li em{
font-size:12px;
display:inline-block;
margin-right:15px;
}
.OPcommissionPeriods .underline{
text-decoration:underline;
cursor:pointer;
}
</style>
<template>
<div class="flexOne OPcommissionPeriods">
<div>
<ul class="opUl">
<li>
<em>类型</em>
<el-select v-model="msg.Type" placeholder="请选择">
<el-option label="审核" :value="1"></el-option>
<el-option label="制单" :value="2"></el-option>
</el-select>
</li>
<li>
<em>姓名</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</li>
<li>
<em>时间</em>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="getList">查询</el-button>
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>ID</th>
<th>审核/制单人</th>
<th>审核/制单时间</th>
<th>类型</th>
</tr>
<tr v-for="item in dataList">
<td>
<span class="underline" @click="goFinal(item.FrID)">{{item.FrID}}</span>
</td>
<td>{{item.EmName}}</td>
<td>{{item.CreateDate}}</td>
<td>{{item.Type}}</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
dialogVisible:false,
ErrorMessage:'',
Month:moment().format("YYYY-MM"),
dateList:[],
msg: {
PageIndex: 1,
PageSize: 20,
Type:1,
EmployeeId:0,
StartTime:'',
EndTime:'',
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
btnLoading:false,
btnShow:false,
djList:[],
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}
},
created() {
this.dateList[0]=moment().format("YYYY-MM-DD");
this.dateList[1]=moment().format("YYYY-MM-DD");
if(this.$route.query.Type){
this.msg.Type=Number(this.$route.query.Type);
}
if(this.$route.query.EmployeeId){
this.msg.EmployeeId=Number(this.$route.query.EmployeeId );
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('P_OPCommissionSend')!=-1){
this.btnShow=true;
}
this.employeeMsg.DepartmentId=userInfo.RB_Department_Id;
this.getList();
this.getEmployee();
},
methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
goFinal(fin){
document.querySelector("#app").click();
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: fin,
'blank': 'y',
}
})
},
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
PeriodsId:id,
blank: 'y',
tab: '期数详情'
}
});
},
//获取数据
getList() {
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
this.loading = true;
this.apipost(
"Financial_get_GetDepartmentAuditDetail",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
}
}
</script>
src/components/PrintPageH.vue 0 → 100644
View file @ 01f51096
<style scoped>
._PrintPage{
width: 100%;
background-color: white;
position: absolute;
padding-top: 20px;
}
._PrintPage_box{
width: 1000px;
margin: 0 auto;
padding: 0 !important;
}
/* ._border_1{
border: 1px solid #333333;
margin-bottom:30px;
} */
/* @media print {
._PrintPage{
margin-left:-145px;
}
} */
._PrintPage_box{
position: relative;
}
._PrintPage_box .SetDiv{
position: absolute;
top:10px;
color:#106BAF;
left: -190px;
}
._PrintPage_box .SetDiv span{
color:#106BAF;
cursor: pointer;
}
</style>
<template v-loading="loading">
<div class="_PrintPage">
<div class="_PrintPage_box">
<template v-if="huiji">
<!-- <div class="SetDiv">
<span @click="disabled3=false">编辑</span>
<span @click="disabled3=true">保存</span>
</div> -->
<div class="_border_1" v-for="(item,index) in 1">
<huijiBill :loopNumN="loopNumN" :disabled.sysc="disabled3" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></huijiBill>
</div>
</template>
</div>
</div>
</template>
<script>
import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModuleNew.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
import myCapital from "./FinancialModule/FinancialSubmodule/myCapital.vue";
import huijiBill from "./FinancialModule/FinancialSubmodule/huijiBill.vue";
export default {
data(){
return{
disabled3:true,
disabled2:true,
disabled1:true,
disabled:true,
loading:true,
id:null,
type:null,
isKehu:null,
widthSon:"100%",
colorSon:"#ffffff",
num:0,
loopNumN:this.$route.query.isKehu==='1'?3:2,
loopNumT:2,
Merge:null,
OrderSource:-1,
CapitalState:false,
hedan:1,
huiji:false,
}
},components:{
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill,
'my-Capital':myCapital,
'huijiBill':huijiBill,
},methods:{
numAdd(){
this.num = this.num + 1
},
goUrl(num){
let hedan;
if(num==1){
hedan=2;
}else{
hedan=1;
}
if(this.type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { hedan:hedan,type: this.type,id:this.id,isKehu:0,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { hedan:hedan,type: this.type,id:this.id,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
},mounted(){
},created(){
this.id = this.$route.query.id;
this.type = this.$route.query.type;
this.isKehu = this.$route.query.isKehu;
if(this.$route.query.hedan){
this.hedan=this.$route.query.hedan;
}
if(this.$route.query.huiji){
this.huiji=true;
}
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){
this.CapitalState=true;
}
}
}
</script>
src/components/PrintPageN.vue
View file @ 01f51096
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
'my-RVB-Bill':myrbvBill, 'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill, 'my-GZ-Bill': myGZBill,
'my-Capital':myCapital 'my-Capital':myCapital,
},methods:{ },methods:{
numAdd(){ numAdd(){
this.num = this.num + 1 this.num = this.num + 1
...@@ -151,14 +151,11 @@ export default { ...@@ -151,14 +151,11 @@ export default {
if(this.$route.query.hedan){ if(this.$route.query.hedan){
this.hedan=this.$route.query.hedan; this.hedan=this.$route.query.hedan;
} }
this.Merge = this.$route.query.Merge; this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource; this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){ if(this.$route.query.Capital){
this.CapitalState=true; this.CapitalState=true;
} }
console.log("hedan",this.hedan)
console.log("Merge",this.Merge)
} }
} }
......
src/router/config.js
View file @ 01f51096
...@@ -3299,7 +3299,25 @@ export default { ...@@ -3299,7 +3299,25 @@ export default {
meta: { meta: {
title: '收款窗口' title: '收款窗口'
}, },
}, { //财务 财务单据 我的财务单据详情 },
{ //工作台 单据明细
path: '/documentsDetail',
name: 'documentsDetail',
component: resolve => require(['@/components/FinancialModule/documentsDetail'], resolve),
meta: {
title: '单据明细'
},
},
{ //工作台 部门审核统计
path: '/DepartmentStatistics',
name: 'DepartmentStatistics',
component: resolve => require(['@/components/FinancialModule/DepartmentStatistics'], resolve),
meta: {
title: '部门审核统计'
},
},
{ //财务 财务单据 我的财务单据详情
path: '/FinancialDocumentsDetail', path: '/FinancialDocumentsDetail',
name: 'FinancialDocumentsDetail', name: 'FinancialDocumentsDetail',
component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetail'], resolve), component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetail'], resolve),
...@@ -4444,6 +4462,14 @@ export default { ...@@ -4444,6 +4462,14 @@ export default {
title: '财务凭证打印页面' title: '财务凭证打印页面'
}, },
}, },
{ //财务打印页面
path: '/PrintPageH',
name: 'PrintPageH',
component: resolve => require(['@/components/PrintPageH'], resolve),
meta: {
title: '会计打印页面'
},
},
{ {
path: '/AssetsShenpi', //资产管理审批 path: '/AssetsShenpi', //资产管理审批
name: 'AssetsShenpi', name: 'AssetsShenpi',
......
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