Skip to content

S
SuperMan
Commit 9c0bea6b authored by youjie's avatar youjie
Browse files
Options

no message

parents 16c8a867 dbee8aa0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 542 additions and 266 deletions
src/assets/common/lang/zh-tw.js
View file @ 9c0bea6b
...@@ -977,7 +977,7 @@ export const fnc = { ...@@ -977,7 +977,7 @@ export const fnc = {
sprleibie: '審批人類別', sprleibie: '審批人類別',
jdmiaoshu: '節點描述', jdmiaoshu: '節點描述',
jddongzuo: '節點動作', jddongzuo: '節點動作',
zhuguan: '首長', zhuguan: '主管',
zdchengyuan: '指定成員', zdchengyuan: '指定成員',
tsjiedian: '特殊節點', tsjiedian: '特殊節點',
fqrende: '發起人的', fqrende: '發起人的',
...@@ -1357,12 +1357,12 @@ export const tips = { ...@@ -1357,12 +1357,12 @@ export const tips = {
czchenggong: '操作成功！', czchenggong: '操作成功！',
rsbncgtr: '人數不能超過10人', rsbncgtr: '人數不能超過10人',
qtxjdmiaoshu: '請填寫節點描述！', qtxjdmiaoshu: '請填寫節點描述！',
qxzbmzgjibie: '請選擇部門首長級別！', qxzbmzgjibie: '請選擇部門主管級別！',
cybnweikong: '成員不能為空', cybnweikong: '成員不能為空',
qxzgangwei: '請選擇崗位', qxzgangwei: '請選擇崗位',
qxzbumen: '請選擇部門！', qxzbumen: '請選擇部門！',
di: '第', di: '第',
jizhuguan: '級首長', jizhuguan: '級主管',
xzqyshijian: '選擇啟用時間', xzqyshijian: '選擇啟用時間',
cicaozuoyongjiushanchu: '此操作將永久删除該提成規則,是否繼續？', cicaozuoyongjiushanchu: '此操作將永久删除該提成規則,是否繼續？',
shanchutishi: '删除提示', shanchutishi: '删除提示',
...@@ -2679,7 +2679,7 @@ export const op={ ...@@ -2679,7 +2679,7 @@ export const op={
btsy:'本團使用', btsy:'本團使用',
kcqk:'庫存情况', kcqk:'庫存情况',
syr:'所有人', syr:'所有人',
bmzg:'部門首長', bmzg:'部門主管',
fgszjl:'分公司總經理', fgszjl:'分公司總經理',
opszje:'OP設定金額', opszje:'OP設定金額',
fgszjdb:'新增日本印象', fgszjdb:'新增日本印象',
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 9c0bea6b
...@@ -802,14 +802,19 @@ ...@@ -802,14 +802,19 @@
<button class="hollowFixedBtn" v-if="BOSSBtn3" @click="BOSSBtnClick(3)">{{$t('ground.dayin')}}</button> <button class="hollowFixedBtn" v-if="BOSSBtn3" @click="BOSSBtnClick(3)">{{$t('ground.dayin')}}</button>
</template> </template>
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604"> <template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604 || ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown width:100px> <el-dropdown width:100px>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
更多<i class="el-icon-arrow-down el-icon--right"></i> 更多<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604">
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item> <el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item> <el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
</template>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
</template>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
...@@ -1957,6 +1962,60 @@ ...@@ -1957,6 +1962,60 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="机票今日付款查询" width="1260px" height="900px" :visible.sync="airPayState" :close-on-click-modal="false" center>
<el-form class="cdForm" label-width="80px">
<el-form-item label="付款日期" prop="picPayDate">
<el-date-picker class="h34" v-model="picPayDate" type="daterange"
value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
<el-form-item>
<input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="getAirPayList()">
<input type="button" :value="$t('visa.v_daochu')" class="hollowFixedBtn" @click="downloadAirPayData()">
</el-form-item>
</el-form>
<div style="height:500px">
<p>待付合计：{{waitAirTotal}}</p>
<p>已付合计：{{payAirTotal}}</p>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="MarkLoading" >
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('sm.company')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>付款批次</th>
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('fnc.fkduixiang')}}</th>
<th>备注</th>
<th>{{$t('fnc.zhidanren')}}</th>
<th>{{$t('fnc.a_djztai')}}</th>
<th>是否付款</th>
<th>付款日期</th>
<th>会计</th>
</tr>
<tr v-for="(item,index) in picPayData" :key="index">
<td><span @click="goUrlFDetail(item.FrID)" style="cursor: pointer; color:blur">{{item.FrID}}</span></td>
<td>{{item.RB_BranchName}}</td>
<td>{{item.CostTypeIdStr}}</td>
<td>{{item.TicketNum}}</td>
<td>{{item.WBMoney+" " + item.CurrencyName}}</td>
<td style="max-width: 120px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.RemitterName}}</td>
<td style="max-width: 170px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.AuditDescription}}</td>
<td>{{item.CreateBy}}{{item.CreateDate}}</td>
<td>{{item.StatusName}}</td>
<td :style="item.Is_Cashier==1?'color:red':''">{{(item.Is_Cashier==1?'√':'')}}</td>
<td>{{item.PayDate}}</td>
<td>{{item.FinanceName}}</td>
</tr>
<tr v-if="picPayTotal">
<td colspan='4'>{{$t('fnc.a_heji')}}</td>
<td>{{picPayTotal}}</td>
</tr>
<tr v-if="picPayData.length==0">
<td colspan="13">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div>
</el-dialog>
<!-- 修改汇率 <!-- 修改汇率
<el-dialog :title="$t('objFill.modifytheexchangerate')" width="400px" <el-dialog :title="$t('objFill.modifytheexchangerate')" width="400px"
:visible.sync="costmodeHL" center > :visible.sync="costmodeHL" center >
...@@ -2242,6 +2301,7 @@ ...@@ -2242,6 +2301,7 @@
imgLength: 0, imgLength: 0,
//工资单附件结束 //工资单附件结束
picPayState: false, picPayState: false,
airPayState: false,
picPayDate:[], picPayDate:[],
picMsg:{ picMsg:{
pageIndex: 1, pageIndex: 1,
...@@ -2252,7 +2312,9 @@ ...@@ -2252,7 +2312,9 @@
EmployeeId:0 EmployeeId:0
}, },
picPayData:[], picPayData:[],
picPayTotal:0 picPayTotal:0,
payAirTotal:0,
waitAirTotal:0
}; };
}, },
created() { created() {
...@@ -2832,6 +2894,31 @@ ...@@ -2832,6 +2894,31 @@
null null
); );
}, },
openAirPayDialog(){
this.airPayState = true;
this.picPayData = [];
this.picMsg.QEndDate= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
this.picMsg.QStartDate =this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
this.picPayDate = [this.picMsg.QStartDate,this.picMsg.QEndDate];
this.getAirPayList();
},
getAirPayList() {
this.picMsg.QEndDate= this.picPayDate[1];
this.picMsg.QStartDate =this.picPayDate[0];
this.MarkLoading = true
this.apipost(
"Financial_post_GetAirTicketPayDatePageList", this.picMsg,res => {
this.MarkLoading = false
if (res.data.resultCode === 1) {
this.picPayData = res.data.data.list.pageData;
this.picPayTotal = res.data.data.TotalMoney;
this.payAirTotal = res.data.data.PayMoney;
this.waitAirTotal = res.data.data.WaitMoney;
}
},
null
);
},
goUrlZD(item) { goUrlZD(item) {
let that = this; let that = this;
let yfcheckList let yfcheckList
...@@ -3001,6 +3088,12 @@ ...@@ -3001,6 +3088,12 @@
this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
this.GetLocalFile("Financial_post_GetPICPayDateListToExcel", this.picMsg, "今日付款" +this.picMsg.QEndDate+".xls"); this.GetLocalFile("Financial_post_GetPICPayDateListToExcel", this.picMsg, "今日付款" +this.picMsg.QEndDate+".xls");
}, },
downloadAirPayData() {
this.picMsg.QEndDate= this.picPayDate[1];
this.picMsg.QStartDate =this.picPayDate[0];
this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
this.GetLocalFile("Financial_post_GetAirTicketPayDateListToExcel", this.picMsg, "机票今日付款" +this.picMsg.QEndDate+".xls");
},
HebingSPLast() { HebingSPLast() {
if (this.checkList.length == 0) { if (this.checkList.length == 0) {
this.Error(this.$t('fnc.a_qxzdanju')); this.Error(this.$t('fnc.a_qxzdanju'));
...@@ -4054,6 +4147,10 @@ ...@@ -4054,6 +4147,10 @@
} }
}); });
}, },
goUrlFDetail(id){
let url = this.domainManager().erpSiteUrl+"FinancialDocumentsDetail?id="+id+"&Conditon=3&pageIndex=1&tab=单据详情";
window.open(url);
},
goUrlAdd(path) { goUrlAdd(path) {
this.$router.push({ this.$router.push({
name: path, name: path,
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 9c0bea6b
...@@ -628,7 +628,8 @@ ...@@ -628,7 +628,8 @@
<div class="recpayQueryMore" v-if="(scope.row.Type==1||scope.row.Type==2)&& IsUpdatePayment" @click="showHelpBranch(scope.row)">{{scope.row.Type==1?$t('objFill.xiugaibdsgs'):(scope.row.Type==2?$t('objFill.xiugaibdfgs'):'')}}</div> <div class="recpayQueryMore" v-if="(scope.row.Type==1||scope.row.Type==2)&& IsUpdatePayment" @click="showHelpBranch(scope.row)">{{scope.row.Type==1?$t('objFill.xiugaibdsgs'):(scope.row.Type==2?$t('objFill.xiugaibdfgs'):'')}}</div>
<div class="recpayQueryMore" v-if="scope.row.Type==2 && scope.row.CostTypeList && scope.row.CostTypeList[0]=='固定资产-车辆'" @click="showAssets(scope.row.FrID)">{{$t('objFill.v101.FinancialModule.shezzjrq')}}</div> <div class="recpayQueryMore" v-if="scope.row.Type==2 && scope.row.CostTypeList && scope.row.CostTypeList[0]=='固定资产-车辆'" @click="showAssets(scope.row.FrID)">{{$t('objFill.v101.FinancialModule.shezzjrq')}}</div>
<div class="recpayQueryMore" v-if="scope.row.KingdeeMark!=1&&IsUpdatePayment" @click="EditKingdeeMark(scope.row)">标记金蝶已导入</div> <div class="recpayQueryMore" v-if="scope.row.KingdeeMark!=1&&IsUpdatePayment" @click="EditKingdeeMark(scope.row)">标记金蝶已导入</div>
<div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div> <div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId!=2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div>
<div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId==2" @click="showAirPayDateDialog(scope.row)">修改机票付款日</div>
<i slot="reference" style="width: 30px; <i slot="reference" style="width: 30px;
height: 30px; height: 30px;
display: inline-block; display: inline-block;
...@@ -953,6 +954,23 @@ ...@@ -953,6 +954,23 @@
<el-button class="normalBtn" type="primary" @click="setPICPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button> <el-button class="normalBtn" type="primary" @click="setPICPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--修改机票付款日-->
<el-dialog title="修改机票预付款日期" width="400px" :visible.sync="showAirPayDate" center >
<el-form class="cdForm" label-width="110px">
<el-form-item label="预付款日" prop="CreateDate">
<el-date-picker
v-model="FixedAssetsMsg.CreateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="showAirPayDate=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="setAirPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -1134,6 +1152,7 @@ ...@@ -1134,6 +1152,7 @@
ShowFixedAssets: false, ShowFixedAssets: false,
showUpdateCreate:false, showUpdateCreate:false,
showPICPayDate:false, showPICPayDate:false,
showAirPayDate:false,
FixedAssetsMsg:{ FixedAssetsMsg:{
BaseFinanceId:0, BaseFinanceId:0,
RelevanceFrId2:0, RelevanceFrId2:0,
...@@ -1471,6 +1490,11 @@ ...@@ -1471,6 +1490,11 @@
this.FixedAssetsMsg.CreateDate= item.PICPayDate; this.FixedAssetsMsg.CreateDate= item.PICPayDate;
this.showPICPayDate=true; this.showPICPayDate=true;
}, },
showAirPayDateDialog(item){
this.FixedAssetsMsg.BaseFinanceId = item.FrID;
this.FixedAssetsMsg.CreateDate= item.PICPayDate;
this.showAirPayDate=true;
},
// 确定垫付对象 // 确定垫付对象
setFixedAssets() { setFixedAssets() {
if (this.transTax.loading) return; if (this.transTax.loading) return;
...@@ -1538,6 +1562,30 @@ ...@@ -1538,6 +1562,30 @@
this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ; this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
} }
}, },
setAirPayDate(){
if (this.transTax.loading) return;
this.transTax.loading = true;
if (this.FixedAssetsMsg.BaseFinanceId && this.FixedAssetsMsg.CreateDate) {
this.apipost(
"Financial_post_SetPICPayDate", {BaseFinanceId:this.FixedAssetsMsg.BaseFinanceId,CreateDate:this.FixedAssetsMsg.CreateDate,Type:23},res => {
if (res.data.resultCode == 1) {
this.Success(this.$t('objFill.v101.FinancialModule.gengxincg')) ;
this.showAirPayDate = false;
this.getPageList()
}else{
this.Error(res.data.message);
}
this.transTax.loading = false;
},
err => {
this.transTax.loading = false;
}
);
} else {
this.transTax.loading = false;
this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
}
},
showHelpBranch(item) { showHelpBranch(item) {
//弹出付款对象修改 //弹出付款对象修改
this.HelpBranchMsg.FrId = item.FrID; this.HelpBranchMsg.FrId = item.FrID;
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 9c0bea6b
...@@ -3535,7 +3535,9 @@ export default { ...@@ -3535,7 +3535,9 @@ export default {
let BranchStatus=res.data.data.IsBranchButton; let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-2){ if(BranchStatus==-2){
BranchStatus = -1; BranchStatus = -1;
if(this.userId!=380){
this.shujuType = true; this.shujuType = true;
}
this.apipost("line_post_GetList", {}, res => { this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
......
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 9c0bea6b
...@@ -250,6 +250,28 @@ ...@@ -250,6 +250,28 @@
</div> </div>
</div> </div>
</div> </div>
<div class="OrderReceivablesAccount-center" v-if="GetDetail.TemplateId==2&&IsAdminOrFinance">
<div class="border-b">
</div>
<div v-if="IsEditAirPayDate==false">
<el-tooltip class="item" effect="dark" content="用于机票每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
{{picMsg.CreateDate}}
<el-tooltip effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i class="edit el-icon-edit" @click="IsEditAirPayDate=true"></i>
</el-tooltip>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-tooltip effect="dark" content="删除" placement="top">
<i v-if="picMsg.CreateDate!=null && picMsg.CreateDate!=''" class="edit el-icon-delete" @click="DelAirPayDate()"></i>
</el-tooltip>
</div>
<div v-else>
<el-tooltip class="item" effect="dark" content="用于PIC每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
<div>
<el-date-picker v-model="picMsg.CreateDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-check" circle @click="SaveAirPayDate()"></el-button>
</div>
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0"> <div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0">
<div v-if="clientBankAccountData.AccountCreateTime" class="border-b"> <div v-if="clientBankAccountData.AccountCreateTime" class="border-b">
</div> </div>
...@@ -429,6 +451,7 @@ ...@@ -429,6 +451,7 @@
return { return {
IsEditTravelRemark:false, IsEditTravelRemark:false,
IsEditPICPayDate:false, IsEditPICPayDate:false,
IsEditAirPayDate:false,
// clientBankAccountData: {}, // clientBankAccountData: {},
tableData: [], tableData: [],
msg:{ msg:{
...@@ -445,6 +468,7 @@ ...@@ -445,6 +468,7 @@
activeIndx: null, activeIndx: null,
FDList: [], FDList: [],
IsExpensesMonthlyShare:false, IsExpensesMonthlyShare:false,
IsAdminOrFinance:false,
saveMsg: { saveMsg: {
FrId: 0, FrId: 0,
Remark: '', Remark: '',
...@@ -493,6 +517,9 @@ ...@@ -493,6 +517,9 @@
if (ActionMenuCode.indexOf('Finance_Inner') != -1) { if (ActionMenuCode.indexOf('Finance_Inner') != -1) {
this.isFinance_ExpenseType=true; this.isFinance_ExpenseType=true;
} }
if(ActionMenuCode.indexOf('isManageFinance') != -1 || ActionMenuCode.indexOf('Finance_ExpenseType') != -1){
this.IsAdminOrFinance=true;
}
this.picMsg.BaseFinanceId = this.GetDetail.FrID this.picMsg.BaseFinanceId = this.GetDetail.FrID
this.picMsg.CreateDate = this.GetDetail.PICPayDate this.picMsg.CreateDate = this.GetDetail.PICPayDate
...@@ -713,6 +740,37 @@ ...@@ -713,6 +740,37 @@
}, err => {}) }, err => {})
}).catch(() => { }).catch(() => {
});
},
SaveAirPayDate(){
this.picMsg.Type=23;
this.apipost('Financial_post_SetPICPayDate', this.picMsg, res => {
if (res.data.resultCode == 1) {
this.IsEditAirPayDate=false;
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
DelAirPayDate(){
this.$confirm("确认要删除机票付款日期吗？", this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.yes'),
cancelButtonText: this.$t('pub.no'),
type: 'warning'
}).then(() => {
this.picMsg.Type=23;
this.apipost('Financial_post_CancelPICPayDate', this.picMsg, res => {
if (res.data.resultCode == 1) {
this.picMsg.CreateDate ='';
this.IsEditAirPayDate=false;
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
}); });
} }
}, },
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 9c0bea6b
...@@ -552,10 +552,11 @@ ...@@ -552,10 +552,11 @@
} }
this.queryCommonData.loading = true; this.queryCommonData.loading = true;
this.queryMsg.uid = this.getLocalStorage().EmployeeId; this.queryMsg.uid = this.getLocalStorage().EmployeeId;
var fileName="简易计划表.xls";
this.GetLocalFile( this.GetLocalFile(
"travel_get_DownTravelPriceOrderStatistics", "travel_get_DownTravelPriceOrderStatistics",
this.queryMsg, this.queryMsg,
this.$t('objFill.v101.Rest.baomintj') + ".xls", fileName,
res => { res => {
if (this.queryMsg.TicketStartNum == 0) { if (this.queryMsg.TicketStartNum == 0) {
this.queryMsg.TicketStartNum = ""; this.queryMsg.TicketStartNum = "";
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ 9c0bea6b
...@@ -464,10 +464,11 @@ ...@@ -464,10 +464,11 @@
DownLoadFile() { DownLoadFile() {
this.Info(this.$t('objFill.v101.Rest.zhengzaixzwj')) this.Info(this.$t('objFill.v101.Rest.zhengzaixzwj'))
this.queryMsg.uid = this.getLocalStorage().EmployeeId; this.queryMsg.uid = this.getLocalStorage().EmployeeId;
var fileName = "简易计划表.xls";
this.GetLocalFile( this.GetLocalFile(
"travel_get_DownTravelPriceOrderStatistics", "travel_get_DownTravelPriceOrderStatistics",
this.queryMsg, this.queryMsg,
this.$t('objFill.v101.Rest.baomintj') + ".xls" fileName
); );
}, },
goUrl(path, id, title) { goUrl(path, id, title) {
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 9c0bea6b
...@@ -234,8 +234,8 @@ ...@@ -234,8 +234,8 @@
//线路筛选 //线路筛选
getLineList() { getLineList() {
var chooseLineList = []; var chooseLineList = [];
//散拼 //散拼、PAK、切位
if (this.postData.TeamType == 0 || this.postData.TeamType == 5) { if (this.postData.TeamType == 0 || this.postData.TeamType == 4 || this.postData.TeamType == 5) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2); chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
} //小包团 } //小包团
else if (this.postData.TeamType == 1) { else if (this.postData.TeamType == 1) {
...@@ -452,9 +452,6 @@ ...@@ -452,9 +452,6 @@
this.postData.LineId = 0; this.postData.LineId = 0;
this.postData.LineteamId = 0; this.postData.LineteamId = 0;
this.postData.PriceTeamType = ''; this.postData.PriceTeamType = '';
if (this.postData.TeamType == 0) {
this.postData.PriceTeamType = 1;
}
}, },
//获取所有币种 //获取所有币种
getAllCurrency() { getAllCurrency() {
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 9c0bea6b
...@@ -159,12 +159,6 @@ ...@@ -159,12 +159,6 @@
<div class="p20"> <div class="p20">
<div class="mb title"><i <div class="mb title"><i
class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span></div> class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span></div>
<!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div>
</div> -->
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
...@@ -238,8 +232,6 @@ ...@@ -238,8 +232,6 @@
<font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font> <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
</span> </span>
</div> </div>
<div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span> <div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
{{item.OrderGuestNum}} </span></div> {{item.OrderGuestNum}} </span></div>
<div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span> <div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
...@@ -301,12 +293,6 @@ ...@@ -301,12 +293,6 @@
</div> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('Operation.Op_PriceInfo')}}</span></div>
<div class="mb"><span>{{$t('objFill.v101.zhongxinjia')}}: {{item.MiddlePrice}}</span></div>
<div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
<div> <div>
<p> <p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }} <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
...@@ -502,28 +488,22 @@ ...@@ -502,28 +488,22 @@
}}</span> }}</span>
</el-popover> </el-popover>
</p> </p>
<p v-if="item.OfferId && item.OfferId > 0" style="margin-top: 5px; font-size: 13px">
<span style="cursor: pointer; text-decoration: underline; color: blue"
@click="showDialog(item.ConfigID, item.OfferId)">{{ $t("objFill.baojiaxiangqing") }}</span>
</p>
<p v-if="item.OfferId == 0" style="margin-top: 5px; font-size: 13px">
<span style="cursor: pointer; text-decoration: underline; color: red"
@click="NewCopyPriceSheet(item, 0)">{{ $t("objFill.xingzbjd") }}</span>
</p>
<p style="margin-top: 5px; font-size: 13px;color:red;"
v-if=" item.OfferId > 0 &&item.OfferStatusName">
{{ item.OfferStatusName }}
</p>
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="el-col w_20">
<div class="p20">
<div class="mb title"><i
class="iconfont icon-tuandui"></i><span>{{$t('objFill.v101.hezuohuoban')}}:</span></div>
<template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<span :key="subIndex+10000">
<span v-if="subItem.SaleInfoList && subItem.SaleInfoList.length">
<el-popover trigger="hover"
:content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''">
<el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
{{subItem.CustomerName}}</el-tag>
</el-popover>
</span>
<el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">
{{subItem.CustomerName}}</el-tag>
</span>
</template>
</div>
</div> -->
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<div class="mb title"><i <div class="mb title"><i
...@@ -536,7 +516,11 @@ ...@@ -536,7 +516,11 @@
<div class="el-col w_8"> <div class="el-col w_8">
<div class="p20"> <div class="p20">
<el-button class="mb" @click.native='editTeam(item)' type="primary" size="small" <el-button class="mb" @click.native='editTeam(item)' type="primary" size="small"
style="background:#00C6FF; border-color:#00C6FF;width:80px;">{{$t('pub.updateMsg')}} style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t('pub.updateMsg')}}
</el-button>
<br />
<el-button class="mb" @click.native='goTonowTeam(item)' type="primary" size="small"
style="background:#00C6FF; border-color:#00C6FF;width:95px;">{{$t("objFill.dangtuanxbm") }}
</el-button> </el-button>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link" type="primary">{{$t('pub.more')}} <span class="el-dropdown-link" type="primary">{{$t('pub.more')}}
...@@ -575,10 +559,16 @@ ...@@ -575,10 +559,16 @@
:close-on-click-modal="false"> :close-on-click-modal="false">
<editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo> <editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
</el-dialog> </el-dialog>
<div v-if="dialog.show">
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
</div>
</div> </div>
</template> </template>
<script> <script>
import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团 import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
import priceDialog from "../TravelNewQuotation/priceDialog.vue";
export default { export default {
provide() { provide() {
return { return {
...@@ -586,7 +576,8 @@ ...@@ -586,7 +576,8 @@
} }
}, },
components: { components: {
editTeamInfo editTeamInfo,
priceDialog
}, },
data() { data() {
return { return {
...@@ -636,6 +627,11 @@ ...@@ -636,6 +627,11 @@
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
}, },
dialog: {
show: false,
ConfigId: "",
OfferId: "",
},
}; };
}, },
//监听器 //监听器
...@@ -664,6 +660,53 @@ ...@@ -664,6 +660,53 @@
}, },
methods: { methods: {
//复制、新增报价单
NewCopyPriceSheet(item, type) {
this.gotoOffer(item, 1);
},
//跳转到报价单
gotoOffer(item) {
let query = {
TCID: item.TCID,
blank: "y",
tab: "报价单",
};
this.$router.push({
path: "QuotationNewPrice",
query,
});
},
showDialog(ConfigId, OfferId) {
this.dialog = {
show: true,
ConfigId,
OfferId,
};
this.$nextTick(() => {
this.$refs.dialog.getPostData();
});
},
//当团修改
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ConfigID,
offerId: item.OfferId,
openState: 1,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
that.gotoUrl(path, ttMsg);
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
priceFormat2(value) { priceFormat2(value) {
if (value == null) { if (value == null) {
return this.$t('objFill.yibaohan'); return this.$t('objFill.yibaohan');
......
src/components/index.vue
View file @ 9c0bea6b
...@@ -2266,9 +2266,9 @@ ...@@ -2266,9 +2266,9 @@
testApi() { testApi() {
var postMsg = {}; var postMsg = {};
var cmd = ""; var cmd = "";
cmd = "dmc_post_GetDidaHotelInfo"; cmd = "";
postMsg = { postMsg = {
hotelId:"1080427" hotelId:""
} }
if (cmd != '') { if (cmd != '') {
this.apipost( this.apipost(
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 9c0bea6b
...@@ -590,14 +590,24 @@ ...@@ -590,14 +590,24 @@
//提交按钮和另存模板跳转团控列表 //提交按钮和另存模板跳转团控列表
else if (SaveType == 2 || SaveType == 3) { else if (SaveType == 2 || SaveType == 3) {
let path = "TravelControlList"; let path = "TravelControlList";
//OP开团和地接开团 //小包团
if (TeamType == 3) { if (TeamType == 1) {
path = "TravelControlList2";
} else if (TeamType == 1) {
path = "TravelControlListSale"; path = "TravelControlListSale";
} else if (TeamType == 2) { }
//当地游
else if (TeamType == 2) {
path = "oneDayTrip"; path = "oneDayTrip";
} else { }
//地接团
else if (TeamType == 3) {
path = "TravelControlList2";
}
//PAK团
else if (TeamType == 4) {
path = 'TravelTeam'
}
//常规散拼
else {
path = "TravelControlList"; path = "TravelControlList";
} }
this.$router.push({ this.$router.push({
......
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