Skip to content

S
SuperMan
Commit 0e9ee735 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 86926885 012a9739
Show whitespace changes
Inline Side-by-side
Showing with 189 additions and 20 deletions
src/assets/css/cssReset.css
View file @ 0e9ee735
......@@ -646,4 +646,7 @@ vertical-align:middle
border: none;
color: white;
}
.MyInput .el-input--mini .el-input__inner{
height:28px!important;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 0e9ee735
......@@ -366,10 +366,11 @@
cursor:pointer;
text-decoration: underline;
}
</style>
<template>
<div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="page_fdd FinancialDocumentsDetail MyInput" v-if="GetDetail">
<div class="_none_print">
<p class="_tit">
......@@ -423,6 +424,18 @@
|| 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">
......@@ -855,6 +868,7 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export default {
data(){
return{
huijiState:true,
OPState:false,
LeadState:false,
//驳回弹窗
......@@ -924,8 +938,10 @@ export default {
danjuType: '',
showModel: false,
CostTypeState:false,
huijiShow:false,
}
},components:{
},
components:{
'my-FlowChartModule': myFlowChartModule,
'my-Bill': myBill,
'my-C-Bill': myCBill,
......@@ -946,7 +962,30 @@ export default {
this.pageIndex = this.$route.query.pageIndex;
let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId;
let userInfo = this.getLocalStorage();
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,
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 0e9ee735
......@@ -186,6 +186,7 @@
<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>
......@@ -202,6 +203,13 @@
<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>
......@@ -214,6 +222,7 @@
<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>
......@@ -224,6 +233,7 @@
<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>
......@@ -234,6 +244,7 @@
<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>
......@@ -244,6 +255,7 @@
<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>
......@@ -252,6 +264,7 @@
<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>
......@@ -266,18 +279,22 @@
<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">
......@@ -341,9 +358,18 @@ export default {
printTime:'',
currentMoney:0,
benMoney:0,
GetDetail:{}
GetDetail:{},
selectState:false,
huijiShow:false,
GetCostTypeList:[],
}
},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,
......@@ -352,7 +378,32 @@ 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:{
},
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=>{})
},
jumpPage(path,id,type){
if(type==1){
// let routeData = this.$router.resolve({
......@@ -415,6 +466,7 @@ export default {
}
}
// console.log("this.GetDetail",this.GetDetail)
}
}, err => {})
},
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 0e9ee735
......@@ -147,6 +147,7 @@
<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>
......@@ -163,6 +164,13 @@
<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">
......@@ -174,6 +182,7 @@
<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>
......@@ -184,6 +193,7 @@
<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>
......@@ -194,6 +204,7 @@
<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>
......@@ -204,12 +215,14 @@
<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>
......@@ -222,6 +235,8 @@
<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>
......@@ -236,12 +251,15 @@
<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">
......@@ -297,6 +315,9 @@ 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:'',
......@@ -307,6 +328,12 @@ 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,
......@@ -315,7 +342,31 @@ 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:{
},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=>{})
},
sendMsg(){
this.$emit('helloPP','1')
},
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 0e9ee735
......@@ -286,6 +286,22 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="凭证费用:">
<el-select filterable v-model='msg.CostTypeID' >
<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>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="只查询凭证:">
<el-select filterable v-model='msg.IsSelectKJSetCostType' >
<el-option :value="0" label="否"></el-option>
<el-option :value="1" label="是"></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
</el-row>
</el-form>
......@@ -802,6 +818,8 @@ export default {
QStartDate:'',
UpdateBy:'',
IsFormRecPayQuery:'1',
KJCostTypeId:0,
IsSelectKJSetCostType:0,
Sort:'2',
EmployeeId:'',
},
......@@ -1027,6 +1045,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
......@@ -1075,6 +1095,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
} ,
financeRemove(id){//作废
......@@ -1367,6 +1389,8 @@ export default {
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
KJCostTypeId:this.msg.KJCostTypeId==0?'':this.msg.KJCostTypeId,
IsSelectKJSetCostType:this.msg.IsSelectKJSetCostType==0?'':this.msg.IsSelectKJSetCostType,
}
this.msg = msg;
},
......
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