Skip to content

S
SuperMan
Commit c54cc4e9 authored by 吴春's avatar 吴春
Browse files
Options

没有提交的解决冲突

parents f98f3078 70377c4d
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 149 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ c54cc4e9
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<li> <li>
<span> <span>
<em>{{$t('fnc.danhao')}}</em> <em>{{$t('fnc.danhao')}}</em>
<el-input placeholder="" class="w150" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input> <el-input placeholder="" class="w150" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input>
</span> </span>
</li> </li>
<li> <li>
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ c54cc4e9
...@@ -393,6 +393,7 @@ ...@@ -393,6 +393,7 @@
<p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)">
<span style="color:#000">投诉单号：</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> <span style="color:#000">投诉单号：</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span> <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span> <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span> <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
</p> </p>
...@@ -848,6 +849,7 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue"; ...@@ -848,6 +849,7 @@ import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
OPState:false,
LeadState:false, LeadState:false,
//驳回弹窗 //驳回弹窗
finacialDialog:false, finacialDialog:false,
...@@ -950,6 +952,19 @@ export default { ...@@ -950,6 +952,19 @@ export default {
}, },
GoOPurl(GetDetail){
this.$router.push({
name: 'OpComPersonDetails',
query: {
EmployeeId:GetDetail.AccountEmployeeId,
PeriodsId:GetDetail.OPPeriodsId,
RB_Branch_Id:GetDetail.RB_Branch_Id,
blank: "y",
tab: "op提成明细"
}
});
},
Gourl(GetDetail){ Gourl(GetDetail){
this.$router.push({ this.$router.push({
name: 'CommissionDetail', name: 'CommissionDetail',
...@@ -1354,6 +1369,7 @@ export default { ...@@ -1354,6 +1369,7 @@ export default {
} }
this.chongJudge(data) this.chongJudge(data)
this.GetDetail = data; this.GetDetail = data;
// console.log("this.GetDetail",this.GetDetail)
if(this.GetDetail.DetailList){ if(this.GetDetail.DetailList){
this.GetDetail.DetailList.forEach(item=>{ this.GetDetail.DetailList.forEach(item=>{
if(item.CostTypeName=="领队导游资金池领款"){ if(item.CostTypeName=="领队导游资金池领款"){
...@@ -1386,6 +1402,9 @@ export default { ...@@ -1386,6 +1402,9 @@ export default {
if(item.CostTypeName=="差旅费"){ if(item.CostTypeName=="差旅费"){
this.CostTypeState=true; this.CostTypeState=true;
} }
if(item.CostTypeName=="业务提成（操作）"){
this.OPState=true;
}
}) })
} }
......
src/components/FinancialModule/OPcommissionPeriods.vue
View file @ c54cc4e9
...@@ -8,9 +8,17 @@ ...@@ -8,9 +8,17 @@
display: inline-block; display: inline-block;
margin:10px 15px 10px 0; margin:10px 15px 10px 0;
} }
.OPcommissionPeriods .singeRowTable tr td{
padding: 8px 5px;
}
.OPcommissionPeriods .hoverSpan span:hover{
cursor: pointer;
text-decoration: underline;
color: red;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne OPcommissionPeriods">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
...@@ -40,7 +48,7 @@ ...@@ -40,7 +48,7 @@
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td>{{item.SumPrice}}</td> <td>{{item.SumPrice}}</td>
<td> <td>
<p style="margin:6px 0">{{item.CreateByStr}}</p> <p>{{item.CreateByStr}}</p>
<p>{{item.CreateStr}}</p> <p>{{item.CreateStr}}</p>
</td> </td>
<td>{{item.Discription}}</td> <td>{{item.Discription}}</td>
...@@ -49,9 +57,43 @@ ...@@ -49,9 +57,43 @@
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button> <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="制单" placement="top"> <el-tooltip class="item" effect="dark" content="一键制单" placement="top">
<el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button> <el-button @click="YijianZD(item)" type="danger" class="CM_look" icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<el-popover
placement="left"
width="700"
trigger="click">
<table class="OPcommissionPeriods singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>公司</th>
<th>制单人</th>
<th width="56%">单据</th>
<th>制单时间</th>
</tr>
<tr v-for="(item,index) in djList" :key="index">
<td>{{item.BName}}</td>
<td>{{item.EmName}}</td>
<td>
<div class="hoverSpan" style="text-align: left;padding: 6px 4px;">
<span style="margin-right:5px;margin-bottom:5px" @click="goFinal(fin)" v-for="(fin,key) in item.FinanceIdList" :key="key">{{fin}}</span>
</div>
</td>
<td>{{item.CreateDate}}</td>
</tr>
<tr v-if="djList.length==0">
<td style="text-align:center" colspan="4">暂无数据</td>
</tr>
</table>
<el-button @click="Chankan(item)" style="margin-left:5px" slot="reference" type="warning" class="CM_look" icon="iconfont icon-caidan-fill" circle></el-button>
</el-popover>
</el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -59,6 +101,16 @@ ...@@ -59,6 +101,16 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination> </el-pagination>
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%">
<span>{{ErrorMessage}}</span>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -67,6 +119,8 @@ import moment from "moment" ...@@ -67,6 +119,8 @@ import moment from "moment"
export default { export default {
data() { data() {
return { return {
dialogVisible:false,
ErrorMessage:'',
Month:moment().format("YYYY-MM"), Month:moment().format("YYYY-MM"),
msg: { msg: {
PageIndex: 1, PageIndex: 1,
...@@ -79,6 +133,7 @@ import moment from "moment" ...@@ -79,6 +133,7 @@ import moment from "moment"
currentPage: 1, currentPage: 1,
btnLoading:false, btnLoading:false,
btnShow:false, btnShow:false,
djList:[],
} }
}, },
mounted() { mounted() {
...@@ -91,26 +146,49 @@ import moment from "moment" ...@@ -91,26 +146,49 @@ import moment from "moment"
this.getList(); this.getList();
}, },
methods: { methods: {
goUrlZD(){ goFinal(fin){
let orderObj = { document.querySelector("#app").click();
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType: 112,
SelectState:true,
}
let id=[29,31];
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'FinancialDocumentsDetail',
query: { query: {
Type: 2, id: fin,
templateID: JSON.stringify(id),
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj)
} }
}) })
}, },
Chankan(item){
this.apipost(
"Financial_post_GetOPCommissionBetchImportList",
{PeriodsId:item.ID},
res => {
if(res.data.resultCode==1){
this.djList=res.data.data;
}else{
this.Error(res.data.message);
}
},
null
);
},
YijianZD(item){
this.loading=true;
this.apipost(
"Financial_post_SetOPCommissionBetchImport",
{PeriodsId:item.ID},
res => {
this.loading=false;
if(res.data.resultCode==1){
this.Success(res.data.message)
this.getList();
}else{
this.dialogVisible=true;
this.ErrorMessage=res.data.message;
}
},
null
);
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.PageIndex = val; this.msg.PageIndex = val;
this.getList(); this.getList();
......
src/components/FinancialModule/OpComPersonDetails.vue
View file @ c54cc4e9
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
</li> </li>
</ul> </ul>
</div> </div>
<div style="margin:15px 0">
<span>提成总金额：{{totalInfo.TotalMoney}}</span>
<span>收客总人数：{{totalInfo.TotalNum}}</span>
</div>
<div class="cm_content _scrollbar"> <div class="cm_content _scrollbar">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
...@@ -76,17 +80,9 @@ ...@@ -76,17 +80,9 @@
</el-tooltip> </el-tooltip>
</td> </td>
<!-- <td> <!-- <td>
<el-button-group size='mini'> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></el-button>
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></el-button> </el-tooltip>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.szbweibi')" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('Airticket.Air_ben')}}</el-button>
</el-tooltip>
</el-button-group>
</td> --> </td> -->
</tr> </tr>
</table> </table>
...@@ -127,11 +123,14 @@ ...@@ -127,11 +123,14 @@
currentPage:1, currentPage:1,
total:0, total:0,
EmployeeList:[], EmployeeList:[],
companyList:[] companyList:[],
totalInfo:{},
} }
},created(){ },created(){
this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId; this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId; this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
this.msg.RB_Branch_Id=this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):this.msg.RB_Branch_Id;
}, },
mounted(){ mounted(){
this.getCompany(); this.getCompany();
...@@ -174,8 +173,10 @@ ...@@ -174,8 +173,10 @@
this.apipost('sellcommission_GetOPCommissionSingleDetailsList', this.msg, res => { this.apipost('sellcommission_GetOPCommissionSingleDetailsList', this.msg, res => {
this.loading=false; this.loading=false;
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.DataList = res.data.data.pageData; console.log("res.data",res.data)
this.total=res.data.data.count; this.DataList = res.data.data.pmodel.pageData;
this.total=res.data.data.pmodel.count;
this.totalInfo=res.data.data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ c54cc4e9
...@@ -756,7 +756,6 @@ ...@@ -756,7 +756,6 @@
return { return {
isUpdate: 'false', isUpdate: 'false',
loading: false, loading: false,
LineId:0,
defaultSelectValue: 0, defaultSelectValue: 0,
initialIndex: 0, initialIndex: 0,
picIsShow: false, picIsShow: false,
...@@ -973,17 +972,11 @@ ...@@ -973,17 +972,11 @@
CurrencyId: leadr.CurrencyId, CurrencyId: leadr.CurrencyId,
} }
let id = []; let id = [];
if (obj.LineId==this.LineId){ if (obj.OutBranchId === 0) {
id = [98, 99] id = [43, 48]
} } else {
else{ id = [56, 53]
if (obj.OutBranchId === 0) {
id = [43, 48]
} else {
id = [56, 53]
}
} }
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
...@@ -1186,7 +1179,9 @@ ...@@ -1186,7 +1179,9 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let nav = res.data.data.list; let nav = res.data.data.list;
this.LineId=res.data.data.EntryId; if(nav[0].OutBranchId==1216){
this.IsShowRMB=true;
}
let num = 0; let num = 0;
nav.forEach(x => { nav.forEach(x => {
x.CurrencyIdArr = []; x.CurrencyIdArr = [];
......
src/components/PersonalInfoSet.vue
View file @ c54cc4e9
...@@ -808,7 +808,7 @@ ...@@ -808,7 +808,7 @@
<el-input type="text" class="w400" v-model="addAccountMsg.AccountHolder"></el-input> <el-input type="text" class="w400" v-model="addAccountMsg.AccountHolder"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="nameC" prop="CardNum"> <el-form-item :label="nameC" prop="CardNum">
<el-input type="text" class="w400" v-model="addAccountMsg.CardNum" @keyup.native="resetAccountNum(addAccountMsg.CardNum)"></el-input> <el-input type="text" class="w400" v-model="addAccountMsg.CardNum" @keyup.native="checkInteger(addAccountMsg,'CardNum'),resetAccountNum(addAccountMsg.CardNum)"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="nameD" prop="AccountAlias" > <el-form-item :label="nameD" prop="AccountAlias" >
<el-input type="text" class="w400" v-model="addAccountMsg.AccountAlias"></el-input> <el-input type="text" class="w400" v-model="addAccountMsg.AccountAlias"></el-input>
......
src/components/Ticketing/TicketManager.vue
View file @ c54cc4e9
...@@ -2275,7 +2275,7 @@ ...@@ -2275,7 +2275,7 @@
<!-- 机票服务费 --> <!-- 机票服务费 -->
<el-dialog width="1000px" title="保存" :visible.sync="moneyR" center> <el-dialog width="1000px" title="保存" :visible.sync="moneyR" center>
<el-form :rules="TicketServerules" class="Rform" ref="form" :model="Ticketform" label-width="67px"> <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>团号</th> <th>团号</th>
...@@ -2285,10 +2285,17 @@ ...@@ -2285,10 +2285,17 @@
</tr> </tr>
<tr v-for="(item,index) in MsgRAirServiceList" :key="index"> <tr v-for="(item,index) in MsgRAirServiceList" :key="index">
<td><input style="position: relative;top: 2px;" type="checkbox" :value="item.TCID" v-model="customerList"/>{{item.TCNUM}}({{item.TCID}})</td> <td><input style="position: relative;top: 3px;display: inline-block;width: 15px;height: 15px;" type="checkbox" :value="item.TCID" v-model="customerList"/>
{{item.TCNUM}}({{item.TCID}}){{item.OutBranchName}}
</td>
<td><el-input size="small" style="width:150px" v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input></td> <td><el-input size="small" style="width:150px" v-model="item.TicketNum" @keyup.native="checkInteger(item,'TicketNum')"></el-input></td>
<td><el-input size="mini" style="width:150px" v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input></td> <td><el-input size="mini" style="width:150px" v-model="item.Money" @keyup.native="checkPrice(item,'Money')"></el-input></td>
<td><el-input style="width:150px" v-model="item.Remark"></el-input></td> <td>
<el-input style="width:150px" v-model="item.Remark"></el-input>
<el-select style="width:100px" @change="SelectFinaceId(FinaceIdnum,index)" v-model="FinaceIdnum" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="(item,index) in AirSeritem" :key="index" :label="item.FinaceId" :value="item.FinaceId"></el-option>
</el-select>
</td>
</tr> </tr>
<tr v-if="MsgRAirServiceList.length==0"> <tr v-if="MsgRAirServiceList.length==0">
<td colspan="5">暂无数据</td> <td colspan="5">暂无数据</td>
...@@ -2343,7 +2350,7 @@ ...@@ -2343,7 +2350,7 @@
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="moneyR = false">取 消</el-button> <el-button size="small" @click="moneyR = false,FinaceIdnum=''">取 消</el-button>
<el-button :loading="Btnloading" size="small" type="danger" @click="RSumbit">确 定</el-button> <el-button :loading="Btnloading" size="small" type="danger" @click="RSumbit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -2360,6 +2367,8 @@ ...@@ -2360,6 +2367,8 @@
} }
} }
return { return {
FinaceIdnum:'',
AirSeritem:[],
fklxStr:'虚拟结算', fklxStr:'虚拟结算',
jsbmStr:'总部票务部', jsbmStr:'总部票务部',
currencyTypeList:[], currencyTypeList:[],
...@@ -2381,14 +2390,6 @@ ...@@ -2381,14 +2390,6 @@
PayDate:'', PayDate:'',
CurrencyId:1, CurrencyId:1,
}, },
TicketServerules:{
ImportType: [
{ required: true, message: '请选择导入类型', trigger: 'change' }
],
IsPublic: [
{ required: true, message: '请选择付款类型', trigger: 'change' }
],
},
ticketMsg:{ ticketMsg:{
OldAirId:"", OldAirId:"",
...@@ -2662,7 +2663,38 @@ ...@@ -2662,7 +2663,38 @@
}; };
}, },
methods: { methods: {
SelectFinaceId(val,index){
this.MsgRAirServiceList[index].Remark=`关联单据:${val}`;
},
TikcetServiceCharge(item){ TikcetServiceCharge(item){
this.AirSeritem=[];
if(item.FirstAuditList&&item.FirstAuditList.length>0){
item.FirstAuditList.forEach(fin=>{
this.AirSeritem.push(fin);
})
}
if(item.SecondAuditList && item.SecondAuditList.length>0){
item.SecondAuditList.forEach(fin=>{
this.AirSeritem.push(fin);
})
}
if(item.ThirdAuditList &&item.ThirdAuditList.length>0){
item.ThirdAuditList.forEach(fin=>{
this.AirSeritem.push(fin);
})
}
if(item.FourthAuditList&&item.FourthAuditList.length>0){
item.FourthAuditList.forEach(fin=>{
this.AirSeritem.push(fin);
})
}
if(item.FinalAuditList&&item.FinalAuditList.length>0){
item.FinalAuditList.forEach(fin=>{
this.AirSeritem.push(fin);
})
}
this.moneyR=true; this.moneyR=true;
this.MsgRAirServiceList=[]; this.MsgRAirServiceList=[];
item.PriceList.forEach(price=>{ item.PriceList.forEach(price=>{
...@@ -2675,6 +2707,7 @@ ...@@ -2675,6 +2707,7 @@
TicketNum:price.TicketNum, TicketNum:price.TicketNum,
disabled:price.disabled, disabled:price.disabled,
Remark:"", Remark:"",
OutBranchName:price.OutBranchName,
}; };
this.MsgRAirServiceList.push(obj); this.MsgRAirServiceList.push(obj);
...@@ -2730,6 +2763,7 @@ ...@@ -2730,6 +2763,7 @@
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message) this.Success(res.data.message)
this.initMsg(); this.initMsg();
this.FinaceIdnum='',
this.moneyR=false; this.moneyR=false;
this.getList(); this.getList();
...@@ -2811,70 +2845,7 @@ ...@@ -2811,70 +2845,7 @@
this.$message.success(this.$t('tips.scchenggong')) this.$message.success(this.$t('tips.scchenggong'))
}, 1); }, 1);
}, },
financeinfo_post_GetClientTypeList(){ // 获取对象类型
this.apipost('financeinfo_post_GetClientTypeList',{}, res => {
if(res.data.resultCode == 1) {
this.ClientTypeList = res.data.data;
}
}, err => {})
},
financeinfo_post_GetClientAccountList(t,i){ //获取付款 对象类型 新增用
let msg = {
ID:0,
Type:t,
ObjID:0,
CardNum:''
}
if(i>=0){
msg.ID=i;
}else{
this.msg.ClientID='';
this.msg.AccountNumber='';
this.msg.RemitterName='';
this.msg.IsLeader=1;
}
this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
let ClientAccountList = [];
if(i){
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.AccountHolder + + `（${x.AccountAlias}）`,
Nom:x.CardNum,
OpenBankName:x.OpenBankName,
allName:x.CardNum+" "+x.OpenBankName,
ObjID:x.ObjID,
}
ClientAccountList.push(obj)
})
this.ClientAccountListS = ClientAccountList;
}else{
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.AccountHolder + `（${x.AccountAlias}）`,
Nom:x.CardNum,
OpenBankName:x.OpenBankName,
ObjID:x.ObjID,
}
ClientAccountList.push(obj)
})
this.ClientAccountList = ClientAccountList;
}
}
}, err => {})
},
GetClientAccountList(i){ //获取客户名称并且根据费用类型和付款对象获取客户账号
this.msg.AccountNumber='';
this.ClientAccountList.forEach(x=>{
if(x.ID==i){
this.msg.RemitterName=x.Name;
this.financeinfo_post_GetClientAccountList(this.msg.ClientType,x.ID);
}
})
},
TicketFinalTranfer(){ TicketFinalTranfer(){
if(this.ticketMsg.NewAirId==""){ if(this.ticketMsg.NewAirId==""){
this.Error("请输入新机票编码"); this.Error("请输入新机票编码");
...@@ -3812,7 +3783,6 @@ ...@@ -3812,7 +3783,6 @@
this.GetPlatform(); this.GetPlatform();
this.getDownList(); this.getDownList();
this.getEmployeeList(); this.getEmployeeList();
this.financeinfo_post_GetClientTypeList();
this.getCurrencyType(); this.getCurrencyType();
} }
}; };
......
src/components/activity/AppActivityExclusive.vue
View file @ c54cc4e9
...@@ -51,6 +51,8 @@ ...@@ -51,6 +51,8 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>团号</th> <th>团号</th>
<th>公司</th>
<th>线路</th>
<th>名称</th> <th>名称</th>
<th>状态</th> <th>状态</th>
<th>类型</th> <th>类型</th>
...@@ -65,6 +67,8 @@ ...@@ -65,6 +67,8 @@
</tr> </tr>
<tr v-for="(item,i) in dataList" :key="i"> <tr v-for="(item,i) in dataList" :key="i">
<td>{{item.tcid}}</td> <td>{{item.tcid}}</td>
<td>{{companyListObj[item.branchId]}}</td>
<td>{{LineListObj[item.lineId]}}</td>
<td>{{item.activityName}}</td> <td>{{item.activityName}}</td>
<td> <td>
<span v-if="item.activityStatus==1">正常</span> <span v-if="item.activityStatus==1">正常</span>
...@@ -116,7 +120,7 @@ ...@@ -116,7 +120,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="活动类型" prop="activityType"> <el-form-item label="活动类型" prop="activityType">
<el-select filterable v-model="form.activityType" > <el-select :disabled="edittrue" filterable v-model="form.activityType" >
<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-option label="秒杀" :value='3'></el-option> <el-option label="秒杀" :value='3'></el-option>
...@@ -128,12 +132,13 @@ ...@@ -128,12 +132,13 @@
<el-input class="w220" v-model="form.activityUrl"></el-input> <el-input class="w220" v-model="form.activityUrl"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="公司" prop="branchId"> <el-form-item label="公司" prop="branchId">
<el-select class="multiple_input" filterable v-model="form.branchId"> <el-select :disabled="edittrue" class="multiple_input" filterable v-model="form.branchId">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="线路" prop="lineId"> <el-form-item label="线路" prop="lineId">
<el-select class="multiple_input" filterable v-model="form.lineId"> <el-select :disabled="edittrue" class="multiple_input" filterable v-model="form.lineId">
<el-option label='不限' :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option> <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -161,7 +166,7 @@ ...@@ -161,7 +166,7 @@
<el-input class="w220" @keyup.native="checkInteger(form,'returnIntegral')" v-model="form.returnIntegral"></el-input> <el-input class="w220" @keyup.native="checkInteger(form,'returnIntegral')" v-model="form.returnIntegral"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="团号"> <el-form-item label="团号">
<el-input class="w220" v-model="form.tcid"></el-input> <el-input :disabled="edittrue" class="w220" v-model="form.tcid"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -203,6 +208,7 @@ export default { ...@@ -203,6 +208,7 @@ export default {
} }
} }
return{ return{
edittrue:false,
allzb:100, allzb:100,
total:0, total:0,
obj:{ obj:{
...@@ -263,7 +269,9 @@ export default { ...@@ -263,7 +269,9 @@ export default {
let startTime = new Date(this.form.startDate) let startTime = new Date(this.form.startDate)
return startTime.getTime() >= time.getTime() return startTime.getTime() >= time.getTime()
} }
} },
LineListObj:{},
companyListObj:{},
} }
}, },
created(){ created(){
...@@ -294,6 +302,9 @@ export default { ...@@ -294,6 +302,9 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.companyList = res.data.data; this.companyList = res.data.data;
this.companyList.map(item=>{
this.companyListObj[item.Id]=item.BName;
})
} else { } else {
} }
}, },
...@@ -321,10 +332,15 @@ export default { ...@@ -321,10 +332,15 @@ export default {
}, },
addRule(){ addRule(){
this.ruleVisible=true; this.ruleVisible=true;
this.edittrue=false;
this.InitForm();
}, },
SetRules(item){ SetRules(item){
this.ruleVisible=true; this.ruleVisible=true;
this.edittrue=true;
this.form=Object.assign({},item); this.form=Object.assign({},item);
this.form.endDate=moment(item.endDate).format("YYYY-MM-DD") this.form.endDate=moment(item.endDate).format("YYYY-MM-DD")
this.form.startDate=moment(item.startDate).format("YYYY-MM-DD") this.form.startDate=moment(item.startDate).format("YYYY-MM-DD")
...@@ -341,24 +357,7 @@ export default { ...@@ -341,24 +357,7 @@ export default {
this.Success(res.data.message) this.Success(res.data.message)
this.getList(); this.getList();
this.ruleVisible=false; this.ruleVisible=false;
this.form={ this.InitForm();
activityName:"",
activityStatus:1,
activityType:"",
activityUrl:'',
branchId:'',
description:'',
discounts:'',
startDate:'',
endDate:'',
groupId:'',
id:'',
lineId:'',
meet:'',
remark:'',
returnIntegral:'',
tcid:'',
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -374,6 +373,26 @@ export default { ...@@ -374,6 +373,26 @@ export default {
}); });
}, },
InitForm(){
this.form={
activityName:"",
activityStatus:1,
activityType:"",
activityUrl:'',
branchId:'',
description:'',
discounts:'',
startDate:'',
endDate:'',
groupId:'',
id:'',
lineId:'',
meet:'',
remark:'',
returnIntegral:'',
tcid:0,
}
},
getEmployeeList () { getEmployeeList () {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
let msg = { let msg = {
...@@ -399,6 +418,9 @@ export default { ...@@ -399,6 +418,9 @@ export default {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => { this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
this.LineList.map(item=>{
this.LineListObj[item.LineID]=item.LineName;
})
} }
}); });
}, },
......
src/components/confirmationOrderDownLoad.vue
View file @ c54cc4e9
...@@ -833,10 +833,10 @@ ...@@ -833,10 +833,10 @@
let UploadUrl = this.domainManager().UploadUrl let UploadUrl = this.domainManager().UploadUrl
let _this = this let _this = this
if (this.showType >= 4) { // 判断是否为行程特色 if (this.showType >= 4) { // 判断是否为行程特色
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + _this.ToWord_V2(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
'日游', isPc) '日游', isPc)
} else { } else {
this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc) this.ToWord_V2(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
} }
}, },
//保存基础数据 //保存基础数据
...@@ -1140,6 +1140,74 @@ ...@@ -1140,6 +1140,74 @@
}); });
}, },
ToWord_V2: function (title, isPc) {
let msg = {
configId: this.$route.query.configId,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId,
FileName: title,
//是否显示基础信息
isShowBase: this.vshowA ? 1 : 0,
//是否显示航班
isShowFlight: this.vshowB ? 1 : 0,
//是否显示行程特色
isShowFeature: this.vshowC ? 1 : 0,
//自费、费用包含、费用不含
isShowFee: this.vshowE ? 1 : 0,
//购物说明，购物安排
isShowShop: this.vshowF ? 1 : 0,
//重要提示、温馨提示 [订单须知]
isShowTip: this.vshowG ? 1 : 0,
//是否显示同行备注
isShowB2B: this.vshowI ? 1 : 0,
//是否显示行程
isShowTrip: this.vshowD ? 1 : 0,
//是否显示标题
isShowTitle: this.vshowL ? 1 : 0,
//是否显示旅客名单
isShowGuest: this.vshowM ? 1 : 0,
//是否显示紧急联系人
isShowMan: this.vshowLLR ? 1 : 0,
//是否显示团号
isShowTCNUM: this.vshowTCNUM ? 1 : 0,
//是否显示行程图片
isShowTripImage: this.vshowK ? 1 : 0,
//是否显示签证信息
isShowVisa: this.vshowH ? 1 : 0,
//isPc是否PC下载
isPc: isPc,
//模板参数
templateId: this.showType,
//用户Id
UId:this.getLocalStorage().EmployeeId
};
let urlObj = this.domainManager();
this.$http({
headers: {
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/GetToWord_V2',
data: {
"msg": msg
}
}).then(res => {
if (res.data.resultCode === 1) {
let sign = title+"V2"
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
'.doc&&fPath=' + res.data.data);
a.click();
} else {
this.Error('WORD获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
},
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式 DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-") aDate = sDate1.split("-")
......
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