Skip to content

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

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

parents 35b37242 c13196a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 906 additions and 2 deletions
src/components/FinancialModule/Application.vue 0 → 100644
View file @ 85e115cf
<template>
<div class="Application">
<div class="Application_content">
<p style="text-align:center">
<span style="font-weight:700;font-size:20px;">現金受取依頼書</span>
<span @click="downLoad" style="float:right;cursor: pointer;">下载</span>
</p>
<div>
<div style="margin:30px 0">
<el-select @change="CashListChange" 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>　　
弊社は下記のガイド1名が現金を受け取りします。受取者の本人パスポートを提示して/身分証明書を確認してから現金を渡してください。ご対応お願い致します。
</div>
<table style="margin-top:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>受取日</th>
<th width="200">受取者</th>
<th>受取店舗</th>
<th>金 額</th>
</tr>
<tr>
<td>{{data.GetDate}}</td>
<td>{{data.LeaderName}}</td>
<td>
<el-select v-model="formdata.GetAddress" placeholder="请选择">
<el-option v-if="id=='' || id==item.CashId"
v-for="item in StoreList"
:key="item.Name"
:label="item.Name"
:value="item.Name">
</el-option>
</el-select>
</td>
<td>{{data.Money}}</td>
</tr>
</table>
<div style="text-align:right;margin-top:20px">
会社名 成都印象之旅<br>
{{data.JapNowTime}}
</div>
<div style="margin:50px 0">
{{data.CityName}}{{data.TCNUM}}编号：{{data.FrId}}
</div>
</div>
</div>
</template>
<script>
export default {
data () {
return {
FrId:0,
CashList:[],
formdata:{},
data:{},
StoreList:[],
id:"",
}
},
created(){
this.FrId = this.$route.query.id;
},
mounted() {
this.GetData();
},
methods: {
downLoad(){
if(this.formdata.Name==""){
this.Error("请选择旅行社")
return;
}
if(this.formdata.GetAddress==""){
this.Error("请选择受取店铺")
return;
}
this.apipost('Financial_get_FinanceCashWithDrawalsDownLoad',this.formdata,res=>{
// console.log(res);
if(res.data.resultCode==1){
const link = document.createElement('a');
let _loadUrl=this.domainManager().DomainUrl
let str = window.location.href
link.href = _loadUrl+res.data.data
document.body.appendChild(link);
link.click();
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
CashListChange(val){
this.id=val;
this.CashList.forEach(item=>{
if(item.Id==this.id){
this.formdata.Name=item.Name;
}
})
this.formdata.GetAddress="";
},
GetData(){
this.apipost('Financial_get_GetFinanceCashWithDrawals',{FrId:this.FrId}, res => {
if(res.data.resultCode == 1) {
this.data = res.data.data;
this.formdata=Object.assign({},res.data.data);
this.CashList= res.data.data.CashList;
this.StoreList= res.data.data.StoreList;
}
}, err => {})
},
}
}
</script>
<style>
.Application tr th{
border: 1px solid #e5e5e5;
}
.Application{
background: #fff;
padding-top: 20px;
min-height:800px;
}
.Application .Application_content{
border: 1px solid #eeeeee;
width: 1000px;
margin:0 auto;
padding: 20px;
}
</style>
src/components/FinancialModule/DebitNote.vue 0 → 100644
View file @ 85e115cf
<template>
<div class="DebitNote">
<div class="Application_content">
<p style="text-align:center">
<span style="font-weight:700;font-size:20px;">借支单</span>
<span @click="downLoad" style="float:right;cursor: pointer;">下载</span>
</p>
<table style="margin-top:40px;text-align:left" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="150">公司名称</td>
<td colspan="3">{{data.CityName}}</td>
<td width="100">附件</td>
<td width="200">共 2 张</td>
</tr>
<tr>
<td>申请部门</td>
<td width="100">{{data.DepName}}</td>
<td width="100">申请人</td>
<td width="100">{{data.Name}}</td>
<td>填单日期</td>
<td width="100">{{data.JapNowTime}}</td>
</tr>
<tr>
<td>业务项目</td>
<td class="left" colspan="5">{{data.TCNUM}}</td>
</tr>
<tr>
<td>审批编号</td>
<td class="left" colspan="5">{{data.FrId}}</td>
</tr>
<tr>
<td style="padding: 38px 0;">借款事由</td>
<td class="left" colspan="5">{{data.Description}}</td>
</tr>
<tr>
<td>借款金额</td>
<td class="left">{{data.Money}}</td>
<td colspan="2">预计还款报销日期</td>
<td class="left" colspan="2">{{data.ReimbursementDate}}</td>
</tr>
<tr>
<td>大写：{{data.CurrName}}</td>
<td class="left" colspan="5">{{chinaAllPrice}}</td>
</tr>
<tr>
<td>部门负责人审批</td>
<td></td>
<td>领导审批</td>
<td colspan="3"></td>
</tr>
</table>
<div style="padding: 10px 0;margin-top: 30px;">
<!-- <span>财务经理： </span>
<span>会计主管：</span>
<span>复核：</span>
<span>出纳：</span> -->
<span style="display: inline-block;width: 200px;float: right;">领款人：</span>
</div>
</div>
</div>
</template>
<script>
export default {
data () {
return {
FrId:0,
data:{},
chinaAllPrice:this.$commonUtils.changeMoneyToChinese(0),
}
},
created(){
this.FrId = this.$route.query.id;
},
mounted() {
this.GetData();
},
methods: {
downLoad(){
this.apipost('Financial_get_FinanceBorrowASingleDownLoad',this.formdata,res=>{
if(res.data.resultCode==1){
const link = document.createElement('a');
let _loadUrl=this.domainManager().DomainUrl
let str = window.location.href
link.href = _loadUrl+res.data.data
document.body.appendChild(link);
link.click();
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
CashListChange(val){
this.id=val;
this.CashList.forEach(item=>{
if(item.Id==this.id){
this.formdata.Name=item.Name;
}
})
},
GetData(){
this.apipost('Financial_get_GetFinanceBorrowASingle',{FrId:this.FrId}, res => {
console.log(res);
if(res.data.resultCode == 1) {
this.data = res.data.data;
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.data.Money)
this.formdata=Object.assign({},res.data.data);
this.formdata.BigMoney=this.chinaAllPrice;
}
}, err => {})
},
}
}
</script>
<style>
.DebitNote .left{
text-align:left;
padding-left: 15px;
}
.DebitNote tr th{
border: 1px solid #e5e5e5;
}
.DebitNote{
background: #fff;
padding-top: 20px;
min-height:800px;
}
.DebitNote .Application_content{
width: 1000px;
margin:0 auto;
padding: 20px;
border: 1px solid #eeeeee;
}
</style>
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 85e115cf
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
} }
._Printing{ ._Printing{
position: relative; position: relative;
left: 766px; left: 830px;
top: 25px; top: 25px;
z-index: 30; z-index: 30;
font-size: 12px; font-size: 12px;
...@@ -328,12 +328,38 @@ ...@@ -328,12 +328,38 @@
.color_shz{color: #1273BC} .color_shz{color: #1273BC}
.color_tg{color: #4BCA81} .color_tg{color: #4BCA81}
.color_bh{color: #c94052} .color_bh{color: #c94052}
.page_fdd .sqs:hover{
text-decoration: underline;
color: rgb(255, 0, 0);
}
.page_fdd .Note_span:hover{
text-decoration: underline;
color: rgb(255, 0, 0);
}
.page_fdd .sqs{
position: relative;
left: 642px;
top: 25px;
cursor: pointer;
color: #3980C8;
font-size: 12px;
}
.page_fdd .Note_span{
position: relative;
left: 635px;
top: 25px;
cursor: pointer;
color: #3980C8;
font-size: 12px;
}
</style> </style>
<template> <template>
<div class="page_fdd" v-if="GetDetail"> <div class="page_fdd" 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> <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<span v-if="GetDetail.TemplateId==48 || GetDetail.TemplateId==43" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span>
<span v-if="GetDetail.TemplateId==48" class="sqs" @click="goUrl('Application',GetDetail.FrID)">申请书下载</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> <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 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>
...@@ -837,6 +863,15 @@ export default { ...@@ -837,6 +863,15 @@ export default {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
this.bossID = userinfo.EmployeeId; this.bossID = userinfo.EmployeeId;
},methods:{ },methods:{
goUrl(path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: "y"
}
});
},
inited (viewer){ inited (viewer){
this.$viewer = viewer this.$viewer = viewer
}, },
......
src/components/TravelManager/TravelList/SalesTravelCoupomList.vue 0 → 100644
View file @ 85e115cf
<style>
.user_time_picker .el-date-editor--date>.el-input__inner {
padding:0 10px;
font-size: 13px;
}
.user_time_picker .el-date-editor--date>span.el-input__prefix {
display: none;
}
.user_time_picker .el-date-editor--date>span.el-input__suffix{
top:-4px;right: 2px;
}
.zidingyiFz i{font-size: 14px!important;}
.TravelInfoList .choose_form .el-form-item{
display: inline-block;
}
.TravelInfoList .info_details p{
padding:4px 0;
}
</style>
<template>
<div class="TravelInfoList flexOne">
<div class="query-box">
<div style="overflow:auto">
<input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/>
</div>
<el-form class="choose_form" ref="form" :model="form" label-width="80px">
<el-form-item label="处理状态">
<el-select v-model="form.dealStatus" 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="3"></el-option>
<el-option label="处理失败" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker class="w150" type="date" v-model="form.searchStartDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker class="w150" type="date" v-model="form.searchEndDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
<el-form-item label="需要提供">
<el-input
type="text"
placeholder="请输入内容"
v-model="form.provideItem"
maxlength="10"
show-word-limit
>
</el-input>
</el-form-item>
</el-form>
</div>
<div class="clearfix"></div>
<!-- <div style="margin: 10px 0;" class="fz14 color333">{{$t('adm.adm_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> -->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>出发地</th>
<th>目的地</th>
<th>出发日期</th>
<th>人数</th>
<th>人均估算</th>
<th>需要提供</th>
<th>分配销售</th>
<th>处理状态</th>
<th>处理日期</th>
<th>创建日期</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
<td>{{item.departureName}}</td>
<td>{{item.destinationNames}}</td>
<td>{{item.startDate | YearMD}}</td>
<td>
<span v-if="item.audltNumber>0">成人：{{item.audltNumber}}</span>
<span v-if="item.childrenNumber>0">儿童：{{item.childrenNumber}}</span>
</td>
<td>{{item.budget}}</td>
<td>{{item.provideItem}}</td>
<td>{{item.salesName}}</td>
<td>
<span v-if="item.dealStatus==1">未分配</span>
<span v-if="item.dealStatus==2">处理中</span>
<span v-if="item.dealStatus==3">处理完成</span>
<span v-if="item.dealStatus==4">处理失败</span>
</td>
<td>{{item.dealDate | YearMD}}</td>
<td>{{item.createDate | YearMD}}</td>
<td>
<el-tooltip class="item" effect="dark" content="处理信息" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="Visible=true,Deal(item)"></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noData" v-if="DataList.length==0">
暂无数据
</div>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=form.pageSize :total=total>
</el-pagination>
<el-dialog custom-class='w400' title="处理行程信息" :visible.sync="Visible">
<el-form :model="pwdMsg" label-width="80px">
<el-form-item label="处理状态">
<el-select v-model="pwdMsg.dealStatus" filterable placeholder="请选择销售">
<el-option label="处理完成" :value="3"></el-option>
<el-option label="处理失败" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="处理备注">
<el-input
type="textarea"
:rows="2"
placeholder="请输入处理备注"
v-model="pwdMsg.dealRemark">
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="Visible=false">取消</button>
<button class="normalBtn" @click="submitForm1">确定</button>
</div>
</el-dialog>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
form:{
dealStatus:-1,
searchStartDate:"",
searchEndDate:"",
pageIndex:1,
pageSize:15
},
Visible:false,
total:0,
DataList:[],
loading:false,
pwdMsg:{
dealStatus:"",
dealRemark:"",
},
employee:[],
saleList:[],
pickerBeginDateBefore: {
disabledDate: time => {
if (this.form.searchEndDate == null) {
return false;
} else {
let endTime = new Date(this.form.searchEndDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.form.searchStartDate)
return startTime.getTime() >= time.getTime()
}
}
}
},
mounted() {
let userInfo=this.getLocalStorage();
this.getList();
},
filters:{
YearMD(val){
let str="";
if(val){
str=moment(val).format("YYYY-MM-DD")
}
return str;
},
},
methods: {
Deal(item){
this.pwdMsg.customId=item.customId;
},
submitForm1() {
if(this.pwdMsg.dealStatus==""){
this.Error("请选择处理状态!");
return;
}
this.apiJavaPost("/api/dmc/travelCoupom/salesDealTravelCoupom",this.pwdMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message)
this.Visible=false;
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
getList() { //获取数据
this.loading=true,
this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomList",this.form, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.DataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
handleCurrentChange(val){
this.form.pageIndex=val;
this.getList();
},
}
}
</script>
\ No newline at end of file
src/components/activity/TravelInfoList.vue 0 → 100644
View file @ 85e115cf
This diff is collapsed.
src/router/config.js
View file @ 85e115cf
...@@ -1499,6 +1499,15 @@ export default { ...@@ -1499,6 +1499,15 @@ export default {
title: '一日游' title: '一日游'
}, },
}, },
{
path: '/SalesTravelCoupomList', //一日游销售自主开团用
name: 'SalesTravelCoupomList',
component: resolve => require(['@/components/TravelManager/TravelList/SalesTravelCoupomList'], resolve),
meta: {
title: '行程定制信息'
},
},
{ {
path: '/priceIncomeConfirmInfo', ///priceIncomeConfirmInfo path: '/priceIncomeConfirmInfo', ///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo', name: 'priceIncomeConfirmInfo',
...@@ -2482,7 +2491,27 @@ export default { ...@@ -2482,7 +2491,27 @@ export default {
component: resolve => require(['@/components/commonPage/TicketFinace'], resolve), component: resolve => require(['@/components/commonPage/TicketFinace'], resolve),
}, },
] ]
}, { //财务 财务单据 审核标准单据 },
// 申请书
{
path: '/Application',
name: 'Application',
component: resolve => require(['@/components/FinancialModule/Application'], resolve),
meta: {
title: '申请书'
},
},
// 借支单
{
path: '/DebitNote',
name: 'DebitNote',
component: resolve => require(['@/components/FinancialModule/DebitNote'], resolve),
meta: {
title: '借支单'
},
},
{ //财务 财务单据 审核标准单据
path: '/BasicDocuments', path: '/BasicDocuments',
name: 'BasicDocuments', name: 'BasicDocuments',
component: resolve => require(['@/components/FinancialModule/BasicDocuments'], resolve), component: resolve => require(['@/components/FinancialModule/BasicDocuments'], resolve),
...@@ -3050,6 +3079,15 @@ export default { ...@@ -3050,6 +3079,15 @@ export default {
title: '行程定制师' title: '行程定制师'
} }
}, },
{
path: '/TravelInfoList',
name: 'TravelInfoList',
component: resolve => require(['@/components/activity/TravelInfoList'], resolve),
meta: {
title: '行程定制信息'
}
},
{ {
path: '/RegimentLabel', path: '/RegimentLabel',
name: 'RegimentLabel', name: 'RegimentLabel',
......
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