Skip to content

S
SuperMan
Commit 3f31f7d9 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 77b002da 346363d5
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 34 deletions
src/components/FinancialModule/Application.vue
View file @ 3f31f7d9
<template> <template>
<div class="Application"> <div v-loading="loading" class="Application">
<div class="Application_content"> <div class="Application_content">
<div> <div>
<el-select :disabled="numDisabled" @change="ChangeType" v-model="formdata.Type" placeholder="请选择"> <el-select @change="ChangeType" :disabled="numDisabled" v-model="formdata.Type" placeholder="请选择">
<el-option label="现金" :value="1"></el-option> <el-option label="现金" :value="1"></el-option>
<el-option label="转账" :value="2"></el-option> <el-option label="转账" :value="2"></el-option>
</el-select> </el-select>
...@@ -11,8 +11,12 @@ ...@@ -11,8 +11,12 @@
流水号：<span style="color:#E95252">{{data.ApplyForNumber}}</span> 流水号：<span style="color:#E95252">{{data.ApplyForNumber}}</span>
</p> </p>
<p style="text-align:center"> <p style="text-align:center">
<span style="font-weight:700;font-size:20px;">{{baseData.head}}</span>
<span class="download" @click="downLoad">下载并保存</span> <span class="download" @click="downLoad">下载并保存</span>
</p>
<!-- 现金 -->
<div v-if="formdata.Type==1">
<p style="text-align:center">
<span style="font-weight:700;font-size:20px;">現金受取依頼書</span>
</p> </p>
<div> <div>
<div style="margin:30px 0"> <div style="margin:30px 0">
...@@ -25,9 +29,8 @@ ...@@ -25,9 +29,8 @@
</el-option> </el-option>
</el-select> </el-select>
</div>　　 </div>　　
{{baseData.info}} 弊社は下記のガイド1名が現金を受け取りします。受取者の本人パスポートを提示して/身分証明書を確認してから現金を渡してください。ご対応お願い致します。
</div> </div>
<table style="margin-top:30px" class="ApplicationTable singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:30px" class="ApplicationTable singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>受取日</th> <th>受取日</th>
...@@ -57,10 +60,6 @@ ...@@ -57,10 +60,6 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="text-align:right;margin-top:20px;font-size:14px;">
<p style="padding-bottom: 10px;">会社名 成都印象之旅</p>
<span>{{data.JapNowTime}}</span>
</div>
<div class="_addUpload_box clearfix"> <div class="_addUpload_box clearfix">
<div v-if="formdata.ImgAddress!=''"> <div v-if="formdata.ImgAddress!=''">
<div style="width:100%;height:100%;overflow: hidden;"> <div style="width:100%;height:100%;overflow: hidden;">
...@@ -78,6 +77,74 @@ ...@@ -78,6 +77,74 @@
</el-upload> </el-upload>
</div> </div>
</div> </div>
</div>
<!-- 转账 -->
<div class="zzDiv" v-if="formdata.Type==2">
<p style="text-align:center">
<span style="font-weight:700;font-size:20px;">振込み依頼書</span>
</p>
<div style="margin:30px 0">
<el-select @change="CashListChange" :disabled="disabled" v-model="id" placeholder="请选择">
<el-option
v-for="item in CashList"
:key="item.Name"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</div>
<p style="margin-bottom: 5px;">御担当様</p>
<p style="margin-bottom: 5px;">お世話になっております。　</p>
<p style="margin-bottom: 5px;">下記の振込先を<el-input size="small" style="width:120px;margin:0 5px" :disabled="numDisabled" v-model="formdata.Money" placeholder="请输入内容"></el-input> （合计：{{formdata.Money}}）を振り込むようお願いします。</p>
<p style="margin-bottom: 5px;">振込先：</p>
<div v-if="!numDisabled" style="margin-bottom: 5px;">
<el-select @change="ChangezzType" :disabled="numDisabled" v-model="zzType" placeholder="请选择">
<el-option label="图片" :value="1"></el-option>
<el-option label="文字" :value="2"></el-option>
</el-select>
</div>
<template v-if="zzType==1">
<div v-if="numDisabled && formdata.ImgAddress!=''">
<img style="width:100%" :src="formdata.ImgAddress?formdata.ImgAddress:''">
</div>
<div v-if="!numDisabled" class="_addUpload_box clearfix">
<div v-if="formdata.ImgAddress!=''" >
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="formdata.ImgAddress?formdata.ImgAddress:''">
</div>
<span v-if="!numDisabled" class="iconfont icon-guanbi1" @click="deleteUploadFile"></span>
</div>
<div class="_pic_upload" >
<el-upload style="width:100%;height:100%"
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</template>
<template v-if="zzType==2">
<p>
<el-input style="width:80%;" :disabled="numDisabled" v-model="formdata.GetDate" placeholder="请输入内容"></el-input>
</p>
<p>
<el-input style="width:80%;margin:10px 0;" :disabled="numDisabled" v-model="formdata.LeaderName" placeholder="请输入内容"></el-input>
</p>
<p>
<el-input style="width:80%" :disabled="numDisabled" v-model="formdata.GetAddress" placeholder="请输入内容"></el-input>
</p>
</template>
　　
</div>
<div style="text-align:right;margin-top:20px;font-size:14px;">
<p style="padding-bottom: 10px;">会社名 成都印象之旅</p>
<span>{{data.JapNowTime}}</span>
</div>
<div style="margin:50px 0"> <div style="margin:50px 0">
<p>{{data.CityName}}<span style="padding-left:6px;"> </span>{{data.TCNUM}}编号：{{data.FrId}}</p> <p>{{data.CityName}}<span style="padding-left:6px;"> </span>{{data.TCNUM}}编号：{{data.FrId}}</p>
...@@ -90,10 +157,8 @@ ...@@ -90,10 +157,8 @@
export default { export default {
data () { data () {
return { return {
baseData:{ loading:false,
head:"現金受取依頼書", zzType:1,
info:"弊社は下記のガイド1名が現金を受け取りします。受取者の本人パスポートを提示して/身分証明書を確認してから現金を渡してください。ご対応お願い致します。",
},
FrId:0, FrId:0,
CashList:[], CashList:[],
formdata:{}, formdata:{},
...@@ -114,7 +179,13 @@ export default { ...@@ -114,7 +179,13 @@ export default {
}, },
methods: { methods: {
ChangeType(val){ ChangeType(val){
console.log("val",val); this.formdata.ImgAddress="";
},
ChangezzType(val){
this.formdata.GetDate="";
this.formdata.LeaderName="";
this.formdata.GetAddress="";
this.formdata.ImgAddress="";
}, },
uploadFileBtn(file) { //上传 uploadFileBtn(file) { //上传
if(this.formdata.ImgAddress!=''){ if(this.formdata.ImgAddress!=''){
...@@ -183,15 +254,23 @@ export default { ...@@ -183,15 +254,23 @@ export default {
this.formdata.GetAddress=""; this.formdata.GetAddress="";
}, },
GetData(){ GetData(){
this.loading=true;
this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => { this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => {
this.loading=false;
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.data = res.data.data; this.data = res.data.data;
if(this.data.ApplyForNumber!="待生成"){ if(this.data.ApplyForNumber!="待生成"){
this.numDisabled=true; this.numDisabled=true;
if(this.data.ImgAddress==''){
this.zzType=2;
}
} }
console.log("this.data",this.data) // console.log("this.data",this.data)
this.formdata=Object.assign({},res.data.data); this.formdata=Object.assign({},res.data.data);
if(this.formdata.Type==0){
this.formdata.Type=1; this.formdata.Type=1;
}
this.CashList= res.data.data.CashList; this.CashList= res.data.data.CashList;
if(this.data.Name!=""){ if(this.data.Name!=""){
this.disabled=true; this.disabled=true;
...@@ -214,6 +293,11 @@ export default { ...@@ -214,6 +293,11 @@ export default {
</script> </script>
<style> <style>
.Application .zzDiv .el-input.is-disabled .el-input__inner{
/* border:none; */
background-color:transparent;
}
.Application .ApplicationTable .el-input.is-disabled .el-input__inner{ .Application .ApplicationTable .el-input.is-disabled .el-input__inner{
border:none; border:none;
background-color:transparent; background-color:transparent;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 3f31f7d9
...@@ -251,8 +251,6 @@ ...@@ -251,8 +251,6 @@
} }
._Printing{ ._Printing{
position: relative; position: relative;
left: 830px;
top: 25px;
z-index: 30; z-index: 30;
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
...@@ -340,16 +338,12 @@ ...@@ -340,16 +338,12 @@
} }
.page_fdd .sqs{ .page_fdd .sqs{
position: relative; position: relative;
left: 642px;
top: 25px;
cursor: pointer; cursor: pointer;
color: #3980C8; color: #3980C8;
font-size: 12px; font-size: 12px;
} }
.page_fdd .Note_span{ .page_fdd .Note_span{
position: relative; position: relative;
left: 635px;
top: 25px;
cursor: pointer; cursor: pointer;
color: #3980C8; color: #3980C8;
font-size: 12px; font-size: 12px;
...@@ -377,10 +371,20 @@ ...@@ -377,10 +371,20 @@
<template> <template>
<div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail"> <div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print"> <div class="_none_print">
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<p class="_tit">
{{GetDetail.FinanceName}}
<span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span>
</p>
<div style="width: 890px;position: relative;text-align: right;">
<span v-if="GetDetail.TemplateId==36 || GetDetail.TemplateId==37 || GetDetail.TemplateId==53 || GetDetail.TemplateId==43 || GetDetail.TemplateId==56 || GetDetail.TemplateId==48" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span> <span v-if="GetDetail.TemplateId==36 || GetDetail.TemplateId==37 || GetDetail.TemplateId==53 || GetDetail.TemplateId==43 || GetDetail.TemplateId==56 || GetDetail.TemplateId==48" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span>
<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)">申请书下载</span> <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)">
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p> 申请书{{GetDetail.FApplyForNumber}}下载
</span>
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
<div class="_conten"> <div class="_conten">
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......
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