Skip to content

S
SuperMan
Commit c26e0596 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 959ba827 30cd28f1
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 51 deletions
src/assets/common/lang/zh.js
View file @ c26e0596
......@@ -1117,6 +1117,7 @@ export const fnc = {
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
ysjine: '应收金额',
}
export const tips = {
tips: '提示',
......@@ -1284,7 +1285,7 @@ export const rule = {
qxzkhmingcheng: '请选择客户名称!',
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qxzzdbumen:' 请选择制单部门！',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1300,6 +1301,10 @@ export const rule = {
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
qtxhkuanren: '请填写汇款人！',
qtxhkshijian: '请选择汇款时间！',
qxzjylshuihao: '请选择交易流水号！',
qxzskzhanghao: '请选择收款账号！',
}
export const adm={
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ c26e0596
......@@ -179,7 +179,7 @@
<p class="rb_stit">
<span>{{BillSonName}}</span>
</p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?this.$t('fnc.no'):msg.OrderID}}</span></p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.gongzhang')}}</el-radio>
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ c26e0596
......@@ -142,13 +142,13 @@
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">审批流程</p>
<p class="_log_t">{{$t('fnc.spliucheng')}}</p>
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
</div>
</div>
<span slot="reference" class="_flow_chart">流程图</span>
<span slot="reference" class="_flow_chart">{{$t('fnc.liuchengtu')}}</span>
</el-popover>
<p class="_yewudanju" v-if="OrderSource==8">订单号：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?'无':msg.OrderID}}</span></p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<p class="rb_tit" >{{BillName}}
(<el-select filterable v-model='msg.RB_Branch_Id' @change="admin_get_DepartmentGetList(msg.RB_Branch_Id)" class="w120 _border_b_1">
<el-option v-for='item in companyList'
......@@ -163,7 +163,7 @@
<span>{{BillSonName}}</span>
</p>
<div class="rb_top_row _r_mb5">
<p >收款账户：
<p >{{$t('fnc.fkuanzhanghu')}}：
<el-select filterable v-model='bankType' placeholder="" @change="getAccountList(bankType)" class="w100 _border_b_1">
<el-option v-for='item in AccList'
:label='item.Name'
......@@ -186,27 +186,27 @@
</el-option>
</el-select>
</p>
<p><span class="">编号.</span>{{GetDetail.FrID==0?'待生成':GetDetail.FrID}}</p>
<p><span class="">{{$t('hotel.hotel_SerialNumber')}}.</span>{{GetDetail.FrID==0?$t('fnc.daishengcheng'):GetDetail.FrID}}</p>
</div>
<div class="rb_top_row _r_mb5">
<p >收款账号：
<p >{{$t('fnc.skuanzhanghao')}}：
<span class="_border_b_1 _AccountNumber">{{AccountNumber}}</span>
</p>
<p class="_r_time"><span>{{yaer}}</span> 年 <span>{{month}}</span> 月 <span>{{dateS}}</span> 日 <span>{{timer}}</span></p>
<p class="_r_time"><span>{{yaer}}</span> {{$t('pub.year')}} <span>{{month}}</span> {{$t('pub.month')}} <span>{{dateS}}</span> {{$t('fnc.day')}} <span>{{timer}}</span></p>
</div>
<table class="Receipt_table" border="1" bordercolor="#c94052" style="border-collapse:collapse;">
<tr>
<th rowspan="2">费 用 说 明</th>
<th rowspan="2">数量</th>
<th rowspan="2">单 价</th>
<th rowspan="2" width="80">币种</th>
<th colspan="3">金额</th>
<th rowspan="2">备注</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="80">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
</tr>
<tr>
<th width="88">原币</th>
<th width="50">汇率</th>
<th width="88">本位币</th>
<th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="88">{{$t('fnc.bweibi')}}</th>
</tr>
<template v-for="(da,daIn) in msg.detailList" >
<tr v-if="!da.show" @click="showEdit(daIn)" class="_color_b">
......@@ -221,7 +221,7 @@
</tr>
<tr v-else @keyup.enter="addList(2,daIn+1)" style="border-right:none;">
<td height="26px">
<el-select filterable v-model='da.CostTypeId' placeholder="请选择费用说明" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)" class="w200 _border_b_1">
<el-select filterable v-model='da.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)" class="w200 _border_b_1">
<el-option v-for='item in GetCostTypeList'
:label='item.Name'
:value='item.ID'
......@@ -248,7 +248,7 @@
</template>
<tr @keyup.enter="addList(1)">
<td >
<el-select filterable v-model='detailList.CostTypeId' placeholder="请选择费用说明" @change="getCostTypeName(detailList.CostTypeId),addList(1)" class="w200 _border_b_1">
<el-select filterable v-model='detailList.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(1)" class="w200 _border_b_1">
<el-option v-for='item in GetCostTypeList'
:label='item.Name'
:value='item.ID'
......@@ -307,29 +307,29 @@
<td height="26px"></td>
</tr>
<tr>
<td colspan="1">手续费<br/><span class="_font_size12">（原币）</span></td>
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khyuanbi')}}</span></td>
<td colspan="3"><input class="_border_b_1 w80" type="number" v-model="msg.OriginalFee" @change="countFee()"></input></td>
<td colspan="1">手续费<br/><span class="_font_size12">（本位币）</span></td>
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khbweibi')}}</span></td>
<td colspan="3"><span class=" w80" type="number">{{msg.Fee}}</span></td>
</tr>
<tr>
<td>应收金额<br/><span class="_font_size12">（大写）</span></td>
<td>{{$t('fnc.ysjine')}}<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
<td colspan="3">{{chinaAllPrice}}</td>
<td>应收金额<br/><span class="_font_size12">（小写）</span></td>
<td>{{$t('fnc.ysjine')}}<br/><span class="_font_size12">{{$t('fnc.xiaoxie')}}</span></td>
<td colspan="3">{{allPriceTo}}</td>
</tr>
<tr>
<td>汇款人</td>
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="1">
<el-input v-model="msg.RemitterName" type="text" class="w80 _border_b_1"></el-input>
</td>
<td>交易流水号</td>
<td>{{$t('fnc.jylshuihao')}}</td>
<td colspan="2">
<el-tooltip class="item" effect="dark" :content="msg.AccountNumber" placement="top">
<el-input v-model="msg.AccountNumber" type="text" class="w80 _border_b_1"></el-input>
</el-tooltip>
</td>
<td>汇款时间</td>
<td>{{$t('fnc.hkshijian')}}</td>
<td colspan="2">
<el-date-picker clearable class="w150 _border_b_1"
v-model="msg.TradeDate"
......@@ -347,13 +347,13 @@
</p>
</template>
<p>
业务员：<span class="_r_name _jump_page" >{{emplyeeName}}</span>
{{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page" >{{emplyeeName}}</span>
</p>
</div>
<div class="_explain">
<p>附加说明</p>
<p>{{$t('fnc.fjshuoming')}}</p>
<div>
<p>费用归属部门：<span><el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
<p>{{$t('fnc.fygsbumen')}}：<span><el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -395,14 +395,14 @@
</div>
</div>
<div class="_remark">
<p>描述</p>
<p>{{$t('system.label_info')}}</p>
<textarea v-model="msg.Description">
</textarea>
</div>
<div class="" >
<div v-if="IsUploadPic===1">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
<!-- <el-upload
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
......@@ -435,7 +435,7 @@
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
......@@ -443,8 +443,8 @@
<div class="_submit">
<div class="chosenNextBox">
<div v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>下一步：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword placeholder="请选择下一步审批人" :remote-method="remoteMethod" :loading="loadingPeople">
<label>{{$t('fnc.xiayibu')}}：<span class="red">{{msg.AuditDescription}}</span></label>
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote reserve-keyword :placeholder="$t('rule.qxzxybshren')" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
......@@ -453,8 +453,8 @@
</div>
</div>
<div class="btn-box">
<button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" @click="AddFinancial(1)">暂存</button>
<button class="normalBtn" @click="AddFinancial()">提交</button>
<button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button>
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button>
</div>
</div>
......@@ -754,7 +754,7 @@ export default {
},
uploadFileBtn(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
this.$message.warning(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
......@@ -772,11 +772,11 @@ export default {
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
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.saveMsg.push({
......@@ -785,7 +785,7 @@ export default {
Type:fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.$message.success('上传成功');
this.$message.success(this.$t('tips.scchenggong'))
});
},
countFee(){ // 输入原币手续费计算本位币手续费
......@@ -1014,18 +1014,18 @@ export default {
this.msg.Status = 0;
}else{
this.msg.Status = 1;
if(this.msg.RemitterName=='')return this.$message.error('请填写汇款人！');
if(this.msg.TradeDate=='')return this.$message.error('请选择汇款时间！');
if(this.msg.detailList.length<1)return this.$message.error('请填写至少一项费用说明！');
if(this.msg.RemitterName=='')return this.$message.error(this.$t('rule.qtxhkuanren'));
if(this.msg.TradeDate=='')return this.$message.error(this.$t('rule.qtxhkshijian'));
if(this.msg.detailList.length<1)return this.$message.error(this.$t('rule.qtxzsyxfyshuoming'));
}
if(this.bankType===12){
if(this.msg.AccountNumber===""){
return this.$message.error('请选择交易流水号！');
return this.$message.error(this.$t('rule.qxzjylshuihao'));
}
}
// if(this.msg.IsHave==0&&this.chosenPeople.length==0)return this.$message.error('请选择下一步审核人')
if(this.msg.BankId=='')return this.$message.error('请选择收款账号!');
if(!this.msg.RB_Depart_Id)return this.$message.error('请选择制单部门!');
if(this.msg.BankId=='')return this.$message.error(this.$t('rule.qxzskzhanghao'));
if(!this.msg.RB_Depart_Id)return this.$message.error(this.$t('rule.qxzzdbumen'));
delete this.msg.DetailList;
delete this.msg.PayMoney;
delete this.msg.VorcherInos;
......@@ -1043,9 +1043,9 @@ export default {
this.loading = true;
this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){
this.$confirm('操作成功，是否继续制单?', '提示', {
confirmButtonText: '继续制单',
cancelButtonText: '不了，谢谢',
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
confirmButtonText: this.$t('fnc.jxzhidan'),
cancelButtonText: this.$t('fnc.nothanks'),
type: 'warning'
}).then(() => {
this.$router.push({name:'addReceivablesDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}});
......@@ -1064,7 +1064,7 @@ export default {
this.apipost('FinancialFlowTemplate_post_GetProcessList',{ID:id,WorkFlowID:0,TemplateType:0},res=>{
if(res.data.resultCode==1){
res.data.data.forEach(y=>{
y.contentTips = y.AuditDescription+(y.AuditWay=="2"?'（会签）':'（或签）')
y.contentTips = y.AuditDescription+(y.AuditWay=="2"?this.$t('fnc.huiqian') : this.$t('fnc.huoqian'))
})
this.AuditListData.AuditList = res.data.data;
let data = JSON.parse(JSON.stringify(this.AuditListData.AuditList));
......
src/components/Hotel/HotelInfo.vue
View file @ c26e0596
......@@ -211,6 +211,7 @@
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -251,6 +252,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -259,6 +263,11 @@ import googleMap from "../commonPage/googleMap.vue";
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
//是否显示添加图片
addimg: false,
//地图选中地址
......@@ -443,6 +452,24 @@ export default {
this.HotelImageArray.splice(index, 1);
//this.updatePic();
},
inited (viewer){
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
addImgOpen() {
this.addimg = true;
this.initimgList();
......
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