Skip to content

S
SuperMan
Commit 2f7cc8b3 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents a405678a a38c781b
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 32 deletions
src/components/Details.vue
View file @ 2f7cc8b3
......@@ -820,6 +820,7 @@ export default {
filterRouter(){
let that=this
this.$router.beforeEach((to, from, next) => {
document.title = to.meta.title ? to.meta.title+'-四川和平国际旅行社' : '四川和平国际旅行社'
// console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
if(to.path=="/ModifyVisaProduct"){
this.reloadpage();
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 2f7cc8b3
......@@ -285,7 +285,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 2f7cc8b3
......@@ -32,7 +32,7 @@
<li :class="active==3?'_active':''" v-else>挂账单</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList" v-if="item.IsShow === 1 || item.showYes">
<li v-for="(item,index) in GetList" v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
<div class="_left">
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
......@@ -86,6 +86,7 @@
orderObj:null,
showTab:0,
templateID: null,
DepartID: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -159,6 +160,17 @@
}else if (x.Type==7){
this.GZList.push(x);
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else {
x.bigShow = true
}
});
}
this.GetList = this.collectList;
......@@ -174,6 +186,8 @@
},err=>{})
},
},mounted(){
let userInfo = this.getLocalStorage();
this.DepartID = userInfo.RB_Department_Id;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 2f7cc8b3
......@@ -377,7 +377,7 @@
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
</tr>
</table>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==10">
......
src/components/SalesModule/groupTourOrder.vue
View file @ 2f7cc8b3
......@@ -1713,7 +1713,8 @@
icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" type="primary"
<!-- v-if="item.Status=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" -->
<el-button type="primary"
style='background:green; border-color:green' icon="iconfont icon-bianji-smal"
@click='getRemarks(item)'></el-button>
</el-tooltip>
......@@ -1910,6 +1911,7 @@
</template>
<script>
import moment from "moment";
import payURL from '../commonPage/payURL.vue'
import payURL1 from '../commonPage/payURL1.vue'
import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
......@@ -2616,6 +2618,14 @@
this.showID = data
},
getRemarks (obj) {
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
......@@ -2624,6 +2634,20 @@
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
this.clearMsg()
this.remarksMsg.OrderId = obj.orderId
this.remarksMsg.Remarks = obj.remarks
this.remarksMsg.OldRemarks = obj.remarks
this.remarksMsg.isOrder = obj.isOrder
}
},
getDetail (obj) {
this.Ysze=false;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 2f7cc8b3
......@@ -995,7 +995,7 @@
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')"/>
</span>
</p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -1093,13 +1093,26 @@
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> -->
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice(2)">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
</template>
<el-form-item label="高于本团单价">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -2215,6 +2228,7 @@
</template>
<script>
import moment from "moment";
import payURL from "../commonPage/payURL.vue";
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
......@@ -2409,6 +2423,7 @@ export default {
{ required: true, message: "请输入备注信息", trigger: "blur" }
]
},
HightUnitPrice: '2',
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -3220,6 +3235,28 @@ submitYSZEForm(){
);
},
getRemarks(obj) {
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate){
this.$confirm("该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
......@@ -3229,6 +3266,8 @@ submitYSZEForm(){
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
}
//HK 新加
if(this.userId==1 || this.userId==5|| this.positionId==168)
{
......@@ -3354,7 +3393,14 @@ submitYSZEForm(){
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
},
getTotalPrice() {
getTotalPrice(t) {
if (t === 3) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
if (this.addMsg.GroupType !=5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum*1 + this.addMsg.ChirdNeedBedNum*1
if (this.addObj.IsBirdDiscount&&this.addObj.IsBirdDiscount == 1) {
......
src/components/SalesModule/productQuery.vue
View file @ 2f7cc8b3
......@@ -155,7 +155,7 @@
<input type="button" class="normalBtn" value="立即报名" @click="submitForm('addMsg')" />
</span>
</p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px">
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType">
......@@ -237,13 +237,19 @@
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice(2)">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
</template>
<el-form-item label="高于本团单价">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -892,6 +898,7 @@
},
travelControlTripLayerShow: false,
wxLoading: false,
HightUnitPrice: '2',
userId: '',
customerId: '',
createByInfo: '',
......@@ -1604,6 +1611,13 @@
this.autoRemarks("VisaNum", "不要签证数量")
},
getTotalPrice(t) {
if (t === 3) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
//
//console.log(this.addObj)
......
src/router/config.js
View file @ 2f7cc8b3
......@@ -23,21 +23,33 @@ export default {
path: '/VisaPersonalForm',
name: 'VisaPersonalForm',
component: resolve => require(['@/components/VisaPersonalForm'], resolve),
meta: {
title: '签证个人申请表信息'
},
},
{ //团签个人申请表信息
path: '/VisaPersonalFormTuan',
name: 'VisaPersonalFormTuan',
component: resolve => require(['@/components/VisaPersonalFormTuan'], resolve),
meta: {
title: '团签个人申请表信息'
},
},
{ //签证个人申请表信息
path: '/VisaPersonalFormSell',
name: 'VisaPersonalFormSell',
component: resolve => require(['@/components/VisaPersonalFormSell'], resolve),
meta: {
title: '签证个人申请表信息'
},
},
{ //财务打印页面
path: '/PrintPage',
name: 'PrintPage',
component: resolve => require(['@/components/PrintPage'], resolve),
meta: {
title: '财务打印页面'
},
},
{
path: '/confirmationOrder',
......@@ -51,9 +63,9 @@ export default {
path: '/confirmationOrderDownLoad',
name: 'confirmationOrderDownLoad',
component: resolve => require(['@/components/confirmationOrderDownLoad'], resolve),
// meta: {
// keepAlive:true
// }
meta: {
title: '出团通知书下载'
},
},
{
path: '/TravelControlTrip',
......@@ -84,31 +96,49 @@ export default {
path: '/platformManagement',
name: 'platformManagement',
component: resolve => require(['@/components/platformModule/platformManagement'], resolve),
meta: {
title: '平台管理'
}
},
{
path: '/dmc',
name: 'dmc',
component: resolve => require(['@/components/temp/dmc'], resolve),
meta: {
title: '地接首页'
}
},
{ // 营销活动
path: '/activity',
name: 'activity',
component: resolve => require(['@/components/temp/activity'], resolve),
meta: {
title: '营销活动'
}
},
{
path: '/operation',
name: 'operation',
component: resolve => require(['@/components/temp/operation'], resolve),
meta: {
title: '操作'
}
},
{
path: '/finance',
name: 'finance',
component: resolve => require(['@/components/temp/finance'], resolve),
meta: {
title: '财务'
}
},
{
path: '/VisaModel',
name: 'VisaModel',
component: resolve => require(['@/components/temp/VisaModel'], resolve),
meta: {
title: '签证'
}
},
{
path: '/TravelControlTrip',
......@@ -119,16 +149,25 @@ export default {
path: '/administration',
name: 'administration',
component: resolve => require(['@/components/temp/administration'], resolve),
meta: {
title: '行政'
}
},
{
path: '/DomesticTicketing',
name: 'DomesticTicketing',
component: resolve => require(['@/components/temp/DomesticTicketing'], resolve),
meta: {
title: '机票'
}
},
{
path: '/systemManagement',
name: 'systemManagement',
component: resolve => require(['@/components/temp/systemManagement'], resolve),
meta: {
title: '系统'
}
},
{
path: '/Details',
......@@ -422,6 +461,9 @@ export default {
path: '/forMyApproval',
name: 'forMyApproval',
component: resolve => require(['@/components/administrative/forMyApproval'], resolve),
meta: {
title: '我审批的'
}
},
{
path: '/leaveApproval', //请假审批
......@@ -2689,7 +2731,10 @@ export default {
}, { // 签证 签证产品
path: '/VisaProduct',
name: 'VisaProduct',
component: resolve => require(['@/components/SalesVisa/VisaProduct'], resolve)
component: resolve => require(['@/components/SalesVisa/VisaProduct'], resolve),
meta: {
title: '签证产品'
},
}, { // 签证 常用航班
path: '/regularFlights',
name: 'regularFlights',
......@@ -2847,11 +2892,17 @@ export default {
path: '/WorkEntrustmentMy',
name: 'WorkEntrustmentMy',
component: resolve => require(['@/components/administrative/WorkEntrustmentMy'], resolve),
meta: {
title: '工作委托'
},
},
{
path: '/WorkEntrustment',
name: 'WorkEntrustment',
component: resolve => require(['@/components/administrative/WorkEntrustment'], resolve),
meta: {
title: '工作委托'
},
},
{
path: '/OrderToday', // 国内票务
......@@ -3192,6 +3243,9 @@ export default {
path: '/leaderPay2', //领队报账
name: 'leaderPay2',
component: resolve => require(['@/components/leaderPay2'], resolve),
meta: {
title: '领队报账'
}
}
]
}
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