Skip to content

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

update

parent 012a9739
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1446 additions and 161 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ dafd9cb9
......@@ -366,11 +366,10 @@
cursor:pointer;
text-decoration: underline;
}
</style>
<template>
<div class="page_fdd FinancialDocumentsDetail MyInput" v-if="GetDetail">
<div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print">
<p class="_tit">
......@@ -383,6 +382,7 @@
<span v-if="GetDetail.TemplateId==36 || GetDetail.TemplateId==37 || GetDetail.TemplateId==53 ||GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4) || (GetDetail.TemplateId==56&&GetDetail.IsPublic==4)" class="sqs" @click="goUrl('Application',GetDetail.FrID)">
申请书{{GetDetail.FApplyForNumber}}下载
</span>
<span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
......@@ -424,18 +424,6 @@
|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
<td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
<!-- 会计费用 -->
<td v-if="huijiShow" style="cursor:pointer;position:relative">
<div v-show="huijiState">
<span v-if="o.KJTCNUM!=''" style="text-decoration: underline;">{{o.KJTCNUM}}（{{o.KJTCID}}）</span>
<span @click="huijiState=false" style="font-size:12px;">设置</span>
</div>
<div v-show="!huijiState">
<el-input size="mini" style="width:150px;" v-model="o.KJTCNUM" placeholder="请输入内容"></el-input>
<span @click="Savehuiji" style="font-size:12px;">保存</span>
</div>
</td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......@@ -868,7 +856,6 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export default {
data(){
return{
huijiState:true,
OPState:false,
LeadState:false,
//驳回弹窗
......@@ -940,8 +927,7 @@ export default {
CostTypeState:false,
huijiShow:false,
}
},
components:{
},components:{
'my-FlowChartModule': myFlowChartModule,
'my-Bill': myBill,
'my-C-Bill': myCBill,
......@@ -962,30 +948,11 @@ export default {
this.pageIndex = this.$route.query.pageIndex;
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
let ActionMenuCode=userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
}
},methods:{
Savehuiji(){
let msg={
FrID:this.GetDetail.FrID,
TCIDAndTCNUMList:this.GetDetail.TCIDAndTCNUMList,
};
msg.TCIDAndTCNUMList.forEach(item=>{
item.KJTCID=0;
})
this.apipost('Financial_get_SetFinanceKJTCIDInfo',msg,res=>{
if(res.data.resultCode==1){
this.huijiState=true;
this.Financial_post_GetDetail(this.ID)
this.Financial_post_GetFinancLogList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
GourlCostType(path,num){
this.$router.push({
name: path,
......@@ -1050,13 +1017,13 @@ export default {
}
},
goUrl(path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: "y"
}
});
this.$router.push({
name: path,
query: {
id: id,
blank: "y"
}
});
},
goComplain(path, id,OrderId){
this.$router.push({
......@@ -1137,6 +1104,21 @@ export default {
}
},err=>{})
},
goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
goPrintPage(type,id,Merge,OrderSource){
if(type===1){
// this.$confirm('是否打印客户联？', '提示', {
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ dafd9cb9
......@@ -186,7 +186,6 @@
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th v-show="huijiShow" rowspan="2" width="150">凭证费用</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
......@@ -203,13 +202,6 @@
<td height="26px">{{item.Rate}}</td>
<td height="26px">{{item.Money}}</td>
<td height="26px" style="max-width: 120px;">{{item.Remark}}</td>
<td v-show="huijiShow" height="26px" @click="selectState=true">
<span v-show="!selectState">{{item.KJCostTypeName}}</span>
<el-select @change="HuijiSHezhi" v-show="selectState" style="width:100px" v-model="item.KJCostTypeId" placeholder="请选择">
<!-- <el-option value="" label=""></el-option> -->
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</td>
</tr>
</template>
......@@ -222,7 +214,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="GetDetail.DetailList&&GetDetail.DetailList.length<3">
<td height="26px"></td>
......@@ -233,7 +224,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="GetDetail.DetailList&&GetDetail.DetailList.length<4">
<td height="26px"></td>
......@@ -244,7 +234,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr>
<td height="26px"></td>
......@@ -255,7 +244,6 @@
<td height="26px"></td>
<td height="26px">{{benMoney}}</td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
......@@ -264,7 +252,6 @@
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>
</template>
</td>
<td v-show="huijiShow" height="34px"></td>
</tr>
<tr>
<td class="">{{GetDetail.Type==1|| GetDetail.Type==5?$t('fnc.skjine'):$t('fnc.fkjine')}}<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
......@@ -279,22 +266,18 @@
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.PayMoney}}</span>
<span v-else>{{GetDetail.Money}}</span>
</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr>
<td height="26px">{{$t('fnc.yjfkuanriqi')}}</td>
<td height="26px" colspan="7">
{{ GetDetail.PayDate }}{{$t('fnc.qian')}}
</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="isPrintPage">
<td height="26px">{{$t('hotel.hotel_remark')}}</td>
<td height="26px" colspan="7">
{{GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark ? GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark : $t('fnc.no')}}
</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
</table>
<div class="rb_top_row _r_mt10" v-if="GetDetail.AuditSteps&&GetDetail.AuditSteps.length">
......@@ -358,18 +341,9 @@ export default {
printTime:'',
currentMoney:0,
benMoney:0,
GetDetail:{},
selectState:false,
huijiShow:false,
GetCostTypeList:[],
GetDetail:{}
}
},created(){
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
this.financeinfo_post_GetCostTypeList();
}
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1,
......@@ -378,32 +352,7 @@ export default {
min = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s;
},
methods:{
HuijiSHezhi(){
let msg={
FrID:this.GetDetail.FrID,
detailList:this.GetDetail.DetailList,
};
this.apipost('Financial_get_SetFinanceKJCostTypeInfo',msg,res=>{
if(res.data.resultCode==1){
this.selectState=false;
this.Financial_post_GetDetail(this.ID);
}else{
this.Error(res.data.message)
}
},err=>{})
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
},methods:{
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
......@@ -466,7 +415,6 @@ export default {
}
}
// console.log("this.GetDetail",this.GetDetail)
}
}, err => {})
},
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ dafd9cb9
......@@ -147,7 +147,6 @@
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th v-show="huijiShow" rowspan="2" width="150">凭证费用</th>
</tr>
<tr>
<th width="88">{{$t('fnc.yuanbi')}}</th>
......@@ -164,13 +163,6 @@
<td height="26px">{{item.Rate}}</td>
<td height="26px">{{item.Money}}</td>
<td height="26px" style="max-width: 120px;">{{item.Remark}}</td>
<td v-show="huijiShow" height="26px" @click="selectState=true">
<span v-show="!selectState">{{item.KJCostTypeName}}</span>
<el-select @change="HuijiSHezhi" v-show="selectState" style="width:100px" v-model="item.KJCostTypeId" placeholder="请选择">
<!-- <el-option value="" label=""></el-option> -->
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</td>
</tr>
</template>
<tr v-if="GetDetail.DetailList&&GetDetail.DetailList.length<2">
......@@ -182,7 +174,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="GetDetail.DetailList&&GetDetail.DetailList.length<3">
<td height="26px"></td>
......@@ -193,7 +184,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr v-if="GetDetail.DetailList&&GetDetail.DetailList.length<4">
<td height="26px"></td>
......@@ -204,7 +194,6 @@
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr>
<td height="26px"></td>
......@@ -215,14 +204,12 @@
<td height="26px"></td>
<td height="26px">{{benMoney}}</td>
<td height="26px"></td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr>
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khyuanbi')}}</span></td>
<td colspan="3" class="_font_size12" >{{GetDetail.OriginalFee}}</td>
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khbweibi')}}</span></td>
<td colspan="3" class="_font_size12">{{GetDetail.Fee}}</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr>
<td class="">{{GetDetail.Type==1|| GetDetail.Type==5?$t('fnc.skjine'):$t('fnc.fkjine')}}<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
......@@ -235,8 +222,6 @@
<span v-if="GetDetail.Is_Cashier===1">{{GetDetail.PayMoney}}</span>
<span v-else>{{GetDetail.Money}}</span>
</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
<tr class="_huik_info">
<td class="">{{$t('fnc.huikuanren')}}</td>
......@@ -251,15 +236,12 @@
<td colspan="3">
<span class="_color_b _font_size12">{{GetDetail.TradeDate}}</span>
</td>
</tr>
<tr v-if="isPrintPage">
<td height="26px">{{$t('hotel.hotel_remark')}}</td>
<td height="26px" colspan="7">
{{GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark ? GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark : '无'}}
</td>
<td v-show="huijiShow" height="26px"></td>
</tr>
</table>
<div class="rb_top_row _r_mt10" v-if="GetDetail.AuditSteps&&GetDetail.AuditSteps.length">
......@@ -315,9 +297,6 @@ export default {
props:["ID","width","color","isPrintPage","name","Num","OrderSource"], //接收参数 ID width color isPrintPage
data(){
return{
selectState:false,
huijiShow:false,
GetCostTypeList:[],
loading: false,
EmployeeId:'',
EndDate:'',
......@@ -328,45 +307,15 @@ export default {
GetDetail: {}
}
},created(){
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
this.financeinfo_post_GetCostTypeList();
}
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1,
d = date.getDate() < 10 ? "0" + date.getDate() : date.getDate(),
h = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
min = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s;
},methods:{
HuijiSHezhi(){
let msg={
FrID:this.GetDetail.FrID,
detailList:this.GetDetail.DetailList,
};
this.apipost('Financial_get_SetFinanceKJCostTypeInfo',msg,res=>{
if(res.data.resultCode==1){
this.selectState=false;
this.Financial_post_GetDetail(this.ID);
}else{
this.Error(res.data.message)
}
},err=>{})
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1,
d = date.getDate() < 10 ? "0" + date.getDate() : date.getDate(),
h = date.getHours() < 10 ? "0" + date.getHours() : date.getHours(),
min = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes(),
s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s;
},methods:{
sendMsg(){
this.$emit('helloPP','1')
},
......
src/components/FinancialModule/RecPayQuery.vue
View file @ dafd9cb9
......@@ -286,9 +286,9 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label="凭证费用:">
<el-select filterable v-model='msg.CostTypeID' >
<el-select filterable v-model='msg.KJCostTypeId' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
......@@ -301,7 +301,7 @@
<el-option :value="1" label="是"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</template>
</el-row>
</el-form>
......
src/components/PrintPageN.vue 0 → 100644
View file @ dafd9cb9
<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;
/* page-break-after: always; */
}
/* @media print {
._PrintPage{
margin-left:-145px;
}
} */
._PrintPage_box{
position: relative;
}
._PrintPage_box .SetDiv{
position: absolute;
top:10px;
color:#106BAF;
left: -100px;
}
._PrintPage_box .SetDiv span{
color:#106BAF;
cursor: pointer;
}
</style>
<template v-loading="loading">
<div class="_PrintPage">
<div class="_PrintPage_box">
<template v-if="type==='2'&&(Merge==='0'||Merge===null)">
<div class="SetDiv">
<span @click="disabled=false">编辑</span>
<span @click="disabled=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-Bill :disabled.sysc="disabled" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
</div>
</template>
<template v-else-if="type==='1'&&(Merge==='0'||Merge===null)">
<div class="SetDiv">
<span @click="disabled1=false">编辑</span>
<span @click="disabled1=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in loopNumN">
<my-RVB-Bill :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
</div>
</template>
<template v-if="type==='7'&&(Merge==='0'||Merge===null)">
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
</div>
</template>
<template v-if="Merge==='1'">
<div class="_border_1" v-for="(item,index) in loopNumN">
<my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
</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/MergeBillModule.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
export default {
data(){
return{
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
}
},components:{
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill
},methods:{
numAdd(){
this.num = this.num + 1
}
},mounted(){
},created(){
this.id = this.$route.query.id;
this.type = this.$route.query.type;
this.isKehu = this.$route.query.isKehu;
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
}
}
</script>
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