Skip to content

C
confucius
Commit 58bb17d3 authored by Mac's avatar Mac
Browse files
Options

1

parent 26c187f3
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
src/App.vue
View file @ 58bb17d3
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_1d3rshddcgk.css');
@import url('//at.alicdn.com/t/font_2077629_il9ypki1in.css');
html,
body,
......
src/pages/financial/accDetail/CashAccDetail.vue
View file @ 58bb17d3
......@@ -121,7 +121,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-form-item label="所属校区">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
......@@ -923,7 +923,7 @@
}
},err=>{})
},
getCompanyList(){ //获取公司列表
getCompanyList(){ //获取校区列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
......
src/pages/financial/accDetail/CashReport.vue
View file @ 58bb17d3
......@@ -70,7 +70,7 @@
<th colspan="14">四川和平国际旅行社有限公司资金日报表</th>
</tr>
<tr>
<th>公司</th>
<th>校区</th>
<th>银行</th>
<th colspan="2">上期余额</th>
<th colspan="2">本期借方发生额</th>
......
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 58bb17d3
......@@ -154,7 +154,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-form-item label="所属校区">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
......@@ -1055,7 +1055,7 @@
}
},err=>{})
},
getCompanyList(){ //获取公司列表
getCompanyList(){ //获取校区列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
......
src/pages/financial/accDetail/PlatformAccDetail.vue
View file @ 58bb17d3
......@@ -115,7 +115,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-form-item label="所属校区">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
......@@ -944,7 +944,7 @@
}
},err=>{})
},
getCompanyList(){ //获取公司列表
getCompanyList(){ //获取校区列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
......
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @ 58bb17d3
......@@ -123,7 +123,7 @@
if(this.active==1){
// 手配费 收款单参数Handmsg
if(this.$route.query.Handmsg){
let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
// this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
this.$router.push({
path: tempStr
......@@ -132,14 +132,14 @@
// 财务收据
else if(this.$route.query.czmsg){
let Handmsg=this.$route.query.czmsg;
let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/addReceivablesDocuments' + '?Handmsg=' + this.Handmsg + '&tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
// this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
this.$router.push({
path: tempStr
});
}
else{
let tempStr = '/financial/financalDocument/addReceivablesDocuments'+ '?tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/addReceivablesDocuments'+ '?tradeWay=' +this.tradeWay +'&platformAccount='+this.platformAccount+'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
this.$router.push({
path: tempStr
});
......@@ -149,26 +149,26 @@
// 付款单参数czmsg
// 领队报账 预付款冲抵 返款制单
if(this.$route.query.czmsg){
let tempStr = '/financial/financalDocument/' + path + '?czmsg=' +this.czmsg +'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/' + path + '?czmsg=' +this.czmsg +'&id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
this.$router.push({
path: tempStr
});
// this.$router.push({ name: path,query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else{
let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
this.$router.push({
path: tempStr
});
// this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}
}else if(this.active==4){
let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+2+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/' + path + '?id='+id+'&Name='+Name+'&Type='+2+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
this.$router.push({
path: tempStr
});
// this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else {
let tempStr = '/financial/financalDocument/addFinancialGZDocuments' + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
let tempStr = '/financial/financalDocument/addFinancialGZDocuments' + '?id='+id+'&Name='+Name+'&Type='+Type+"&orderObj="+this.orderObj+'&path='+this.$route.query.path+'&IsUploadPic='+IsUploadPic+'&Cmd='+this.$route.query.Cmd+'&companyID='+this.$route.query.companyID;
this.$router.push({
path: tempStr
});
......@@ -204,13 +204,13 @@
this.noData = false;
}
let newList = [];
if (this.templateID) {
if (this.templateID) {
this.templateID.forEach(x=>{
this.GetList.forEach(y=>{
if(x == y.Id) {
if(x == y.Id) {
y.showYes = true
newList.push(JSON.parse(JSON.stringify(y)))
} else {
} else {
y.showYes = false
}
})
......@@ -221,11 +221,11 @@
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
let data = res.data.data;
if(data){
data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
// 如果不是吴珊，只显示49
// 如果不是吴珊，只显示49
// 如果没有 OrderSource 则49和50都不显示
if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
if (x.Id === 49 || x.Id === 50){
......@@ -243,7 +243,7 @@
} else {
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程， 流程名字叫做 公司佣金收款
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33 || x.Id === 48) {
if (x.Id === 33) {
if (this.DepartID === 242 || this.DepartID === 240) {
x.bigShow = true
......@@ -270,7 +270,7 @@
}else if (x.Type==8){
this.ZRList.push(x);
}
});
}
this.GetList = this.collectList;
......@@ -298,7 +298,7 @@
this.searchVal = this.$route.query.searchTitle?this.$route.query.searchTitle:'';
// searchVal
if(this.$route.query.visaType){
this.visaShowTab=true;
}
......@@ -312,12 +312,13 @@
else if(this.showTab==4){
this.GetList = this.ZRList;
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
console.log(this.orderObj ,'this.orderObj ')
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
this.Financial_post_GetList();
},components: {
"my-FlowChartModule": myFlowChartModule
......
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 58bb17d3
......@@ -597,10 +597,10 @@
<button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
<button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>
<!-- <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>-->
<!-- <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>-->
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
v-if="msg.Conditon === 3 ">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
@click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false"
......@@ -1026,7 +1026,7 @@
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
</el-tooltip>
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item"
<el-tooltip class="item"
:content="$t('fnc.tzjyriqi')" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng"
@click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i>
......@@ -1457,14 +1457,13 @@
this.GetAuth();
this.getCostTypeList();
let userInfo = this.getLocalStorage();
this.yfOutBranchId = userInfo.RB_Branch_id;
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo
.RB_Group_id; //集团ID
this.yfOutBranchId = userInfo.School_Id;
// let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
// this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.GroupName; //集团ID
this.ActionMenuCode = userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.DepartIDs = userInfo.DeptId;
this.userId = userInfo.Id;
this.getMyRejectFinanceCount();
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ 58bb17d3
......@@ -766,7 +766,7 @@
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<i v-if="rowData.isExchange" style="width: 30px;
<i v-if="rowData.isExchange" style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
......@@ -825,7 +825,7 @@
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
收入
</span>
<span v-if="rowData.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -1232,7 +1232,7 @@
tableData: [],
columns: [{
field: 'BranchName',
title: '所属公司',
title: '所属校区',
width: 80,
titleAlign: 'left',
columnAlign: 'left',
......@@ -1477,7 +1477,7 @@
}
}, err => {})
},
getPageList() { // 获取列表数据
getPageList() { // 获取列表数据
if (!this.msg.ClientID) this.msg.ClientID = 0;
if (!this.msg.ClientType) this.msg.ClientType = 0;
if (!this.msg.CurrencyId) this.msg.CurrencyId = 0;
......
src/pages/financial/financalDocument/invoicesManager.vue
View file @ 58bb17d3
......@@ -127,7 +127,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="公司">
<el-form-item label="校区">
<el-select v-model="msg.RB_Branch_Id" filterable >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'></el-option>
......
src/pages/financial/lang/zh.js
View file @ 58bb17d3
......@@ -74,7 +74,7 @@ export const system = {
label_jingting:'经停',
label_info:'描述',
label_img:'图片',
query_company:'所属公司',
query_company:'所属校区',
query_lineName:'线路名称',
query_name:'姓名',
query_dest:'目的地',
......@@ -361,7 +361,7 @@ export const admin={ //行政
table_operattime:'操作时间',
table_operat:'操作',
product_name:'产品名称',
product_type_name:'房间类型',
product_type_name:'房间类型',
table_hotelname:'酒店名称',
table_Address:'酒店地址',
table_areaDetail:'请输入详细地址',
......@@ -373,7 +373,7 @@ export const admin={ //行政
table_UseAmount:'使用数量',
table_CostPrice:'总成本',
table_TotalPrice:'交易总金额',
table_servers:'服务人数',
suplier_name:'供应商名称',
suplier_contact:'联系人',
......@@ -384,7 +384,7 @@ export const admin={ //行政
hotel_remain:'余',
hotel_remainList:'剩余',
hotel_roomTypeOne:'红色表示未还',
hotel_roomTypeTwo:'绿色表示已还',
hotel_roomTypeTwo:'绿色表示已还',
hotel_roomUsed:'已用',
hotel_room:'间',
hotel_OccupancyTime:'用房时间',
......@@ -494,7 +494,7 @@ export const admin={ //行政
res_SpringHotel:'温泉酒店',
res_package:'套餐',
res_packageName:'套餐名称',
res_package_type_Name:'套餐类型',
res_package_type_Name:'套餐类型',
res_suplierName:'供应商名称',
res_belongArea:'所在区域',
res_Number:'数量',
......@@ -705,11 +705,11 @@ export const visa = {
v_britishVisa:'英国签证',
v_EuropeanVisaName:'欧洲签证名称',
v_visaInformation:'签证资料',
}
export const advmanager = {
v_all:'全部',
......@@ -815,7 +815,7 @@ export const fnc = {
fnc_tfsrhj: '团费收入合计',
fnc_zksr: '直客收入',
fnc_thjksr: '同行交客收入',
fnc_plattev: '平台收入',
fnc_plattev: '平台收入',
acc: '账户',
accBming: '账户别名：',
accType: '账户类型：',
......@@ -1568,7 +1568,7 @@ export const rule = {
qsrzjine: '请输入总金额',
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
EnterContratPerson:'请输入联系人',
EnterCustomer:'请输入客户名',
EnterPNum:'请输入联系电话',
......@@ -1643,7 +1643,7 @@ export const adm={
adm_Rolename:"角色名称",
adm_quanxian:"权限",
adm_qsrmiaoshu:"请输入描述",
adm_qxshezhi:"权限设置",
adm_qxshezhi:"权限设置",
adm_Bindingattendance:"绑定考勤",
adm_title:"标题",
adm_Publisher:"发布人",
......@@ -1658,7 +1658,7 @@ export const adm={
adm_roof:"置顶",
adm_exitroof:"取消置顶",
adm_shifouroof:"是否置顶?",
adm_chehui:"撤回",
adm_fujian:"附件",
adm_download:"下载",
......@@ -1697,7 +1697,7 @@ export const adm={
adm_Thursday:"星期四",
adm_Friday:"星期五",
adm_Saturday:"星期六",
}
export const visaT = {
cxjihua: '出行计划',
......@@ -1837,7 +1837,7 @@ export const MarketingActi={
commTypename:'商品类型名称',
typeNum:'类型编号',
notShow:'不显示',
commName:'商品名称',
commType:'商品类型',
commActivity:'商品活动',
......@@ -1849,13 +1849,13 @@ export const MarketingActi={
RestrictionNumber:'限购数',
DistributionInstructions:'配送说明',
ActivitiesInvolved:'所属活动',
commState:'商品状态',
ActivityNum:'活动编号',
ActivityName:'活动名称',
ActivityImg:'活动图片',
ActivityDes:'活动描述',
commActivityName:'商品活动名称',
ActivityPro:'活动介绍',
commState:'商品状态',
ActivityNum:'活动编号',
ActivityName:'活动名称',
ActivityImg:'活动图片',
ActivityDes:'活动描述',
commActivityName:'商品活动名称',
ActivityPro:'活动介绍',
CommActivitytubiao:'商品活动图标',
}
//销售模块
......@@ -2441,7 +2441,7 @@ export const sm={
person:'人',
zuoweishu:'座位数',
cantingbiangeng:'餐厅变更',
dingdanxinxi:'订单信息',
yitijiao:'已提交',
fangansheji:'方案设计',
......@@ -2493,7 +2493,7 @@ export const sm={
qrhOrderbhzdqx:'确认后，订单不会自动取消',
qxhddhzdqx:'取消后，订单会自动取消',
quxiaocg:'取消成功',
airbianma:'机票编码',
Date:'日期',
kerenshul:'客人数量',
......@@ -2628,4 +2628,4 @@ export const op={
import invoicesManager from './zhCN/invoicesManager'
import Ground from './zhCN/Ground'
export const ios = invoicesManager
export const ground = Ground
\ No newline at end of file
export const ground = Ground
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