Skip to content

S
SuperMan
Commit 25f7a13b authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

前端修改： 领队用款制单唯一入口，领队用款新增挂账信息，修改其他bug

parent c31aacf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 880 additions and 566 deletions
build/webpack.prod.conf.js
View file @ 25f7a13b
......@@ -64,6 +64,7 @@ const webpackConfig = merge(baseWebpackConfig, {
filename: config.build.index,
template: 'index.html',
inject: true,
hash: new Date().getTime(),
minify: {
removeComments: true,
collapseWhitespace: true,
......
config/index.js
View file @ 25f7a13b
......@@ -3,12 +3,11 @@
// see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path')
const version = '1.0.0.0'
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsSubDirectory: `static/${version}`,
assetsPublicPath: '/',
proxyTable: {
// '/boundsearch': { // 矩形区域检索entity
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 25f7a13b
......@@ -53,6 +53,9 @@
._border_color_r{
border-color: #c94052;
}
.font_color_b{
color: #106BAF !important;
}
._border_color_b{
border-color: #106BAF;
}
......@@ -255,7 +258,8 @@
</table>
<div class="rb_top_row _r_mt10" v-if="GetDetail.AuditSteps&&GetDetail.AuditSteps.length">
<template v-for="(item,index) in GetDetail.AuditSteps">
<p>{{item.AuditDescription}}：
<p>
<span class="font_color_b">{{item.AuditDescription}}：</span>
<template v-if="item.AuditRecordList&&item.AuditRecordList.length!=0">
<span class="_r_name" v-for="(s,si) in item.AuditRecordList" v-if="((item.Sort==0) || (item.Sort!=0&&s.AuditStatus==2))&&item.AuditRecordList.length" :class="item.Sort==0&&!isPrintPage?'_jump_page':''" @click="item.Sort==0&&!isPrintPage?jumpPage('enrollTotal',GetDetail.TCID,2):''">{{s.AuditName}} </span>
</template>
......
src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue
View file @ 25f7a13b
......@@ -75,6 +75,13 @@
._p_time{
top: 40px;
}
.font_color_b{
color: #106BAF !important;
}
.font_color_r{
color: #c94052 !important;
}
</style>
<template v-if="GetDetail.DetailList.length>0">
<div class="Receipt_box" :class="[GetDetail.Type==1 || GetDetail.Type==5?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
......@@ -269,7 +276,8 @@
</table>
<div class="rb_top_row _r_mt10" v-if="GetDetail.AuditSteps&&GetDetail.AuditSteps.length">
<template v-for="(item,index) in GetDetail.AuditSteps">
<p>{{item.AuditDescription}}：
<p>
<span :class="[GetDetail.Type==1 || GetDetail.Type==5?'font_color_r':'font_color_b']">{{item.AuditDescription}}：</span>
<template v-if="item.AuditRecordList&&item.AuditRecordList.length!=0">
<span class="_r_name" v-for="(s,si) in item.AuditRecordList" v-if="((item.Sort==0) || (item.Sort!=0&&s.AuditStatus==2))&&item.AuditRecordList.length" :class="item.Sort==0&&!isPrintPage?'_jump_page':''" @click="item.Sort==0&&!isPrintPage?jumpPage('enrollTotal',GetDetail.TCID,2):''">{{s.AuditName}} </span>
</template>
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ 25f7a13b
......@@ -66,6 +66,9 @@
background-color: white;
font-size: 12px;
}
.font_color_r{
color: #c94052 !important;
}
</style>
<template v-if="GetDetail.DetailList.length>0" >
<div class="Receipt_box" :class="[GetDetail.Type==1|| GetDetail.Type==5?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
......@@ -233,7 +236,8 @@
</table>
<div class="rb_top_row _r_mt10" v-if="GetDetail.AuditSteps&&GetDetail.AuditSteps.length">
<template v-for="(item,index) in GetDetail.AuditSteps">
<p>{{item.AuditDescription}}：
<p>
<span class="font_color_r">{{item.AuditDescription}}：</span>
<template v-if="item.AuditRecordList&&item.AuditRecordList.length!=0">
<span class="_r_name _no_border" v-for="(s,si) in item.AuditRecordList" v-if="((item.Sort==0) || (item.Sort!=0&&s.AuditStatus==2))&&item.AuditRecordList.length" :class="item.Sort==0&&!isPrintPage?'_jump_page':''" @click="item.Sort==0&&!isPrintPage?jumpPage('enrollTotal',GetDetail.TCID,2):''">{{s.AuditName}} </span>
</template>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 25f7a13b
......@@ -277,7 +277,7 @@
<td>{{item.UseTimeStr}}</td>
<td>
<p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}}
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</p>
</td>
<td>
......@@ -459,7 +459,7 @@
<el-input v-if="item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
</td>
<td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem)">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('DebitNote', subItem)">借支单</span></p>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td>
<td width="80" class="_zhidan">
<input type="button" v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单" class="normalBtn" @click="goZhiDan(item)" />
......@@ -687,6 +687,7 @@
return '晚餐'
},
getNav(){
let _this = this
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs',{TCIDs:this.$route.query.id},res=>{
if(res.data.resultCode==1){
let nav = res.data.data
......@@ -697,7 +698,7 @@
})
nav.forEach((x, i)=>{
if (i === 0) {
x.LeaderGetPriceT = (this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num;
x.LeaderGetPriceT = Math.floor(((_this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num) *100) / 100;
} else {
x.LeaderGetPriceT = 0
}
......
src/components/SalesModule/productQuery.vue
View file @ 25f7a13b
......@@ -784,6 +784,20 @@
<p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.Name}}</span>
</p>
<p>
<span>出票状态：</span>
<span class="fz16 fbold">
<el-tooltip class="item" effect="dark" content="全部出票" placement="top">
<span style="color: #4BCA81;" v-if="item.MakeInvoice==1">√</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="未处理" placement="top">
<span style="color: #E95252" v-if="item.MakeInvoice=='-1'">x</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段/部分出票" placement="top">
<span style="color: #E95252" v-if="item.MakeInvoice=='0'">O</span>
</el-tooltip>
</span>
</p>
</div>
<div class="d7">
<el-button-group style="display:block;">
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 25f7a13b
......@@ -700,6 +700,20 @@
<span style="margin-left:10px;">{{$t('visa.v_tvisa')}}</span>
{{item.GroupVisaNum}}
</p>
<p>
<span>出票状态：</span>
<span class="fz16 fbold">
<el-tooltip class="item" effect="dark" content="全部出票" placement="top">
<span style="color: #4BCA81;" v-if="item.MakeInvoice==1">√</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="未处理" placement="top">
<span style="color: #E95252" v-if="item.MakeInvoice=='-1'">x</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段/部分出票" placement="top">
<span style="color: #E95252" v-if="item.MakeInvoice=='0'">O</span>
</el-tooltip>
</span>
</p>
</div>
</div>
<div class="el-col">
......
src/components/activity/MemberLevel.vue
View file @ 25f7a13b
<style>
.height_auto.el-select .el-input{
height: auto
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
......@@ -69,7 +75,7 @@
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<table class="layerTable layerNoIcon">
<tr>
<td>
......@@ -99,15 +105,21 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="升降级标准" prop="standard">
<el-input v-model="addMsg.standard" type="textarea"/>
<el-form-item label="会员特权" prop="remark">
<el-select filterable multiple v-model='addMsg.jurisdictionListS' class="w217 height_auto">
<el-option v-for='item in jurisdictionsList'
:label='item.name'
:value='item.id'
:key='item.id'>
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="星级有效期延长的条件" prop="condition">
<el-input v-model="addMsg.condition" type="textarea"/>
<el-form-item label="备注" prop="remark">
<el-input v-model="addMsg.remark" type="textarea"/>
</el-form-item>
</td>
</tr>
......@@ -132,34 +144,47 @@ export default {
addMsg:{
id:0,
name: '',
state: '',
state: 1,
tradeMoneyReq: '',
tradePeopleReq: '',
remark: '',
jurisdictionList: []
jurisdictionList: [],
jurisdictionListS: [],
},
rules:{
memberLevel: [{ required: true, message: '请输入会员等级', trigger: "blur" }],
name: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
tradeMoneyReq: [{required: true, message: '交易金额要求', trigger: "blur"}],
tradePeopleReq: [{ required: true, message: '交易人头数要求', trigger: "change" }],
standard: [{ required: true, message: '请输入升降级标准', trigger: "blur" }],
condition: [{ required: true, message: '请输入星级有效期延长的条件', trigger: "blur" }],
tradePeopleReq: [{ required: true, message: '交易人头数要求', trigger: "blur" }],
remark: [{ required: true, message: '请输入备注', trigger: "blur" }],
jurisdictionListS: [{ required: true, message: '请选择特权', trigger: "change" }],
},
loading:false,
outerVisible:false,
dialogTitle:'',
dataList:[],
awardRelationList:[],
jurisdictionsList: [],
};
},
mounted() {
this.getList();
this.getjurisdictions()
},
filters: {
},
methods: {
getjurisdictions: function () {
this.apiJavaPost("/api/member/getjurisdictions", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.jurisdictionsList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//获取数据
getList() {
this.loading = true;
......@@ -186,60 +211,51 @@ export default {
},
//提交添加
addAward(){
this.addMsg.lotteryId = this.$route.query.lotteryId;
if(this.addMsg.awardType==1||this.addMsg.awardType==2){
this.addMsg.awardRelationId = 0;
this.addMsg.jurisdictionList = [];
if (this.addMsg.jurisdictionListS.length < 1) return this.Error('请选择会员特权！')
this.addMsg.jurisdictionListS.forEach(x=>{
this.addMsg.jurisdictionList.push({
id: x
})
})
this.apiJavaPost("/api/member/save", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message)
}
this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
}, null);
},
//修改信息
updateData(item){
this.addMsg.id=item.id;
this.addMsg.lotteryId = item.lotteryId;
this.addMsg.awardName = item.awardName;
this.addMsg.awardType = item.awardType;
this.addMsg.awardRelationId = item.awardRelationId;
this.addMsg.awardCount = item.awardCount;
this.addMsg.awardStatus = item.awardStatus;
this.addMsg.rank = item.rank;
this.getAwardRelationId(3);
},
//根据奖项类型请求关联Id
getAwardRelationId(id){
let branchId = this.$route.query.branchId;
if(id==3){
let msg = {
couponId:this.addMsg.awardRelationId,
branchId:branchId
}
this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => {
if (res.data.resultCode === 1) {
this.awardRelationList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
}
this.outerVisible = true;
this.apiJavaPost("/api/member/get", {id: item.id}, res => {
if (res.data.resultCode === 1) {
let msg = res.data.data;
let jurisdictionListS = [];
msg.jurisdictionList.forEach(x=>{
jurisdictionListS.push(x.id)
})
msg.jurisdictionListS = jurisdictionListS
this.addMsg = msg;
} else {
this.Error(res.data.message)
}
}, null);
},
//重置信息
resetInfo(){
var newMsg = {
id:0,
lotteryId:0,
awardName:'',
awardType:1,
awardRelationId:0,
awardCount:'',
awardStatus:1,
rank:'',
name: '',
state: 1,
tradeMoneyReq: '',
tradePeopleReq: '',
remark: '',
jurisdictionList: [],
jurisdictionListS: [],
}
this.addMsg = newMsg;
},
......
src/components/activity/MemberPrivilege.vue
View file @ 25f7a13b
This diff is collapsed.
src/components/commonPage/chosenOpenMode.vue
View file @ 25f7a13b
......@@ -12,7 +12,7 @@
<div class="item" :class="{active:openMode==0}" @click="chosen(0)">
<img src='../../assets/img/chosen_two.png' />
<p>
单页面多标签模式（此模式适合电脑性能较低的用户）
多页面单标签模式（此模式适合电脑性能较低的用户）
</p>
</div>
</div>
......
src/components/leaderPay2.vue
View file @ 25f7a13b
This diff is collapsed.
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