Skip to content

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

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

parents f3545e50 6b477d65
Hide whitespace changes
Inline Side-by-side
Showing with 511 additions and 111 deletions
src/assets/common/lang/zh.js
View file @ c61b01ec
......@@ -1090,6 +1090,9 @@ export const fnc = {
qqdizhi: '请求地址',
zfxinxi: '支付信息',
shsiyao: '商户私钥',
tbshxx:'同步商户信息',
djfjs:'地接费结算',
shxx:'商户信息',
ptgongyao: '平台公钥',
banbenhao: '版本号',
shoukuandan: '收款单',
......
src/components/FinancialModule/BasicDocuments.vue
View file @ c61b01ec
......@@ -814,6 +814,7 @@
@click="goUrlApplication('Application',GetDetail.FrID)">
<span v-show="huijiShow" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)"
style="color: #3980C8;font-size:12px;text-align:right;cursor: pointer;width:830px;margin-bottom:20px">{{$t('objFill.pzdy')}}</span>
<span v-if="GetDetail.FApplyForNumber&&GetDetail.FApplyForNumber!=''">{{$t('objFill.sqs')}}{{GetDetail.FApplyForNumber}}{{$t('objFill.xz')}}</span>
<span v-else>{{$t('objFill.weitijiaosqs')}}</span>
</div>
......@@ -821,6 +822,7 @@
<template v-if="!otherTable">
<!-- 付款 -->
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
<my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon">
</my-Bill>
</template>
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ c61b01ec
......@@ -104,6 +104,7 @@
<i v-if="name===1">{{$t('fnc.yewulian')}}</i>
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
</p>
<!--<p class="_yewudanju">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>-->
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
......@@ -121,6 +122,14 @@
</p>
</div>
<template v-if="GetDetail.OtherType==87" >
<div style="text-align:right">
<el-tooltip class="item" effect="dark" content="企业支付码" placement="top-start" style="text-align:right;">
<span><img width="16" src="https://img.alicdn.com/tfs/TB1qEwuzrj1gK0jSZFOXXc7GpXa-32-32.ico"></span>
</el-tooltip>
</div>
</template>
<div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ c61b01ec
......@@ -530,7 +530,7 @@
</div>
<table class="Receipt_table" border="1" bordercolor="#106BAF" style="border-collapse:collapse;">
<tr>
<th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}111</th>
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
......
src/components/LeaderManagement/AlipayManagementDetail.vue
View file @ c61b01ec
<style>
<style scoped>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
......@@ -15,8 +15,6 @@
font-size: 28px;
color: #8c939d;
width: 50px;
height: 50px;
line-height: 50px;
text-align: center;
}
......@@ -44,61 +42,103 @@
background-color: #ffffff;
text-align:center;
}
</style>
<template>
<div class="flexOne appmenumanage">
.aliClass ._addUpload_box {
display: initial;
margin-top: 20px;
width: 138px !important;
}
<div class="query-box" >
<div style="width:90%;">
<el-form class="_info_box clearfix " label-width="120px" size="mini">
<el-row :gutter="10">
<el-col :span="10">
<el-form-item :label="$t('objFill.v101.LeaderManagement.zhidumc')" >
{{DataList.InstitutionName}}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="10">
<el-form-item label="制度描述" >
{{DataList.InstitutionDesc}}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="10">
<el-form-item :label="$t('objFill.v101.LeaderManagement.zhiduzt')" >
{{DataList.Effective==1?$t('fnc.qiyong'):$t('fnc.tingyong')}}
</el-form-item>
</el-col>
</el-row>
.aliClass ._addUpload_box>div {
float: left;
width: 100px;
height: 92px;
<el-row :gutter="10">
<el-col :span="10">
<el-form-item :label="$t('objFill.v101.LeaderManagement.zhidyxqi')" >
{{DataList.EffectiveStartDate}}-{{DataList.EffectiveEndDate}}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="10">
<el-form-item :label="$t('system.table_staffs')" >
{{DataList.EmployeeName}}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" style="margin-bottom:10px;" v-if="IsEdit==1">
<el-col :span="10">
<input type="button" class="normalBtn" :value="$t('objFill.v101.LeaderManagement.xiugaizhid')" @click="AddMsgBaseInfo(DataList)" />
<input type="button" class="normalBtn" :value="$t('objFill.v101.LeaderManagement.xiugaiyuang')" @click="EditEmployee()" />
</el-col>
</el-row>
<el-row :gutter="10">
<template v-if="DataList.QuotaList&&DataList.QuotaList.length>0">
<table class="companyalipay">
<tr style="width:100%;">
<th :colspan="IsEdit==1?'8':'7'" style="color:red !important; ">{{$t('objFill.v101.LeaderManagement.yuangedfpxx')}}</th>
</tr>
border-radius: 2px;
cursor: pointer;
padding: 5px;
margin: 0 10px 10px 0;
position: relative;
}
.aliClass ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.aliClass ._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
/deep/.aliClass ._pic_upload .el-upload-dragger {
width: 100px !important;
height: 50px !important;
}
.TB-Title {
float: left;
position: relative;
top: 10px;
}
.TB_comtitle {
color: #333333;
padding-left: 10px;
height: 14px;
line-height: 14px;
font-size: 14px;
border-left: 3px solid #e95252;
margin-bottom: 20px;
}
.TeamBalancePayment .TB_PrintDiv {
height: 40px;
margin-top:20px;
}
.TeamAddBtn {
float: right;
margin-bottom: 10px;
}
</style>
<template>
<div class="flexOne appmenumanage" width="95%">
<div class="TB_comtitle TB-Title">{{$t('objFill.v101.LeaderManagement.yuangedfpxx')}}</div>
<table class="companyalipay" style="width:100%;">
<tr style="width:100%;">
<th style="width:10%;">{{$t('objFill.v101.LeaderManagement.zhidumc')}}</th>
<th style="width:10%;">制度描述</th>
<th style="width:10%;">{{$t('objFill.v101.LeaderManagement.zhiduzt')}}</th>
<th style="width:10%;">{{$t('objFill.v101.LeaderManagement.zhidyxqi')}}</th>
<th style="width:10%;">{{$t('system.table_staffs')}}</th>
<th style="width:10%;" v-if="IsEdit==1&&DataList.IsEndTCID==0">{{$t('system.table_operation')}}</th>
</tr>
<tr >
<td>{{DataList.InstitutionName}}</td>
<td> {{DataList.InstitutionDesc}} </td>
<td> {{DataList.Effective==1?$t('fnc.qiyong'):$t('fnc.tingyong')}}</td>
<td> {{DataList.EffectiveStartDate}}-{{DataList.EffectiveEndDate}} </td>
<td> {{DataList.EmployeeName}} </td>
<td v-if="IsEdit==1&&DataList.IsEndTCID==0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.LeaderManagement.xiugaizhid')" placement="top-start">
<el-button @click="AddMsgBaseInfo(DataList)" type="primary" icon="el-icon-edit" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.LeaderManagement.xiugaiyuang')" placement="top-start">
<el-button @click="EditEmployee()" type="primary" icon="el-icon-user" circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="TB_comtitle TB-Title">{{$t('objFill.v101.LeaderManagement.yuangedfpxx')}}</div>
<table class="companyalipay" style="width:100%;">
<tr style="width:100%;">
<th style="width:10%;">{{$t('system.table_staffs')}}</th>
<th style="width:10%;">{{$t('objFill.v101.LeaderManagement.edudwy')}}</th>
......@@ -107,8 +147,9 @@
<th style="width:10%;">{{$t('objFill.v101.LeaderManagement.suodjwdwy')}}</th>
<th style="width:5%;">{{$t('objFill.v101.LeaderManagement.shifkyzz')}}</th>
<th style="width:20%;">{{$t('objFill.v101.LeaderManagement.eduyxsj')}}</th>
<th style="width:10%;" v-if="IsEdit==1">{{$t('system.table_operation')}}</th>
<th style="width:10%;" v-if="IsEdit==1&&DataList.IsEndTCID==0">{{$t('system.table_operation')}}</th>
</tr>
<template v-if="DataList.QuotaList&&DataList.QuotaList.length>0">
<tr v-for="(item,index) in DataList.QuotaList" :key="index">
<td>{{item.EmployeeName}}</td>
<td>
......@@ -129,7 +170,7 @@
<td>
<template v-if="item.Id&&item.Id>0"> {{item.EffectiveStartDate}}-{{item.EffectiveEndDate}}</template>
</td>
<td v-if="IsEdit==1">
<td v-if="IsEdit==1&&DataList.IsEndTCID==0">
<template v-if="item.Id&&item.Id>0">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click="AddQuota(item)" type="primary" icon="el-icon-edit" circle></el-button>
......@@ -142,15 +183,160 @@
</template>
</td>
</tr>
</template>
</table>
<div class="TB_comtitle TB-Title">{{$t('hotel.hotel_Order')}}</div>
<table class="companyalipay" style="width:100%;">
<tr style="width:100%;">
<th style="width:10%;">{{$t('fnc.danhao')}}</th>
<th style="width:10%;">单据流程</th>
<th style="width:10%;">{{$t('salesModule.CostType')}}</th>
<th style="width:10%;" >{{$t('fnc.fkduixiang')}}</th>
<th style="width:10%;">{{$t('tips.jiaoyifangshi')}}</th>
<th style="width:10%;">{{$t('fnc.jine')}}</th>
<th style="width:10%;">{{$t('fnc.jiaoyiriqi')}}</th>
<th style="width:5%;">{{$t('fnc.zdrenyuan')}}</th>
<th style="width:20%;">{{$t('fnc.shzhuangtai')}}</th>
<th style="width:10%;" >当前审核人</th>
</tr>
<template v-if="DataList.FinanceList&&DataList.FinanceList.length>0">
<tr v-for="(item,index) in DataList.FinanceList" :key="index">
<td> <span style="text-decoration: underline; cursor: pointer;" @click="goUrlDetail('FinancialDocumentsDetail',item)"> {{item.FrID}}</span> </td>
<td>{{item.FinanceName}}</td>
<td>
<template v-for="(s,si) in item.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
</template>
</td>
<td> {{item.RemitterName}} </td>
<td> <div>
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList"
style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">
{{item.TradeWayList[0].TypeName}}</span>
<span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
{{$t('fnc.no')}}
</div>
</template>
</div> </td>
<td> <p style="line-height:20px">{{item.Type==1?$t('fnc.yingshou'):$t('fnc.yingfu')}}：<span>{{item.Money}}</span></p>
<p style="line-height:20px">{{item.Type==1?$t('fnc.shishou'):$t('fnc.shifu')}}：<span>{{item.PayMoney}}</span></p> </td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div>{{item.CreateDate}}</div>
</td>
<td> {{item.StatusStr}} </td>
<td> {{item.AuditList&&item.AuditList.length>0? item.AuditList[0].EmName:""}} </td>
</tr>
</template>
</table>
<template v-if="DataList.ChangeNotifyList&&DataList.ChangeNotifyList.length>0">
<div class="TeamBalancePayment">
<div data-v-4bc4b302="" class="clearfix TB_PrintDiv">
<div data-v-4bc4b302="" class="TB_comtitle TB-Title">{{$t('fnc.zfxinxi')}}</div>
<!-- -->
<input type="button" class="normalBtn TeamAddBtn" :value="$t('fnc.djfjs')" @click="DJFEnd()" v-if="msg.IsDiJi==1&&DataList.IsEndTCID==1&&DataListFrIds&&DataListFrIds.length==0"/>
<input type="button" class="normalBtn TeamAddBtn" :value="$t('fnc.tbshxx')" @click="GetAlipayCommerceEcConsumeDetailQuery(DataList)" />
</div>
</div>
<table class="companyalipay" style="width:100%;">
<tr style="width:100%;">
<th style="width:20%;">{{$t('OrderList.search.orderId')}}</th>
<th style="width:10%;">{{$t('system.payTime')}}</th>
<th style="width:10%;">{{$t('system.payTotalMoney')}}</th>
<th style="width:10%;">{{$t('system.payType')}}</th>
<th style="width:15%;">{{$t('system.table_staffs')}}</th>
<th style="width:10%;">{{$t('fnc.shxx')}}</th>
<template v-if="msg.IsDiJi==1&&DataList.IsEndTCID==1&&DataList.FrIds&&DataList.FrIds.length==0"> <th style="width:20%;" >{{$t('fnc.fyshuoming')}}</th></template>
</tr>
<tr v-for="(item,index) in DataList.ChangeNotifyList" :key="item.pay_no">
<td> {{item.pay_no}}</td>
<td>
{{item.gmt_biz_create}}
</td>
<td>
{{item.peer_pay_amount}}
</td>
<td>
{{item.consume_type=="CONSUME"?$t('fnc.fukuan'):$t('fnc.shoukuan')}}
</td>
<td>
{{item.employeeName}}
</td>
<td>
{{item.ConsumeInfo.OppositeFullName}}- {{item.ConsumeInfo.CategoryName}}
</td>
<template v-if="msg.IsDiJi==1&&DataList.IsEndTCID==1&&DataList.FrIds&&DataList.FrIds.length==0">
<td>
<el-select v-model="item.CostTypeId" :placeholder="$t('pub.pleaseSel')" >
<el-option v-for="costItem in DataList.CostList" :label='costItem.Name' :value='costItem.ID' :key="costItem.ID"> </el-option>
</el-select>
</td>
</template>
</tr>
</table>
<!-- -->
<template v-if="msg.IsDiJi==1&&DataList.IsEndTCID==1&&DataList.FrIds&&DataList.FrIds.length==0" >
<div class="aliClass">
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in VorcherInos">
<div v-if="file.Type==3">
<div class="iconfont " style="width:100px;height:50px;overflow: hidden;">
<el-image style="width:100%;height:100%;" :src="file.Url?file.Url:file.Content"
:preview-src-list="VorcherInosImg">
</el-image>
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1" style="text-align:center;height:50px;line-height: 50px;background:#eee;">
<div class="iconfont "
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload" >
<el-upload drag :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon" style="font-size:14px;height:auto"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</div>
</template>
<template v-else><div style="margin-bottom:10px;"></div></template>
</template>
</el-row>
</el-form>
</div>
<el-dialog custom-class='w500' :title="$t('objFill.v101.LeaderManagement.xiugygkyed')" :visible.sync="AddMsgQuotaShow" center
:before-close="clearMsgQuota">
<el-form :model="AddMsgQuota" :rules="rules" ref="AddMsgQuota" label-width="120px">
<span style="color:red;">{{$t('objFill.v101.LeaderManagement.shiygdedbnsc')}}</span>
<!-- <span style="color:red;">{{$t('objFill.v101.LeaderManagement.shiygdedbnsc')}}</span> -->
<table class="layerNoIcon">
<tr>
<td>
......@@ -164,7 +350,7 @@
<el-form-item :label="$t('system.query_type')" prop="action">
<el-radio v-model="AddMsgQuota.Action" label="1">{{$t('objFill.v101.LeaderManagement.zenjiaed')}}</el-radio>
<el-radio v-model="AddMsgQuota.Action" label="2">{{$t('objFill.v101.LeaderManagement.jianshaoed')}}</el-radio>
<el-radio v-model="AddMsgQuota.Action" label="3">{{$t('objFill.v101.LeaderManagement.shangchued')}}</el-radio>
<!-- <el-radio v-model="AddMsgQuota.Action" label="3">{{$t('objFill.v101.LeaderManagement.shangchued')}}</el-radio> -->
</el-form-item>
</td>
</tr>
......@@ -279,30 +465,28 @@
<button class="normalBtn" type="primary" @click="UpdateInvoiceInstitutionModify()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w500' :title="$t('objFill.v101.LeaderManagement.xiugaiyuang')" :visible.sync="EditEmployeeShow" center
:before-close="clearEditEmployeeMsg">
<el-form :model="EditEmployeeMsg" :rules="EditEmployeerules" ref="EditEmployeeMsg" label-width="120px">
<table class="layerNoIcon">
<tr>
<td>
<el-form-item :label="$t('system.table_staffs')" prop="EmployeeIdList">
<el-select
v-model="EditEmployeeMsg.EmployeeIdList"
filterable
multiple
:placeholder="$t('pub.pleaseSel')" >
<el-option
v-for="item in EmployeeList"
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
</table>
<el-dialog custom-class='w500' :title="$t('objFill.v101.LeaderManagement.xiugaiyuang')" :visible.sync="EditEmployeeShow" center :before-close="clearEditEmployeeMsg">
<el-form :model="EditEmployeeMsg" :rules="EditEmployeerules" ref="EditEmployeeMsg" label-width="120px">
<table class="layerNoIcon">
<tr>
<td>
<el-form-item :label="$t('system.table_staffs')" prop="EmployeeIdList">
<el-select
v-model="EditEmployeeMsg.EmployeeIdList"
filterable
multiple
:placeholder="$t('pub.pleaseSel')" >
<el-option
v-for="item in EmployeeList"
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="clearEditEmployeeMsg()">
......@@ -310,10 +494,9 @@
</button> &nbsp;
<button class="normalBtn" type="primary" @click="EditEmployeeModify()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
</template>
<script>
......@@ -329,8 +512,12 @@
IsLeave:0,
},
DataList: '',
VorcherInos:[],
VorcherInosImg: [],
picObj:[],
msg: {
Id:0,
IsDiJi:0,
},
AddMsgQuota:{
Id:0,
......@@ -425,12 +612,16 @@
}
},
mounted() {
this.msg.Id = this.$route.query.Id;
if(this.$route.query.Id){
this.msg.Id=this.$route.query.Id;
}
let userInfo = this.getLocalStorage(); // 读取缓存数据
this.employeeMsg.GroupId = userInfo.RB_Group_id;
if(this.$route.query.Type){
this.IsEdit=this.$route.query.Type;
console.log("this.Type",this.IsEdit);
}
if(this.$route.query.IsDiJi){
this.msg.IsDiJi=this.$route.query.IsDiJi;
}
this.getList();
},
......@@ -442,7 +633,16 @@
}
}, err => {})
},
goUrlDetail(path, rowData) {
this.$router.push({
path: path,
query: {
id: rowData.FrID,
blank: 'y',
tab: rowData.FrID + this.$t('objFill.documentparticulars')
}
})
},
AddQuota(obj){
this.AddMsgQuota.ShareMode=obj.ShareMode;
this.AddMsgQuota.Id=obj.Id;
......@@ -580,6 +780,16 @@
}, err => {
})
},
GetAlipayCommerceEcConsumeDetailQuery() { //企业码账单详情查询
this.apipost('alipay_post_AlipayCommerceEcConsumeDetailQuery', this.msg, res => {
if (res.data.resultCode == 1) {
this.DataList.ChangeNotifyList= res.data.data.ChangeNotifyList
this.DataList.CostList= res.data.data.CostList
this.$forceUpdate()
}
}, err => {
})
},
AddMsgBaseInfo(obj){//给编辑数据赋值
this.addMsg.InstitutionName=obj.InstitutionName;//制度名称
this.addMsg.Id=obj.Id;
......@@ -610,5 +820,69 @@
}, err => {
})
},
DJFEnd(){//地接费结算
this.apipost('alipay_post_InstitutionSettlementTCID', {Id:this.msg.Id,ChangeNotifyList:this.DataList.ChangeNotifyList,VorcherInos:this.VorcherInos} , res => {
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.getList();
}
}, err => {
})
},
showUpLoadFile(i) { // 预览上传文件
if (i.Type == 3) {
this.picObj.push(i.Url);
} else {
if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
this.previewPDF(i.Url)
} else {
window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i.Url)
}
}
},
deleteUploadFile(i) { // 删除上传文件
this.VorcherInos.splice(i, 1);
//this.UpdateApply.InvoiceFile = [];
},
uploadFileBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.Error(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
let typeArr = [{
stringArr: 'GIF|JPG|JPEG|PNG|BMP',
type: 3
},
{
stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
type: 1
},
]
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != '-1') {
fileTypeNumber = x.type
typeOk = true;
}
})
if (!typeOk) return this.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.VorcherInos.push({
Content: x.data.FilePath,
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
if(fileTypeNumber==3) this.VorcherInosImg.push(this.domainManager().ViittoFileUrl + x.data.FilePath)
this.Success(this.$t('tips.scchenggong'));
});
},
} }
</script>
src/components/LeaderManagement/leaderReimbursement.vue
View file @ c61b01ec
......@@ -1087,14 +1087,12 @@
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDan(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
<input style="margin-top:5px;" type="button"
:value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn"
@click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1"> <!-- -->
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]" >
<input style="margin-top:5px;" type="button" :value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn" @click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-else-if="item.CompanyAlipay===1&&leadr.CurrencyId===1">
<span style="color:red;text-decoration: underline;" @click="GoCompanyAlipay(item)">
{{$t('objFill.v101.dmc.yikqqydf')}}</span>
......@@ -1192,10 +1190,8 @@
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="ShowCompanyAlipay" width="800px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')"
@close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice"
:CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList">
<el-dialog :visible.sync="ShowCompanyAlipay" width="1000px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')" @close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice" :CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList" >
</companyalipay>
<el-row :gutter="20">
<el-col style="text-align: right;margin-bottom:20px;"
......@@ -2268,11 +2264,14 @@
});
this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => {
var tempMoney = (cur.money * this.comRate - cur.yiLing);
var tempShowPrice = cur.money * this.comRate;
//日本
if (this.myLineId == 14) {
tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
} else {
tempShowPrice = Math.round(tempShowPrice / 100) * 100;
}
......
src/components/commonPage/companyalipay.vue
View file @ c61b01ec
<style>
<style scoped>
table.companyalipay {
font-family: verdana,arial,sans-serif;
font-size:11px;
......@@ -21,6 +21,16 @@ table.companyalipay {
padding: 8px;
background-color: #ffffff;
}
/* /deep/ .financiaUpload2 .el-upload-dragger {
width: 100px !important;
height: 37px !important;
} */
/deep/ .financiaUpload2 .el-upload-dragger {
width: 30px !important;
height: 20px !important;
}
</style>
<template>
<el-form class="_info_box clearfix " :model="msg" :rules="rules" ref="msg" label-width="120px">
......@@ -68,13 +78,14 @@ table.companyalipay {
<p></p>
<table class="companyalipay">
<tr style="width:100%;">
<th colspan="4" style="color:red !important; ">{{$t('objFill.v101.LeaderManagement.yuangedfpxx')}}</th>
<th colspan="5" style="color:red !important; ">{{$t('objFill.v101.LeaderManagement.yuangedfpxx')}}</th>
</tr>
<tr style="width:100%;">
<th style="width:10%;">{{$t('system.table_staffs')}}</th>
<th style="width:20%;">{{$t('objFill.v101.LeaderManagement.edudwy')}}</th>
<th style="width:20%;">{{$t('objFill.v101.LeaderManagement.shifkyzz')}}</th>
<th style="width:50%;">{{$t('objFill.v101.LeaderManagement.eduyxsj')}}</th>
<th style="width:15%;">{{$t('objFill.v101.LeaderManagement.shifkyzz')}}</th>
<th style="width:30%;">{{$t('objFill.v101.LeaderManagement.eduyxsj')}}</th>
<th style="width:25%;">{{$t('adm.adm_fujian')}}</th>
</tr>
<tr v-for="(item,index) in msg.QuotaCreateList" :key="index">
<td>{{item.EmployeeName}}</td>
......@@ -87,6 +98,42 @@ table.companyalipay {
<td>
<el-date-picker value-format="yyyy-MM-dd" v-model="item.effectiveDateList" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"> </el-date-picker>
</td>
<td>
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in item.vorcherInos">
<div v-if="file.Type==3" style="width:30px; float:left;">
<div class="iconfont ">
<el-image style="height:16px;" :src="file.Url?file.Url:file.Content"
:preview-src-list="[file.Url?file.Url:file.Content]">
</el-image>
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteInvoiceUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==1" style="width:30px; float:left;">
<div class="iconfont "
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteInvoiceUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==2" style="width:30px; float:left;">
<div class="iconfont icon-excel" @click="showUpLoadFile(file,index)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteInvoiceUploadFile(fIndex,index)"></span>
</div>
</template>
<div class="_pic_upload financiaUpload2" @click="importDataIndex=index">
<el-upload drag :http-request="uploadFileInvoiceBtn" :multiple="true" :show-file-list="false"
action="" style="height:20px">
<i class="el-icon-plus avatar-uploader-icon"></i>
<!-- <div class="el-upload__text" >{{$t('tips.dianjishanhcuan')}}</div> -->
</el-upload>
</div>
</div>
</td>
</tr>
</table>
</template>
......@@ -174,6 +221,7 @@ export default {
EffectiveStartDate:"",
effectiveDateList: this.TeamStartDateList,
EmployeeName:this.EmployeeList[nameIndex].EmName,
vorcherInos:[],
};
this.msg.QuotaCreateList.push(JSON.parse(JSON.stringify(newQuotaCreateModel)));
})
......@@ -199,6 +247,7 @@ export default {
EffectiveStartDate:"",
effectiveDateList: this.TeamStartDateList,
EmployeeName:this.EmployeeList[nameIndex].EmName,
vorcherInos:[],
};
this.msg.QuotaCreateList.push(JSON.parse(JSON.stringify(newQuotaCreateModel)));
}
......@@ -217,6 +266,65 @@ export default {
}
}, err => {})
},
uploadFileInvoiceBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
let typeArr = [{
stringArr: 'GIF|JPG|JPEG|PNG|BMP',
type: 3
},
{
stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
type: 1
},
]
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != '-1') {
fileTypeNumber = x.type;
typeOk = true;
}
})
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
this.msg.QuotaCreateList[this.importDataIndex].vorcherInos.push({
Content: x.data.FilePath,
ID: 0,
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
deleteInvoiceUploadFile(i, index) { // 删除上传文件
let obj = this.msg.QuotaCreateList[index];
if (obj.vorcherInos) {
obj.vorcherInos.splice(i, 1)
}
// this.saveMsgInvoice.splice(i, 1);
},
showUpLoadFile(i, index) { // 预览上传文件
if (i.Type == 3) {
this.picObj.push(i.Url);
this.picIsShow = true;
} else {
if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
this.previewPDF(i.Url)
} else {
window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i.Url)
}
}
},
},
mounted(){
let userInfo = this.getLocalStorage(); // 读取缓存数据
......
src/components/leaderPay2.vue
View file @ c61b01ec
......@@ -859,7 +859,8 @@
</p>
</template>
<template v-if="item.CompanyAlipay==1">
<span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > {{$t('objFill.v101.dmc.yikqqydf')}}</span></template>
<span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
</div>
</td>
<td>
......@@ -879,6 +880,9 @@
type="button" value="地接费结算制单" style="" class="leader2Btn" @click="goZhiDan(item)">
<span v-else style="color:red">请在APP中提交实际用款详情信息</span>
<input style="margin-top:15px" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
<template v-if="item.CompanyAlipay==1">
<span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > 企业码地接费结算</span>
</template>
<input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" value="退款制单"
class="leader2Btn" @click="gofzZd(item)">
</td>
......@@ -2090,7 +2094,8 @@
name: 'AlipayManagementDetail',
query: {
Id: obj.TCID,
searchTitle: '费控制度详情'
searchTitle: '费控制度详情',
IsDiJi:1,
}
})
window.open(routeData.href, '_blank')
......
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