Skip to content

S
SuperMan
Commit 07c749a5 authored by 吴春's avatar 吴春
Browse files
Options

1

parent f1dd9415
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 509 additions and 105 deletions
src/assets/common/lang/zh.js
View file @ 07c749a5
......@@ -1090,6 +1090,9 @@ export const fnc = {
qqdizhi: '请求地址',
zfxinxi: '支付信息',
shsiyao: '商户私钥',
tbshxx:'同步商户信息',
djfjs:'地接费结算',
shxx:'商户信息',
ptgongyao: '平台公钥',
banbenhao: '版本号',
shoukuandan: '收款单',
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 07c749a5
......@@ -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 @ 07c749a5
......@@ -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 @ 07c749a5
......@@ -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/leaderReimbursement.vue
View file @ 07c749a5
......@@ -1027,7 +1027,7 @@
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<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">
<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>
......@@ -1129,7 +1129,7 @@
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="ShowCompanyAlipay" width="800px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')" @close="clearMsg()">
<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">
......@@ -2203,11 +2203,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/ShoppingStore/ShoppingStore.vue
View file @ 07c749a5
......@@ -1257,7 +1257,7 @@
},
delInfo(index) {
var that = this;
this.Confirm(this.$t('objFill.v101.shifscscjbnhfu'), function () {
this.Confirm(that.$t('objFill.v101.shifscscjbnhfu'), function () {
that.Success(this.$t('objFill.v101.hote.shanchucg'));
that.importData.splice(index, 1);
});
......@@ -1269,13 +1269,13 @@
//导入数据
importInfoAndExport() {
var that = this;
this.Confirm(this.$t('objFill.shifoudaorucsj'), function () {
that.Confirm(that.$t('objFill.shifoudaorucsj'), function () {
that.tabLoading = true;
let qMsg = {
msg: that.importData,
uid: that.getLocalStorage().EmployeeId
};
let fileName = this.$t('objFill.v101.shengchenggwsju') + that.$commonUtils.getCurrentDate() + ".xls";
let fileName = that.$t('objFill.v101.shengchenggwsju') + that.$commonUtils.getCurrentDate() + ".xls";
that.apipost(
"ShoppingInfo_Post_ImportAndExport_V2",
qMsg,
......@@ -1323,7 +1323,7 @@
},
delShoppingStore(ID) {
var that = this;
this.Confirm(this.$t('objFill.v101.shifscscjbnhfu'), function () {
this.Confirm(that.$t('objFill.v101.shifscscjbnhfu'), function () {
that.Success(this.$t('objFill.v101.hote.shanchucg'));
var msg = {
ID: ID
......
src/components/commonPage/companyalipay.vue
View file @ 07c749a5
<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 @ 07c749a5
......@@ -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