Skip to content

S
SuperMan
Commit b4993b05 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 1070e502 2d39ede5
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 65 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ b4993b05
......@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit{
width: 30px;
height: 30px;
display: inline-block;
......@@ -27,9 +27,9 @@
cursor: pointer;
outline: none;
}
.page_CapitalAllocation i.edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.edit:hover{background-color: #59daff}
.page_CapitalAllocation i.edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.el-icon-edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.el-icon-edit:hover{background-color: #59daff}
.page_CapitalAllocation i.el-icon-edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
......@@ -190,7 +190,7 @@
</el-popover>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ b4993b05
......@@ -88,6 +88,7 @@
templateID: null,
DepartID: null,
EmployeeId: null,
OrderSource: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -142,43 +143,53 @@
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
console.log("data",data);
if(data){
data.forEach(x => {
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
// if(this.active===2){
// if(x.Id!=11){
// this.payList.push(x);
// }
// }else{
this.payList.push(x);
// }
}else if (x.Type==7){
this.GZList.push(x);
}
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
// 如果不是吴珊，只显示49
if (this.OrderSource === '5' && this.showTab === '2') {
if (x.Id === 49 || x.Id === 50){
x.bigShow = false
if (x.Id === 49){
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
} else if (x.Id === 50 && this.EmployeeId === 639){
x.bigShow = true
} else {
x.bigShow = false
}
console.log('if',x.Id,x.bigShow)
} else {
x.bigShow = false
console.log('else',x.Id,x.bigShow)
}
} else {
x.bigShow = true
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
} else {
x.bigShow = false
}
} else if (x.Id === 48) {
if (this.EmployeeId === 1725) {
x.bigShow = true
} else {
x.bigShow = false
}
}
} else {
x.bigShow = true
}
}
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
this.payList.push(x);
}else if (x.Type==7){
this.GZList.push(x);
}
});
}
......@@ -199,8 +210,9 @@
this.DepartID = userInfo.RB_Department_Id;
this.EmployeeId = userInfo.EmployeeId;
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.OrderSource = this.$route.query.OrderSource ? this.$route.query.OrderSource : null
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
this.GetList = this.collectList;
} else if(this.showTab==3){
......@@ -210,6 +222,7 @@
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Financial_post_GetList();
},components: {
"my-FlowChartModule": myFlowChartModule
}
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ b4993b05
......@@ -535,7 +535,7 @@
</td>
<td class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
......@@ -1382,8 +1382,19 @@ export default {
goUrlAdd(path){
this.$router.push({ name: path,query:{blank:'y',tab:'选择财务单据类型'} })
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
goEit(type,id,edit,Conditon,pageIndex){
let path = '';
if (type === 1) {
path = 'addReceivablesDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 2) {
path = 'addFinancialDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 4) {
path = 'addCapitalAllocation'
this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
}
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
},
watch:{
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ b4993b05
......@@ -509,6 +509,8 @@
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
<button class="hollowFixedBtn" type="button" style="display:none;"
@click="DownLoadShop()">导出</button>
</li>
</ul>
</div>
......@@ -847,6 +849,19 @@
googleMap: googleMap
},
methods: {
//下载Excel
DownLoadShop() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("shop_get_downloadShopFinaceList", qMsg, fileName,
res => {
this.loading = false;
});
},
//上传购物店图片
UploadImage(file) {
let newArr = [];
......
src/components/TravelManager/TravelList/SalesTravelCoupomList.vue
View file @ b4993b05
......@@ -11,13 +11,13 @@
}
.zidingyiFz i{font-size: 14px!important;}
.TravelInfoList .choose_form .el-form-item{
.SalesTravelCoupomList .choose_form .el-form-item{
display: inline-block;
}
.TravelInfoList .info_details p{
.SalesTravelCoupomList .info_details p{
padding:4px 0;
}
.TravelInfoList .ht_span{
.SalesTravelCoupomList .ht_span{
display: inline-block;
width: 26px;
height: 26px;
......@@ -29,7 +29,7 @@
cursor: pointer;
}
.TravelInfoList .el-upload{
.SalesTravelCoupomList .el-upload{
display: inline-block;
width: 45px;
height: 45px;
......@@ -37,15 +37,21 @@
background: cornflowerblue;
color: #fff;
}
.TravelInfoList .el-icon-plus{
.SalesTravelCoupomList .el-icon-plus{
position: relative;
top: 5px;
font-size: 20px;
}
.SalesTravelCoupomList .info_details p{
padding:4px 0;
}
.SalesTravelCoupomList .icon-caidan-fill{
color:#fff;
}
</style>
<template>
<div class="TravelInfoList flexOne">
<div class="SalesTravelCoupomList flexOne">
<div class="query-box">
<div style="overflow:auto">
<input type="button" class="normalBtn" value="查询" style="float:right" @click="getList"/>
......@@ -104,7 +110,7 @@
<th>订单状态</th>
<th>出发日期</th>
<th>返回日期</th>
<th>上传合同</th>
<th width="120px">上传合同</th>
<th>方案数量</th>
<th>创建日期</th>
<th>操作</th>
......@@ -131,7 +137,13 @@
<td>{{item.startDate | YearMD}}</td>
<td>{{item.backDate | YearMD}}</td>
<td>
<td style="text-align:left;padding-left: 30px;box-sizing:border-box;">
<el-tooltip class="item" effect="dark" content="上传合同" placement="top">
<el-button @click="StHt(item)" v-if="item.chooseSalesId&&item.chooseSalesId==EmployeeId" type="primary" icon="el-icon-upload2" circle></el-button>
</el-tooltip>
<el-popover
placement="bottom"
width="400"
......@@ -146,11 +158,6 @@
</el-table>
<span v-if="item.contractFile&&item.contractFile.length>0" class="ht_span" slot="reference">{{item.contractFile.length}}</span>
</el-popover>
<el-tooltip class="item" effect="dark" content="上传合同" placement="top">
<el-button @click="StHt(item)" v-if="item.chooseSalesId&&item.chooseSalesId==EmployeeId" type="primary" icon="el-icon-upload2" circle></el-button>
</el-tooltip>
</td>
<td>{{item.planCount}}</td>
<td>{{item.createDate | YearMD}}</td>
......@@ -159,6 +166,9 @@
<el-tooltip class="item" effect="dark" content="查看行程方案" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="Gourl('SalesTravelCoupomPlanList',item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<el-button style="background:#3ED488" icon="iconfont icon-caidan-fill" circle @click="travel=true,GetDes(item)"></el-button>
</el-tooltip>
</td>
</tr>
......@@ -210,8 +220,47 @@
</el-form-item>
</el-form>
</el-dialog>
<!--查看详情 -->
<el-dialog custom-class='w400' title="行程详情" :visible.sync="travel">
<div style="padding-bottom:25px">
<div class="info_details">
<p><label>出发地：</label> <span class="d">{{ruleForm.departureName}}</span></p>
<p><label>目的地：</label><span class="d">{{ruleForm.destinationNames}}</span></p>
<p><label>预估出行日期：</label><span class="d">{{ruleForm.startDate | YearMD}} 至 {{ruleForm.backDate | YearMD}}</span></p>
<p><label>预估出行人数：</label><span class="d">成人：{{ruleForm.audltNumber}} 儿童：{{ruleForm.childrenNumber}}</span></p>
<p><label>预估人均预算：</label> <span class="d">{{ruleForm.budget}}</span></p>
<p><label>需要提供什么：</label><span class="d">{{ruleForm.provideItem}}</span></p>
<p><label>其他需求：</label><span class="d">{{ruleForm.otherDemand}}</span></p>
<p><label>销售数量：</label><span class="d">{{ruleForm.salesCount}}</span></p>
<p><label>方案数量：</label><span class="d">{{ruleForm.planCount}}</span></p>
<p><label>出发时间：</label><span class="d">{{ruleForm.startDate}}</span></p>
<p><label>返回时间：</label><span class="d">{{ruleForm.backDate}}</span></p>
<!-- <p><label>姓名：</label><span class="d">{{ruleForm.contact}}</span></p>
<p><label>手机：</label><span class="d">{{ruleForm.phoneNumber}}</span></p>
<p><label>邮箱：</label><span class="d">{{ruleForm.email}}</span></p>
<p><label>微信：</label><span class="d">{{ruleForm.weChat}}</span></p> -->
<!-- <p><label>处理时间：</label><span class="d">{{ruleForm.dealDate | YearMD}}</span></p> -->
<p><label>创建时间：</label><span class="d">{{ruleForm.createDate | YearMD}}</span></p>
<p><label>订单状态：</label><span class="d">
<span v-if="ruleForm.orderStatus==1">已提交</span>
<span v-if="ruleForm.orderStatus==2">方案设计</span>
<span v-if="ruleForm.orderStatus==3">合同签订</span>
<span v-if="ruleForm.orderStatus==4">下单</span>
<span v-if="ruleForm.orderStatus==5">已成团</span>
<span v-if="ruleForm.orderStatus==6">已关团</span>
<span v-if="ruleForm.orderStatus==7">已取消</span>
</span></p>
<p><label>处理备注：</label><span class="d">{{ruleForm.dealRemark}}</span></p>
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -220,6 +269,8 @@ import moment from "moment"
export default {
data() {
return {
travel:false,
ruleForm:{},
fileList2:[],
provideItem:[],
form:{
......@@ -286,6 +337,9 @@ import moment from "moment"
},
methods: {
GetDes(item){
this.ruleForm=Object.assign({},item);
},
Remove(file, fileList){
this.htmsg.contractFile.forEach(item=>{
if(item.name==file.name){
......
src/components/TravelManager/TravelList/SalesTravelCoupomPlanList.vue
View file @ b4993b05
......@@ -17,6 +17,11 @@
.TravelInfoList .info_details p{
padding:4px 0;
}
.TravelInfoList .underline:hover{
text-decoration: underline;
cursor: pointer;
font-family: "PIngFangR";
}
</style>
<template>
<div class="TravelInfoList flexOne">
......@@ -31,16 +36,16 @@
<!-- <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 width="130">团期ID</th>
<th>行程简介</th>
<th>团期标题</th>
<th>采用状态</th>
<th>方案价格</th>
<th>操作</th>
<th width="150">团期ID</th>
<th width="600">行程简介</th>
<th width="400">团期标题</th>
<th width="150">采用状态</th>
<th width="150">方案价格</th>
<th width="150">操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
<td>{{item.tcid}}({{item.tcnum}})</td>
<td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">{{item.tcnum}}({{item.tcid}})</span></td>
<td>{{item.planIntroduce}}</td>
<td>{{item.travelTitle}}</td>
<td>
......@@ -50,6 +55,9 @@
</td>
<td>{{item.planPrice}}</td>
<td>
<el-tooltip class="item" effect="dark" content="下单" placement="top">
<el-button v-if="item.planUseStatus==2" @click="PlaceOrder('productQuery',item.tcnum)" type="primary" class='zidingyiFz' icon="el-icon-goods" circle ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
</el-tooltip>
......@@ -81,7 +89,7 @@ import moment from "moment"
},
mounted() {
this.customId=this.$route.query.customId;
this.allotId=this.$route.query.allotId;
this.allotId=this.$route.query.allotId?Number(this.$route.query.allotId):this.allotId;
let userInfo=this.getLocalStorage();
this.getList();
},
......@@ -96,6 +104,12 @@ import moment from "moment"
},
methods: {
PlaceOrder(path,tcmun){
this.$router.push({ name: path,query:{"id":tcmun,blank: "y"} })
},
goUrl (path,tcmun) {
this.$router.push({ name: path,query:{"tcmun":tcmun,blank: "y"} })
},
Delete(item){
this.$confirm('是否删除该条行程定制信息?', '提示', {
confirmButtonText: '确定',
......@@ -130,7 +144,6 @@ import moment from "moment"
getList() { //获取数据
this.loading=true,
this.apiJavaPost("/api/dmc/travelCoupom/getSalesTravelCoupomPlanList",{customId:this.customId}, res => {
console.log("res",res);
this.loading = false;
if (res.data.resultCode === 1) {
this.DataList = res.data.data.pageData;
......
src/components/activity/FreelineManagement.vue
View file @ b4993b05
......@@ -560,6 +560,12 @@
<div class="TCL_remarkTitle">OP对内备注：</div>
<div class="TCL_Content">{{item.OPInnerRemark}}</div>
</div>
<div v-if="item.PriceTagList.length>0" class="clearfix TCL-redType">
<div class="TCL_remarkTitle">标签：</div>
<div class="TCL_Content" v-for="(tag,index) in item.PriceTagList" :key="index">
<span style="margin-right:6px">{{tag.content}}</span>
</div>
</div>
</div>
</li>
</ul>
......@@ -919,6 +925,7 @@
"travel_get_GetTravelPrciePageList",
msg,
res => {
console.log(res);
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData;
......
src/components/activity/TravelCoupomPlanList.vue
View file @ b4993b05
......@@ -17,6 +17,11 @@
.TravelInfoList .info_details p{
padding:4px 0;
}
.TravelInfoList .underline:hover{
text-decoration: underline;
cursor: pointer;
font-family: "PIngFangR";
}
</style>
<template>
<div class="TravelInfoList flexOne">
......@@ -31,7 +36,7 @@
<!-- <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>团期ID</th>
<th width="150">团期ID</th>
<th>部门名称</th>
<th>销售姓名</th>
<th>公司名称</th>
......@@ -39,7 +44,7 @@
</tr>
<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
<td>{{item.tcid}}</td>
<td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">{{item.tcnum}}({{item.tcid}})</span></td>
<td>{{item.departmentName}}</td>
<td>{{item.salseName}}</td>
<td>{{item.companyName}}</td>
......@@ -88,12 +93,13 @@ import moment from "moment"
},
methods: {
goUrl (path,tcmun) {
this.$router.push({ name: path,query:{"tcmun":tcmun,blank: "y"} })
},
getList() { //获取数据
this.loading=true,
this.apiJavaPost("/api/dmc/travelCoupom/getTravelCoupomPlanList",{customId:this.customId}, res => {
console.log("res",res);
this.loading = false;
if (res.data.resultCode === 1) {
this.DataList = res.data.data.pageData;
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ b4993b05
......@@ -450,7 +450,8 @@
'path': 'teamRevenueExpenditure',
'companyID': this.msgList[0].OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
}
});
},
......
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