Skip to content

S
SuperMan
Commit abd027d1 authored by 王悦's avatar 王悦
Browse files
Options

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

parents f1dc0f60 281f4154
Show whitespace changes
Inline Side-by-side
Showing with 724 additions and 402 deletions
src/assets/common/lang/zh.js
View file @ abd027d1
......@@ -35,7 +35,8 @@ export const pub={
closeWindow:'关闭窗口',
noMsg:'咱无',
returnBack:'返回',
allday:'全天'
allday:'全天',
clickToView:'点击查看',
}
export const login = {
......@@ -705,38 +706,31 @@ export const active = {
cl_zanwu: '暂无',
cl_qita: '其他',
}
export const rule = {
company: '请选择公司',
ldNmae: '请输入抽奖名称',
ldNum: '请输入抽奖次数',
startDate: '请选择开始日期',
endDate: '请选择结束日期',
qsrzhbieming: '请输入账户别名',
qxzzhleixing: '请选择账户类型',
qxzyhjigou: '请选择银行机构',
qsrkhuren: '请输入开户人',
qsrkhuhang: '请输入开户行',
qsrptzhanghao: '请输入平台账号',
qsrptsxufei: '请输入平台手续费',
qsrzqxufei: '请输入正确的平台手续费',
qszssgongsi: '请选择所属公司',
qxzzhbizhong: '请选择账户币种',
qsrcsyue: '请输入初始余额',
qsrzqdyue: '请输入正确的余额',
szfzeren: '支款负责人',
fkfzeren: '付款负责人',
qxzfyleixing: '请选择费用类型',
qtxptsyongfei: '请填写平台使用费',
qtxptbzhengjin: '请填写平台保证金',
qxzbdyinhang: '请选择绑定银行',
qssrzhhaoma: '请输入账户号码',
qsrzqdzhhaoma: '请输入正确的账户号码',
}
export const fnc = {
acc: '账户',
accBming: '账户别名：',
accType: '账户类型：',
ptjigou: '平台机构：',
tcleibie: '提成类别：',
jiaoyie: '交易额',
retoushu: '人头数',
tcfangshi: '提成方式：',
gdbfenbi: '固定百分比',
jtbfenbi: '阶梯百分比',
tcbili: '提成比例：',
tcyaoqiu: '提成要求：',
shiyongongsi: '适用公司：',
ysdingjin: '已收定金',
wkshouqi: '尾款收齐',
jszhouqi: '结算周期：',
andjiesuan: '按单结算',
anyjiesuan: '按月结算',
jsyaoqiu: '结算要求：',
qzwcsyyq: '强制完成周期内所有订单提成要求',
bqzwancheng: '不用强制完成',
gdjine: '固定金额',
jtjine: '阶梯金额',
khuren: '开户人：',
ptAcc: '平台账户：',
suoshugs: '所属公司：',
......@@ -791,6 +785,95 @@ export const fnc = {
yhkahao: '银行卡号：',
bweibi: '本位币',
waibi: '外币',
dhsunyi: '汇兑损益',
ljshouji: '累计收益',
shouyi: '收益',
kuisun: '亏损',
yingli: '盈利',
lcliebiao: '流程列表',
addliucheng: '新增流程',
syfeiyong: '适用费用',
gfyleixing: '个费用类型',
sygongsi: '适用公司',
jttongyong: '集团通用',
sydxianlu: '所有线路',
shiyongxianlu: '适用线路',
symdidi: '适用目的地：',
symudidi: '所有目的地',
qyshijian: '启用时间：',
syxianlu: '适用线路：',
qzrenshu: '起始人数',
zzrenshu: '终止人数',
jcbili: '基础比列',
ewjiangli: '额外奖励',
jttcblsd: '阶梯提成比例设定',
lcrizhi: '流程日志',
zwxgrizhi: '暂无修改日志',
zwkqliucheng: '暂未开启流程',
zlchengshu: '子流程数量',
no: '无',
rizhi: '日志',
liucheng: '流程',
skliucheng: '收款流程',
qiyong: '启用',
tingyong: '停用',
huiqian: '（会签）',
huoqian: '（或签）',
sprshezhi: '审批人设置',
sprleibie: '审批人类别',
jdmiaoshu: '节点描述',
jddongzuo: '节点动作',
zhuguan: '主管',
zdchengyuan: '指定成员',
tsjiedian: '特殊节点',
fqrende: '发起人的',
tjchengyuan: '添加成员',
huiquandetail: '会签（须所有审批人同意）',
huoqiandetail: '或签（一名审批人同意或拒绝即可）',
xzgangwei: '选择岗位',
addgangweo: '添加岗位',
xgjiedian: '修改节点',
jcxinxi: '基础信息',
lcmingcheng: '流程名称',
lcleixing: '流程类型',
scfujian: '上传附件',
buqiyong: '不启用',
qiyong: '启用',
syzhanghu: '适用账户',
yinhang: '银行',
xianjin: '现金',
pingtai: '平台',
zjinchi: '资金池',
mbmiaoshu: '模板描述',
lcshezhi: '流程设置',
mrspliucheng: '默认审批流程',
mrspiren: '默认审批人',
huiqian: '会签',
huoqian: '或签',
tianjia: '添加',
mrcsongren: '默认抄送人',
xuanze: '选择',
yixuan: '已选',
yixuangangwei: '已选岗位',
xzcsongren: '选择抄送人',
kjiedian: '空节点',
cnchuangkou: '出纳窗口',
kjchuangkou: '会计窗口',
xiankong: '线控',
jzchuna: '记账出纳',
skchuna: '收款出纳',
xzrenyuan: '选择人员',
addguize: '新增规则',
editguize: '修改规则',
gzmingcheng: '规则名称',
tcguize: '提成规则',
tcjilu: '提成记录',
tczhouqi: '提成周期',
dyjiesuan: '按单结算',
ayjiesuan: '按月结算',
dwala: '必选完成周期内所有的提成要求',
awala: '不强制完成周期内所有的提成要求',
meiyousunyi: '该账户当前还没有损益记录',
}
export const tips = {
tips: '提示',
......@@ -799,4 +882,79 @@ export const tips = {
cancleDelete: '已取消删除',
saveYes: '保存成功！',
sxhuilv: '以下汇率系统将每隔30分钟实时更新一次',
yssdliucheng: '注：以上费用类型将会被执行你设定的流程',
zwsyfeiyong: '暂无适用费用！',
qrsc: '确定删除',
lcmscbkhf: '流程吗？删除后不可恢复！',
qsrmiaoshu: '请输入6个字的描述',
srgjzjxguolv: '输入关键字进行过滤',
qxzsygongsi: '请选择适用公司！',
qxzsyfeiyong: '请选择适用费用！',
qxzspiren: '请选择审批人！',
qxzliucehng: '请选择流程类型！',
czchenggong: '操作成功！',
rsbncgtr: '人数不能超过10人',
qtxjdmiaoshu: '请填写节点描述！',
qxzbmzgjibie: '请选择部门主管级别！',
cybnweikong: '成员不能为空',
qxzgangwei: '请选择岗位',
qxzbumen: '请选择部门！',
di: '第',
jizhuguan: '级主管',
xzqyshijian: '选择启用时间',
cicaozuoyongjiushanchu: '此操作将永久删除该提成规则, 是否继续?',
shanchutishi: '删除提示',
shanchuchenggong: '删除成功',
baocunchenggong: '保存成功',
}
export const Operation = {
Op_ShortName:'线路简称',
Op_sname:'简称',
Op_depositAmount:'最低定金金额',
Op_EarlybirdDay:'早鸟优惠天数',
Op_LossAllocation:'损失分摊比列',
Op_partInCompany:'参与公司',
Op_belongDepartment:'所属部门',
Op_CombinedContry:'关联国家',
Op_lowDeposit:'最低定金',
Op_preferentialDays:'优惠天数',
Op_isDirect:'是否直采',
Op_isShared:'是否共享',
Op_AllowSmallGroup:'允许小包团',
Op_Project:'项目',
Op_notInvoled:'未参与',
Op_ManageDepartment:'管理部门',
}
export const rule = {
company: '请选择公司',
ldNmae: '请输入抽奖名称',
ldNum: '请输入抽奖次数',
startDate: '请选择开始日期',
endDate: '请选择结束日期',
qsrzhbieming: '请输入账户别名',
qxzzhleixing: '请选择账户类型',
qxzyhjigou: '请选择银行机构',
qsrkhuren: '请输入开户人',
qsrkhuhang: '请输入开户行',
qsrptzhanghao: '请输入平台账号',
qsrptsxufei: '请输入平台手续费',
qsrzqxufei: '请输入正确的平台手续费',
qszssgongsi: '请选择所属公司',
qxzzhbizhong: '请选择账户币种',
qsrcsyue: '请输入初始余额',
qsrzqdyue: '请输入正确的余额',
szfzeren: '支款负责人',
fkfzeren: '付款负责人',
qxzfyleixing: '请选择费用类型',
qtxptsyongfei: '请填写平台使用费',
qtxptbzhengjin: '请填写平台保证金',
qxzbdyinhang: '请选择绑定银行',
qssrzhhaoma: '请输入账户号码',
qsrzqdzhhaoma: '请输入正确的账户号码',
qsrlcmingcheng: '请输入流程名称',
qsrjcbili: '请输入基础比例',
qsrwmjiangli: '请输入外卖奖励',
qsrgzmingcheng: '请输入规则名称',
qzsxzytxianlu: '请至少选择一个适用线路',
qzsxzyggongsi: '请至少选择一个适用公司',
}
src/assets/css/newTravelManager.css
View file @ abd027d1
......@@ -92,7 +92,7 @@
}
.TPsecondTitle {
display: inline-block;
margin: 12px 0 0 0;
margin: 18px 0 0 0;
width: 50px;
text-align: right;
}
......
src/components/FinancialModule/CashAccount.vue
View file @ abd027d1
......@@ -58,14 +58,14 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')">
<el-form-item label="账户别名">
<el-input v-model="msg.Alias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')">
<el-form-item label="账户类型">
<el-select filterable v-model='msg.TypeId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
......@@ -75,9 +75,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.suoshugs')">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -90,12 +90,12 @@
</el-row>
</el-form>
<ul>
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn'),ed=false"/></li>
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" value="新增" @click="addShow=true,text='新增',ed=false"/></li>
</ul>
</div>
<div class="cm_content _scrollbar" :class="addShow==true||addCuren==false?'_edHeight':''">
<p class="_tips">{{$t('tips.sxhuilv')}}</p>
<p class="_tips">以下汇率系统将每隔30分钟实时更新一次</p>
<div class="clearfix" v-loading='loading'>
<div class="instMg_list_item" v-for="(item,index) in DataList">
<div class="_bt">
......@@ -109,7 +109,7 @@
</div>
<div class="_bt_b">
<p>
<span class="_name">{{$t('fnc.zhyue')}}</span>
<span class="_name">账户余额</span>
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
......@@ -118,30 +118,30 @@
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
</p>
<p><span class="_name">{{$t('fnc.zhubizhong')}}</span><span class="_bold">
<p><span class="_name">账户币种</span><span class="_bold">
<el-tooltip class="item" effect="dark" :content="item.CurrencyName" placement="top-start">
<span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1? $t('fnc.bweibi') : $t('fnc.waibi')}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<el-tooltip class="item" effect="dark" :content="item.allName==''? $t('active.cl_zanwu'):item.allName" placement="top-end">
<span v-if="!item.BranchName.length" class="_cp_name"><span class="_bold" >{{$t('active.cl_zanwu')}} </span></span>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">所属公司</span>
<el-tooltip class="item" effect="dark" :content="item.allName==''?'暂无':item.allName" placement="top-end">
<span v-if="!item.BranchName.length" class="_cp_name"><span class="_bold" >暂无 </span></span>
<span v-else class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b}} </span></span>
</el-tooltip>
</p>
<p v-if="item.IsStandardCurrency!=1">
<span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">{{item.ProfitLossMoney}}</span>
<span class="_name">上期损益</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">123123</span>
<span class="fr" v-else>-</span>
</p>
<p v-else>&nbsp;</p>
</div>
<p class="_btn">
<el-button-group>
<el-button type="primary" @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true,addCuren=true">{{$t('pub.updateMsg')}}</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">{{$t('fnc.tiaohui')}}</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,3,item.CurrencyId)">{{$t('fnc.jilu')}}</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">{{$t('fnc.xiaohu')}}</el-button>
<el-button type="primary" @click="editCurency(item.ID),text='修改',addShow=true,addCuren=true">修改</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">调汇</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,3,item.CurrencyId)">记录</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">销户</el-button>
</el-button-group>
</p>
</div>
......@@ -164,7 +164,7 @@
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
<p class="_tit">{{text}}账户</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
......@@ -174,13 +174,13 @@
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-form-item label="账户别名：" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-form-item label="账户类型：" prop="TypeId">
<el-select filterable v-model='addMsg.TypeId' class="">
<el-option v-for='item in AccountTypeList'
:label='item.Name'
......@@ -192,7 +192,7 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-form-item label="账户币种：" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' >
<el-option v-for='item in financeinfoList'
:label='item.Name'
......@@ -203,7 +203,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.csyue')" prop="Initialbalance" >
<el-form-item label="初始余额：" prop="Initialbalance" >
<el-input v-model="addMsg.Initialbalance" class=""></el-input>
</el-form-item>
</el-col>
......@@ -252,7 +252,7 @@
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-form-item label="所属公司：" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -264,12 +264,12 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxshangxian')" >
<el-form-item label="风险上限：" >
<el-input v-model="addMsg.RiskLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxxiaxian')">
<el-form-item label="风险下限：" >
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
......@@ -279,38 +279,38 @@
<div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
<p class="_tit">期末调汇</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">确认提交</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.sqhuilv')">
<el-form-item label="上期汇率：">
<el-input v-model="SetProfitLossMsg.initRate" disabled=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-form-item label="期末汇率：" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" type="number" @change="Calculation()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-form-item label="选择期数：" prop="TermNum">
<el-date-picker
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-form-item label="费用类型：" prop="CostTypeID">
<el-select filterable v-model='SetProfitLossMsg.CostTypeID'>
<el-option v-for='item in costType'
:label='item.Name'
......@@ -321,9 +321,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p>
<p v-if="moneyDate.ProfitLoss<0">亏损：<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">盈利：<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">盈亏：<span class="fc_green">0</span></p>
</el-col>
</el-row>
</el-form>
......@@ -374,30 +374,30 @@ export default {
ed:false,
rules: {//表单必填验证
Alias: [
{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: 'blur' }
{ required: true, message: '请输入账户别名', trigger: 'blur' }
],
TypeId: [
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: 'change' }
{ required: true, message: '请选择账户类型', trigger: 'change' }
],Accountholder: [
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: 'blur' }
{ required: true, message: '请输入开户人', trigger: 'blur' }
],Openingbank: [
{ required: true, message: this.$t('rule.qsrkhuhang'), trigger: 'blur' }
{ required: true, message: '请输入开户行', trigger: 'blur' }
],BackNo: [
{ required: true, message: this.$t('rule.qssrzhhaoma'), trigger: 'blur' },
{pattern:/^[0-9]*$/, message: this.$t('rule.qsrzqdzhhaoma')}
{ required: true, message: '请输入账户号码', trigger: 'blur' },
{pattern:/^[0-9]*$/, message: '请输入正确的账户号码'}
],BranchIdS: [
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: 'change' }
{ required: true, message: '请选择所属公司', trigger: 'change' }
],CurrencyId: [
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: 'change' }
{ required: true, message: '请选择账户币种', trigger: 'change' }
],Initialbalance: [
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsdecimalAll, message: this.$t('rule.qsrzqdyue')}
{ required: true, message: '请输入初始余额', trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsdecimalAll, message: '请输入正确的余额'}
],OutCharge:[
{ required: true, message: this.$t('rule.szfzeren'), trigger: 'change' },
{ required: true, message: '支款负责人', trigger: 'change' },
],InCharge:[
{ required: true, message: this.$t('rule.fkfzeren'), trigger: 'change' },
{ required: true, message: '付款负责人', trigger: 'change' },
],CostTypeID:[
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: 'change' },
{ required: true, message: '请选择费用类型', trigger: 'change' },
]
},
addCuren:true,
......@@ -662,17 +662,16 @@ export default {
},err=>{})
},
financeinfoRemove(id,text){//删除
this.$confirm(this.$t('tips.shifoudui')+'“'+text+'”'+ this.$t('tips.zhshanchu'),
this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
this.$confirm('是否对'+'“'+text+'”'+'账户进行销户操作？销户后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deletInstitutions(id)
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('tips.cancleDelete')
message: '已取消删除'
});
});
},
......
src/components/FinancialModule/CompanyAccount.vue
View file @ abd027d1
......@@ -67,14 +67,14 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')">
<el-form-item label="账户别名">
<el-input v-model="msg.Alias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ssjigou')">
<el-form-item label="所属机构">
<el-select filterable v-model='msg.BackId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in FinancialList' v-if="item.Type == 0"
:label='item.Name'
:value='item.ID'
......@@ -84,9 +84,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')">
<el-form-item label="账户类型">
<el-select filterable v-model='msg.TypeId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
......@@ -96,9 +96,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ssgongsi')">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-2'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -111,12 +111,12 @@
</el-row>
</el-form>
<ul>
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn'),ed=false"/></li>
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" value="新增" @click="addShow=true,text='新增',ed=false"/></li>
</ul>
</div>
<div class="cm_content _scrollbar" :class="addShow==true||addCuren==false?'_edHeight':''">
<p class="_tips">{{$t('tips.sxhuilv')}}</p>
<p class="_tips">以下汇率系统将每隔30分钟实时更新一次</p>
<div class="clearfix" v-loading='loading'>
<div class="instMg_list_item" v-for="(item,index) in DataList">
<div class="_top">
......@@ -144,7 +144,7 @@
</div>
<div class="_bt_b">
<p>
<span class="_name">{{$t('fnc.zhyue')}}</span>
<span class="_name">账户余额</span>
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
......@@ -153,29 +153,29 @@
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
</p>
<p><span class="_name">{{$t('fnc.zhubizhong')}}</span><span class="_bold">
<p><span class="_name">账户币种</span><span class="_bold">
<el-tooltip class="item" effect="dark" :content="item.CurrencyName" placement="top-start">
<span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<p><span class="_name">所属公司</span>
<el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
<span class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b.BranchName}} </span></span>
</el-tooltip>
</p>
<p v-if="item.IsStandardCurrency!=1">
<span class="_name">{{$t('fnc.sqisunyi')}}</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">{{item.ProfitLossMoney}}</span>
<span class="_name">上期损益</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">123123</span>
<span class="fr" v-else>-</span>
</p>
<p v-else>&nbsp;</p>
</div>
<p class="_btn">
<el-button-group>
<el-button type="primary" @click="editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true,addCuren=true">{{$t('pub.updateMsg')}}</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">{{$t('fnc.tiaohui')}}</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,1,item.CurrencyId)">{{$t('fnc.jilu')}}</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">{{$t('fnc.xiaohu')}}</el-button>
<el-button type="primary" @click="editCurency(item.ID),text='修改',addShow=true,addCuren=true">修改</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">调汇</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,1,item.CurrencyId)">记录</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">销户</el-button>
</el-button-group>
</p>
</div>
......@@ -189,7 +189,7 @@
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="prev, pager, next"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
......@@ -198,7 +198,7 @@
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
<p class="_tit">{{text}}账户</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
......@@ -208,13 +208,13 @@
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-form-item label="账户别名：" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-form-item label="账户类型：" prop="TypeId">
<el-select filterable v-model='addMsg.TypeId' class="">
<el-option v-for='item in AccountTypeList'
:label='item.Name'
......@@ -226,7 +226,7 @@
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.yhjigou')" prop="BackId">
<el-form-item label="银行机构：" prop="BackId">
<el-select filterable v-model='addMsg.BackId' class="">
<el-option v-for='item in FinancialList' v-if="item.Type == 0"
:label='item.Name'
......@@ -238,30 +238,30 @@
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.khuren')" prop="Accountholder">
<el-form-item label="开户人：" prop="Accountholder">
<el-input v-model="addMsg.Accountholder" class="" maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.khuhang')" prop="Openingbank">
<el-form-item label="开户行：" prop="Openingbank">
<el-input v-model="addMsg.Openingbank" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.yhkahao')" prop="BackNo">
<el-form-item label="银行卡号：" prop="BackNo">
<el-input v-model="addMsg.BackNo" class="" maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.csyue')" prop="Initialbalance" >
<el-form-item label="初始余额：" prop="Initialbalance" >
<el-input v-model="addMsg.Initialbalance" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-form-item label="账户币种：" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' class="">
<el-option v-for='item in financeinfoList'
:label='item.Name'
......@@ -317,7 +317,7 @@
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-form-item label="所属公司：" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -329,12 +329,12 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxshangxian')" >
<el-form-item label="风险上限：" >
<el-input v-model="addMsg.RiskLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxxiaxian')" >
<el-form-item label="风险下限：" >
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
......@@ -344,38 +344,38 @@
<div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
<p class="_tit">期末调汇</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">确认提交</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.sqhuilv')">
<el-form-item label="上期汇率：">
<el-input v-model="SetProfitLossMsg.initRate" disabled=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-form-item label="期末汇率：" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" type="number" @change="Calculation()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-form-item label="选择期数：" prop="TermNum">
<el-date-picker
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-form-item label="费用类型：" prop="CostTypeID">
<el-select filterable v-model='SetProfitLossMsg.CostTypeID'>
<el-option v-for='item in costType'
:label='item.Name'
......@@ -386,9 +386,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p>
<p v-if="moneyDate.ProfitLoss<0">亏损：<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">盈利：<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">盈亏：<span class="fc_green">0</span></p>
</el-col>
</el-row>
</el-form>
......@@ -442,32 +442,32 @@ export default {
ed:false,
rules: {//表单必填验证
Alias: [
{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: 'blur' }
{ required: true, message: '请输入账户别名', trigger: 'blur' }
],
TypeId: [
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: 'change' }
{ required: true, message: '请选择账户类型', trigger: 'change' }
],BackId: [
{ required: true, message: this.$t('rule.qxzyhjigou'), trigger: 'change' }
{ required: true, message: '请选择银行机构', trigger: 'change' }
],Accountholder: [
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: 'blur' }
{ required: true, message: '请输入开户人', trigger: 'blur' }
],Openingbank: [
{ required: true, message: this.$t('rule.qsrkhuhang'), trigger: 'blur' }
{ required: true, message: '请输入开户行', trigger: 'blur' }
],BackNo: [
{ required: true, message: this.$t('rule.qssrzhhaoma'), trigger: 'blur' },
{pattern:/^[0-9]*$/, message: this.$t('rule.qsrzqdzhhaoma')}
{ required: true, message: '请输入账户号码', trigger: 'blur' },
{pattern:/^[0-9]*$/, message: '请输入正确的账户号码'}
],BranchIdS: [
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: 'change' }
{ required: true, message: '请选择所属公司', trigger: 'change' }
],CurrencyId: [
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: 'change' }
{ required: true, message: '请选择账户币种', trigger: 'change' }
],Initialbalance: [
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsInventer, message: this.$t('rule.qsrzqdyue')}
{ required: true, message: '请输入初始余额', trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsInventer, message: '请输入正确的余额'}
],OutCharge:[
{ required: true, message: this.$t('rule.szfzeren'), trigger: 'change' },
{ required: true, message: '支款负责人', trigger: 'change' },
],InCharge:[
{ required: true, message: this.$t('rule.fkfzeren'), trigger: 'change' },
{ required: true, message: '付款负责人', trigger: 'change' },
],CostTypeID:[
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: 'change' },
{ required: true, message: '请选择费用类型', trigger: 'change' },
]
},
addCuren:true,
......@@ -728,7 +728,7 @@ export default {
this.addMsg.BranchList.push(msg);
this.apipost('bankaccount_post_Set',this.addMsg,res=>{
if(res.data.resultCode == 1) {
this.tips(this.$t('tips.saveYes'), "success");
this.tips('保存成功！','success')
this.getList();
this.initAddMsg();
this.addShow = false
......@@ -738,17 +738,16 @@ export default {
},err=>{})
},
financeinfoRemove(id,text){//删除
this.$confirm(this.$t('tips.shifoudui')+'“'+text+'”'+ this.$t('tips.zhshanchu'),
this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
this.$confirm('是否对'+'“'+text+'”'+'账户进行销户操作？销户后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deletInstitutions(id)
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('tips.cancleDelete')
message: '已取消删除'
});
});
},
......
src/components/FinancialModule/PlatformAccount.vue
View file @ abd027d1
......@@ -62,10 +62,10 @@
<input
type="button"
class="normalBtn"
:value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),ed=false"
value="新增"
@click="addShow=true,text='新增',ed=false"
>
<input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
<input type="button" class="normalBtn" @click="downMuban()" value="导出">
</li>
</ul>
</div>
......@@ -235,7 +235,7 @@
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
<p class="_tit">{{text}}账户</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button
......@@ -259,13 +259,13 @@
>
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-form-item label="账户别名：" prop="Alias">
<el-input v-model="addMsg.Alias" class maxlength="10"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-form-item label="账户类型：" prop="TypeId">
<el-select filterable v-model="addMsg.TypeId" class>
<el-option
v-for="item in AccountTypeList"
......@@ -278,7 +278,7 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptjigou')" prop="BackId">
<el-form-item label="平台机构：" prop="BackId">
<el-select filterable v-model="addMsg.BackId" class>
<el-option
v-for="item in FinancialList"
......@@ -292,58 +292,58 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.khuren')" prop="Accountholder">
<el-form-item label="开户人：" prop="Accountholder">
<el-input v-model="addMsg.Accountholder" class maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptAcc')" prop="PlatformNo">
<el-form-item label="平台账户：" prop="PlatformNo">
<el-input v-model="addMsg.PlatformNo" class maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptsyongfei')" prop="Royalty">
<el-form-item label="平台使用费：" prop="Royalty">
<el-input v-model="addMsg.Royalty" class maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptsffangshi')">
<el-form-item label="平台收费方式：">
<el-select filterable v-model="addMsg.SettlementType" class>
<el-option :label="$t('fnc.abfenbi')" value=1></el-option>
<el-option :label="$t('fnc.anrentou')" value=2></el-option>
<el-option label="按百分比" value=1></el-option>
<el-option label="按人头" value=2></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptsxufei')" prop="Commission">
<el-form-item label="平台手续费：" prop="Commission">
<el-input v-model="addMsg.Commission" class maxlength="20">
<template slot="append">{{addMsg.SettlementType==1?'%':'/人'}}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.bzengjin')" prop="Bond">
<el-form-item label="保证金：" prop="Bond">
<el-input v-model="addMsg.Bond" class maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.qyxianlu')">
<el-form-item label="签约线路">
<el-input v-model="addMsg.SigningLine" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.hetong')">
<el-form-item label="合同">
<el-select filterable v-model="addMsg.HaveContract" class>
<el-option :label="$t('fnc.yhetong')" value=1></el-option>
<el-option :label="$t('fnc.whetong')" value=0></el-option>
<el-option label="有合同" value=1></el-option>
<el-option label="无合同" value=0></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.htshuoming')">
<el-form-item label="合同说明">
<el-input v-model="addMsg.ContraceDateRange" class></el-input>
</el-form-item>
</el-col>
......@@ -351,7 +351,7 @@
<el-row>
<el-col :span="4" :gutter="35">
<!-- v-if="ed==true" -->
<el-form-item :label="$t('fnc.csyue')" prop="Initialbalance">
<el-form-item label="初始余额：" prop="Initialbalance">
<el-input v-model="addMsg.Initialbalance" class></el-input>
</el-form-item>
<!-- <el-form-item label="初始余额：" prop="Initialbalance" v-else>
......@@ -360,7 +360,7 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-form-item label="账户币种：" prop="CurrencyId">
<el-select filterable v-model="addMsg.CurrencyId" class>
<el-option
v-for="item in financeinfoList"
......@@ -416,7 +416,7 @@
</el-form-item>
</el-col>-->
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-form-item label="所属公司：" prop="BranchIdS">
<el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
<el-option
v-for="item in CompanyList"
......@@ -429,22 +429,22 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.fxshangxian')">
<el-form-item label="风险上限：">
<el-input v-model="addMsg.RiskLimitMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.fxxiaxian')">
<el-form-item label="风险下限：">
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.bdyhzhanghu')" prop="BindBankID">
<el-form-item label="绑定银行账户" prop="BindBankID">
<el-select
v-model="addMsg.BindBankID"
filterable
remote
:placeholder="$t('fnc.qsryhzhgjc')"
placeholder="请输入银行账户关键词"
:remote-method="remoteQueryBankMethod"
:loading="remoteLoading"
class="minmargin-box">
......@@ -462,7 +462,7 @@
</el-row>
<el-row>
<el-col :span="24" :gutter="35">
<el-form-item :label="$t('fnc.beizhu')">
<el-form-item label="备注：">
<el-input type='textarea' v-model="addMsg.Remark" class></el-input>
</el-form-item>
</el-col>
......@@ -476,10 +476,10 @@
>
<el-row>
<el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
<p class="_tit">期末调汇</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">确认提交</button>
<button
class="hollowFixedBtn"
type="button"
......@@ -496,28 +496,28 @@
>
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.sqhuilv')">
<el-form-item label="上期汇率：">
<el-input v-model="SetProfitLossMsg.initRate" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-form-item label="期末汇率：" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" type="number" @change="Calculation()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-form-item label="选择期数：" prop="TermNum">
<el-date-picker
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$('admin.admin_choDate')"
placeholder="选择日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-form-item label="费用类型：" prop="CostTypeID">
<el-select filterable v-model="SetProfitLossMsg.CostTypeID">
<el-option
v-for="item in costType"
......@@ -530,15 +530,15 @@
</el-col>
<el-col :span="4" :gutter="35" class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">
{{$t('fnc.kuisun')}}
亏损：
<span class="fc_red">{{moneyDate.ProfitLoss}}</span>
</p>
<p v-if="moneyDate.ProfitLoss>0">
{{$t('fnc.yingli')}}
盈利：
<span class="fc_green">{{moneyDate.ProfitLoss}}</span>
</p>
<p v-if="moneyDate.ProfitLoss==0">
{{$t('fnc.kuisun')}}
盈亏：
<span class="fc_green">0</span>
</p>
</el-col>
......@@ -619,56 +619,56 @@ export default {
InitTimeFun: "",
rules: {
//表单必填验证
Alias: [{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: "blur" }],
Alias: [{ required: true, message: "请输入账户别名", trigger: "blur" }],
TypeId: [
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: "change" }
{ required: true, message: "请选择账户类型", trigger: "change" }
],
BackId: [
{ required: true, message: this.$t('rule.qxzyhjigou'), trigger: "change" }
{ required: true, message: "请选择银行机构", trigger: "change" }
],
Accountholder: [
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: "blur" }
{ required: true, message: "请输入开户人", trigger: "blur" }
],
PlatformNo: [
{ required: true, message: this.$t('rule.qsrptzhanghao'), trigger: "blur" }
{ required: true, message: "请输入平台账号", trigger: "blur" }
],
Commission: [
{ required: true, message: this.$t('rule.qsrptsxufei'), trigger: "blur" },
{ required: true, message: "请输入平台手续费", trigger: "blur" },
{
pattern: this.$commonUtils.Regex.el_IsdecimalTrr,
message: this.$t('rule.qsrzqxufei')
message: "请输入正确的平台手续费"
}
],
BranchIdS: [
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: "change" }
{ required: true, message: "请选择所属公司", trigger: "change" }
],
CurrencyId: [
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: "change" }
{ required: true, message: "请选择账户币种", trigger: "change" }
],
Initialbalance: [
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: "blur" },
{ required: true, message: "请输入初始余额", trigger: "blur" },
{
pattern: this.$commonUtils.Regex.el_IsInventer,
message: this.$t('rule.qsrzqdyue')
message: "请输入正确的余额"
}
],
OutCharge: [
{ required: true, message: this.$t('rule.szfzeren'), trigger: "change" }
{ required: true, message: "支款负责人", trigger: "change" }
],
InCharge: [
{ required: true, message: this.$t('rule.fkfzeren'), trigger: "change" }
{ required: true, message: "付款负责人", trigger: "change" }
],
CostTypeID: [
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: "change" }
{ required: true, message: "请选择费用类型", trigger: "change" }
],
Royalty:[
{ required: true, message: this.$t('rule.qtxptsyongfei'), trigger: "change" }
{ required: true, message: "请填写平台使用费", trigger: "change" }
],
Bond:[
{ required: true, message: this.$t('rule.qtxptbzhengjin'), trigger: "change" }
{ required: true, message: "请填写平台保证金", trigger: "change" }
],
BindBankID:[
{ required: true, message: this.$t('rule.qxzbdyinhang'), trigger: "change" }
{ required: true, message: "请选择绑定银行", trigger: "change" }
]
},
addCuren: true,
......@@ -722,7 +722,7 @@ export default {
this.financeinfoRemove(params.id,params.alias)
}else if (params.type === 'edit'){
this.editCurency(params.id)
this.text= this.$t('pub.updateMsg')
this.text='修改'
this.addShow=true
this.addCuren=true
}
......@@ -731,7 +731,7 @@ export default {
this.isReady = false;
let that = this;
let Alias = {
title: that.$t('fnc.acc'),
title: "别名",
field: "Alias",
width: 80,
titleAlign: "left",
......@@ -751,7 +751,7 @@ export default {
});
let allName = {
field: "allName",
title: that.$t('system.query_company'),
title: "所属公司",
width: 40,
titleAlign: "left",
columnAlign: "left",
......@@ -764,7 +764,7 @@ export default {
};
let Accountholder = {
field: "Accountholder",
title: that.$t('fnc.khuren'),
title: "开户人",
width: 80,
titleAlign: "left",
columnAlign: "left",
......@@ -776,7 +776,7 @@ export default {
};
let benBalance = {
field: "Initialbalance",
title: that.$t('fnc.zhyue'),
title: "账户余额",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -784,38 +784,32 @@ export default {
orderBy: "desc",
formatter: function(rowData, rowIndex, pagingIndex, field) {
if(rowData["Initialbalance"]>=rowData["RiskLimitMoney"] && rowData["Initialbalance"]!=0)
{
let text = that.$t('fnc.chaoxian')
return `<span style='color:red;font-weight:bold'>${rowData["Initialbalance"].toFixed(2)}</span><span style='color:red;margin-left:12px;'>${text}</span>`;
}
return `<span style='color:red;font-weight:bold'>${rowData["Initialbalance"].toFixed(2)}</span><span style='color:red;margin-left:12px;'>超限</span>`;
else
{
return rowData["Initialbalance"].toFixed(2)
}
}
};
let Commission = {
field: "Commission",
title: that.$t('fnc.ptjyifei'),
title: "平台交易费",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
let text = that.$t('hotel.hotel_people')
return rowData.SettlementType == 1
? rowData.Commission.toFixed(2) + "%"
: rowData.Commission + "/" + text;
: rowData.Commission + "/人";
},
filterMultiple: true,
result: [],
filters: [
{
label: that.$t('fnc.jyebfenbi'),
label: "交易额百分比",
value: "1"
},
{
label: that.$t('fnc.jyrtoushu'),
label: "交易人头数",
value: "2"
}
],
......@@ -823,7 +817,7 @@ export default {
};
let Royalty = {
field: "Royalty",
title: that.$t('fnc.ptsyongfei'),
title: "平台使用费",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -834,19 +828,17 @@ export default {
}
};
let contract = {
title: that.$t('fnc.hetong'),
title: "合同",
field: "HaveContract",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) {
let whetong = that.$t('fnc.whetong')
let yhetong = that.$t('fnc.yhetong')
return `<span style='color:${
rowData.HaveContract == 0 ? "red" : "blue"
};margin-right:12px;'>${
rowData.HaveContract == 0 ? whetong : yhetong
rowData.HaveContract == 0 ? "无合同" : "有合同"
}</span><span>${
rowData.ContraceDateRange ? rowData.ContraceDateRange : ""
}</span>`;
......@@ -855,11 +847,11 @@ export default {
result: [],
filters: [
{
label: that.$t('fnc.whetong'),
label: "有合同",
value: "1"
},
{
label: that.$t('fnc.whetong'),
label: "无合同",
value: "0"
}
],
......@@ -867,7 +859,7 @@ export default {
};
let signingLine = {
field: "SigningLine",
title: that.$t('fnc.qyluxian'),
title: "签约线路",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -879,7 +871,7 @@ export default {
};
let bindBank = {
field: "BindBankName",
title: that.$t('fnc.bdyinhang'),
title: "绑定银行",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -887,7 +879,7 @@ export default {
};
let remark = {
field: "Remark",
title: that.$t('hotel.hotel_remark'),
title: "备注",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -897,7 +889,7 @@ export default {
},
};
let opera = {
title: that.$t('hotel.table_operat'),
title: "操作",
titleAlign: "left",
columnAlign: "left",
width: 80,
......@@ -1247,7 +1239,7 @@ export default {
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.tips(this.$t('tips.saveYes'), "success");
this.tips("保存成功！", "success");
this.getList();
this.initAddMsg();
this.addShow = false;
......@@ -1261,11 +1253,11 @@ export default {
financeinfoRemove(id, text) {
//删除
this.$confirm(
this.$t('tips.shifoudui') + "“" + text + "”" + this.$t('tips.zhshanchu'),
this.$t('tips.tips'),
"是否对" + "“" + text + "”" + "账户进行销户操作？销户后不可恢复！",
"提示",
{
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
)
......@@ -1275,7 +1267,7 @@ export default {
.catch(() => {
this.$message({
type: "info",
message: this.$t('tips.cancleDelete')
message: "已取消删除"
});
});
},
......
src/components/FinancialModule/PoolAccount.vue
View file @ abd027d1
......@@ -58,14 +58,14 @@
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')">
<el-form-item label="账户别名">
<el-input v-model="msg.Alias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')">
<el-form-item label="账户类型">
<el-select filterable v-model='msg.TypeId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-1'></el-option>
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
......@@ -75,9 +75,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.suoshugs')">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option label='不限' value='-2'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -91,13 +91,13 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addShow=true,addCuren=true,text=$t('pub.addBtn'),ed=false"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="normalBtn" value="新增" @click="addShow=true,addCuren=true,text='新增',ed=false"/>
</li>
</ul>
</div>
<div class="cm_content _scrollbar" :class="addShow==true||addCuren==false?'_edHeight':''">
<p class="_tips">{{$t('tips.sxhuilv')}}</p>
<p class="_tips">以下汇率系统将每隔30分钟实时更新一次</p>
<div class="clearfix" v-loading='loading'>
<div class="instMg_list_item" v-for="(item,index) in DataList">
<div class="_bt">
......@@ -110,7 +110,7 @@
</div>
<div class="_bt_b">
<p>
<span class="_name">{{$t('fnc.zhyue')}}</span>
<span class="_name">账户余额</span>
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
......@@ -119,18 +119,18 @@
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
</p>
<p><span class="_name">{{$t('fnc.zhubizhong')}}</span><span class="_bold">
<p><span class="_name">账户币种</span><span class="_bold">
<el-tooltip class="item" effect="dark" :content="item.CurrencyName" placement="top-start">
<span class="_max_wd">{{item.CurrencyName}}</span>
</el-tooltip>
(<span class="_bold" :class="item.IsStandardCurrency==1?'fc_green':'fc_red'">{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>) <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span> </span></p>
<p><span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<p><span class="_name">所属公司</span>
<el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
<span class="_cp_name"><span class="_bold" v-for="(b,bi) in item.BranchName">{{b}} </span></span>
</el-tooltip>
</p>
<p v-if="item.IsStandardCurrency!=1">
<span class="_name">{{$t('fnc.ssuogongsi')}}</span>
<span class="_name">上期损益</span>
<span class="fr" v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0" :class="item.ProfitLossMoney>0?'fc_green':'fc_red'">123123</span>
<span class="fr" v-else>-</span>
</p>
......@@ -138,10 +138,10 @@
</div>
<p class="_btn">
<el-button-group>
<el-button type="primary" @click="getCompanyList(),editCurency(item.ID),text=$t('pub.updateMsg'),addShow=true,addCuren=true">{{$t('pub.updateMsg')}}</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">{{$t('fnc.tiaohui')}}</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,4,item.CurrencyId)">{{$t('fnc.jilu')}}</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">{{$t('fnc.xiaohu')}}</el-button>
<el-button type="primary" @click="getCompanyList(),editCurency(item.ID),text='修改',addShow=true,addCuren=true">修改</el-button>
<el-button type="success" v-if="item.IsStandardCurrency===0" @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Initialbalance">调汇</el-button>
<el-button type="info" v-if="item.IsStandardCurrency===0" @click="goUrl('RemittanceRecord',item.ID,item.Alias,4,item.CurrencyId)">记录</el-button>
<el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">销户</el-button>
</el-button-group>
</p>
</div>
......@@ -164,7 +164,7 @@
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
<p class="_tit">{{text}}账户</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
......@@ -174,13 +174,13 @@
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-form-item label="账户别名：" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-form-item label="账户类型：" prop="TypeId">
<el-select filterable v-model='addMsg.TypeId' class="">
<el-option v-for='item in AccountTypeList'
:label='item.Name'
......@@ -192,7 +192,7 @@
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-form-item label="账户币种：" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' class="">
<el-option v-for='item in financeinfoList'
:label='item.Name'
......@@ -203,7 +203,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.csyue')" prop="Initialbalance" >
<el-form-item label="初始余额：" prop="Initialbalance" >
<el-input v-model="addMsg.Initialbalance" class=""></el-input>
</el-form-item>
</el-col>
......@@ -252,7 +252,7 @@
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS" >
<el-form-item label="所属公司：" prop="BranchIdS" >
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -264,12 +264,12 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxshangxian')" >
<el-form-item label="风险上限：" >
<el-input v-model="addMsg.RiskLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.fxxiaxian')">
<el-form-item label="风险下限：" >
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
......@@ -279,38 +279,38 @@
<div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
<el-row>
<el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
<p class="_tit">期末调汇</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">确认提交</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.sqhuilv')">
<el-form-item label="上期汇率：">
<el-input v-model="SetProfitLossMsg.initRate" disabled=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.qmhuilv')" prop="EndRate">
<el-form-item label="期末汇率：" prop="EndRate">
<el-input v-model="SetProfitLossMsg.EndRate" type="number" @change="Calculation()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-form-item label="选择期数：" prop="TermNum">
<el-date-picker
v-model="SetProfitLossMsg.TermNum"
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$t('admin.admin_choDate')">
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-form-item label="费用类型：" prop="CostTypeID">
<el-select filterable v-model='SetProfitLossMsg.CostTypeID'>
<el-option v-for='item in costType'
:label='item.Name'
......@@ -321,9 +321,9 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_yingkui">
<p v-if="moneyDate.ProfitLoss<0">{{$t('fnc.kuisun')}}<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">{{$t('fnc.yingli')}}<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">{{$t('fnc.kuisun')}}<span class="fc_green">0</span></p>
<p v-if="moneyDate.ProfitLoss<0">亏损：<span class="fc_red">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss>0">盈利：<span class="fc_green">{{moneyDate.ProfitLoss}}</span></p>
<p v-if="moneyDate.ProfitLoss==0">盈亏：<span class="fc_green">0</span></p>
</el-col>
</el-row>
</el-form>
......@@ -396,28 +396,28 @@ export default {
},
rules: {//表单必填验证
Alias: [
{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: 'blur' }
{ required: true, message: '请输入账户别名', trigger: 'blur' }
],
TypeId: [
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: 'change' }
{ required: true, message: '请选择账户类型', trigger: 'change' }
],Accountholder: [
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: 'blur' }
{ required: true, message: '请输入开户人', trigger: 'blur' }
],Openingbank: [
{ required: true, message: this.$t('rule.qsrkhuhang'), trigger: 'blur' }
{ required: true, message: '请输入开户行', trigger: 'blur' }
],BackNo: [
{ required: true, message: this.$t('rule.qssrzhhaoma'), trigger: 'blur' },
{pattern:/^[0-9]*$/, message: this.$t('rule.qsrzqdzhhaoma')}
{ required: true, message: '请输入账户号码', trigger: 'blur' },
{pattern:/^[0-9]*$/, message: '请输入正确的账户号码'}
],BranchIdS: [
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: 'change' }
{ required: true, message: '请选择所属公司', trigger: 'change' }
],CurrencyId: [
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: 'change' }
{ required: true, message: '请选择账户币种', trigger: 'change' }
],Initialbalance: [
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsdecimalAll, message: this.$t('rule.qsrzqdyue')}
{ required: true, message: '请输入初始余额', trigger: 'blur' },
{pattern: this.$commonUtils.Regex.el_IsdecimalAll, message: '请输入正确的余额'}
],OutCharge:[
{ required: true, message: this.$t('rule.szfzeren'), trigger: 'change' },
{ required: true, message: '支款负责人', trigger: 'change' },
],CostTypeID:[
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: 'change' },
{ required: true, message: '请选择费用类型', trigger: 'change' },
]
},
EmployeeMsg: {
......@@ -657,17 +657,16 @@ export default {
},err=>{})
},
financeinfoRemove(id,text){//删除 提示
this.$confirm(this.$t('tips.shifoudui')+'“'+text+'”'+ this.$t('tips.zhshanchu'),
this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
this.$confirm('是否对'+'“'+text+'”'+'账户进行销户操作？销户后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deletInstitutions(id)
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('tips.cancleDelete')
message: '已取消删除'
});
});
},
......
src/components/ShoppingStore/ShoppingDetails.vue
View file @ abd027d1
......@@ -13,6 +13,7 @@
height: 30px;
text-align: center;
line-height: 30px;
margin-right:30px;
}
.ShoppingDetails .backBtn {
float: right;
......@@ -51,14 +52,13 @@
height: 38px;
background-color: #ededed;
line-height: 38px;
min-width: 1400px;
}
.infoTitle span {
display: inline-block;
color: #000000;
font-family: PingFangSC-Semibold, sans-serif;
font-size: 12px;
width: 10%;
width: 12%;
text-align: center;
}
.listInfo {
......@@ -66,7 +66,6 @@
height: 50px;
background-color: #fff;
margin-bottom: 10px;
min-width: 1400px;
line-height: 50px;
font-size: 12px;
}
......@@ -76,7 +75,7 @@
}
.listInfo span {
display: inline-block;
width: 10%;
width: 12%;
text-align: center;
}
.travelProfit {
......@@ -153,21 +152,31 @@
background-color: #fff;
padding-top: 50px;
}
.Shop_span{
font-size:14px;
}
</style>
<template>
<div class='flexOne ShoppingDetails'>
<div class="dataIn clearfix">
<div class="storeName">{{Name}}</div>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板"/>
<span class="Shop_span">日期</span>
<el-date-picker class="w150" type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板" style="display:none;"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else value="列表"/>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
<input type="button" class="hollowFixedBtn backBtn" @click="getList()" value="查询"/>
</div>
<div class="listSpan">
<!-- <div class="listSpan">
<span>总交易额：<label class="ShopDetail_c1 fbold">{{TotalPrice}}</label></span>
<span>旅行社盈利：<label class="ShopDetail_c2 fbold">{{GroupExtract}}</label></span>
<span>导游盈利：<label class="ShopDetail_c3 fbold">{{GuideExtract}}</label></span>
<span>领队盈利：<label class="ShopDetail_c4 fbold">{{LeaderExtract}}</label></span>
</div>
</div> -->
<div class="mainInfo" :class="{'hidDiv':isShow}">
<div class="infoTitle">
<span>进店日期</span>
......@@ -176,32 +185,30 @@
<span>旅行社提成</span>
<span>导游提成</span>
<span>领队提成</span>
<span>操作人</span>
<span>币种</span>
<span>日期</span>
<span>返佣余额</span>
<span>返佣总计</span>
</div>
<div class="listInfo" v-for="item in DataList" :key="item.subCode">
<span>{{item.StoreTime}}</span>
<span>{{item.TCID}}</span>
<span class="totalPrice">
<label class="total ShopDetail_c1">￥{{item.NowTotalPrice}}</label>
<label class="littleTotal">（{{item.TotalPrice}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c1">￥{{getPrice(item.TotalMoney,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.TotalMoney}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c2">￥{{item.NowGroupExtract}}</label>
<label class="littleTotal">（{{item.GroupExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c2">￥{{getPrice(item.CompanyCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.CompanyCommission}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c3">￥{{item.NowGuideExtract}}</label>
<label class="littleTotal">（{{item.GuideExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c3">￥{{getPrice(item.GuideCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.GuideCommission}}*{{item.DMCRate}}）</label>
</span>
<span class="totalPrice">
<label class="total ShopDetail_c4">￥{{item.NowLeaderExtract}}</label>
<label class="littleTotal">（{{item.LeaderExtract}}*{{item.Rate}}）</label>
<label class="total ShopDetail_c4">￥{{getPrice(item.LeaderCommission,item.DMCRate)}}</label>
<label class="littleTotal">（{{item.LeaderCommission}}*{{item.DMCRate}}）</label>
</span>
<span>{{item.emName}}</span>
<span>{{item.currencyName}}</span>
<span>{{item.UpdateDate}}</span>
<span>{{item.OtherDeduct}}</span>
<span>{{item.BackTotalMoney}}</span>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
......@@ -241,7 +248,9 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
ShoppingID: ""
ShopId: "",
StartDate:'',
EndDate:''
},
noData: false,
loading: true,
......@@ -269,27 +278,40 @@ export default {
DayGroupExtract: [],
DayGuideExtract: [],
DayLeaderExtract: [],
DaydataZoom: []
DaydataZoom: [],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate)
return startTime.getTime() >= time.getTime()
}
}
};
},
methods: {
getList() {
this.loading = true;
this.apipost(
"ShoppingInfo_Post_GetPageList",
"ShoppingInfo_Post_GetPriceShopDetailsPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.loading = false;
if (res.data.data.count > 0) {
this.total = res.data.data.count;
this.noData = false;
this.DataList = res.data.data.pageData;
} else {
this.noData = true;
}
} else {
this.loading = false;
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
}else{
this.Error(res.data.message);
}
},
err => {}
......@@ -490,10 +512,14 @@ export default {
};
myChart.clear();
myChart.setOption(option2);
},
//乘以获得2位小数
getPrice(x,y){
return (x*y).toFixed(2);
}
},
mounted() {
this.msg.ShoppingID = this.$route.query.id;
this.msg.ShopId = this.$route.query.id;
this.Name = this.$route.query.Name;
this.TotalPrice = this.$route.query.TotalPrice;
this.GroupExtract = this.$route.query.GroupExtract;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ abd027d1
......@@ -631,6 +631,8 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)" style="display:none;">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
B2B预览
</el-dropdown-item>
......@@ -1221,6 +1223,16 @@
})
window.open(routeData.href, '_blank')
},
goSureOrder(path,TCID){
this.$router.push({
name: path,
query: {
TCID: TCID,
blank: 'y',
tab: '收入确认单'
}
})
},
goUrlMake(path, LineID, TCID, name) {
this.$router.push({
name: path,
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue 0 → 100644
View file @ abd027d1
<style>
.priceIncomeTable{
width:1200px;
border-collapse:collapse;
font-size:14px;
}
.priceIncomeTable td{
border: 1px solid #dcdfe6;
height:34px;
background-color: #fff;
text-align: center;
}
.priceComtd{
background: #e6e6e6!important;
}
.princeOrderSpan{
margin-right:10px;
display: inline-block;
}
.PriceRemark{
width:100%;
min-height: 100px;
padding:10px;
font-size: 14px;
background-color: #fff;
}
.leftRemarkTitle{
float:left;
width:5%;
text-align: right;
}
.rightRemarkContent{
float:left;
width:95%;
}
</style>
<template>
<div>
<table class="singeRowTable">
<tr>
<th colspan="10">团队收入确认单</th>
</tr>
<tr>
<th>部门</th>
<th width="250">单号</th>
<th width="180">团号</th>
<th>团队编号</th>
<th>人数</th>
<th width="100">领队</th>
<th>团费收入合计</th>
<th>直客收入</th>
<th>同行交客收入</th>
<th>平台收入</th>
</tr>
<tr>
<td>{{dataList.DepartmentName}}</td>
<td>
<span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
</td>
<td>{{dataList.TCNUM}}</td>
<td>{{dataList.TCID}}</td>
<td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td>
<td>{{dataList.TotalIncome}}</td>
<td>{{dataList.DirectGuestIncome}}</td>
<td>{{dataList.PlatformGuestIncome}}</td>
<td>{{dataList.PlatformIncome}}</td>
</tr>
</table>
<div class="PriceRemark clearfix">
<div class="leftRemarkTitle">备注：</div>
<div class="rightRemarkContent">{{dataList.Remark}} </div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
loading:false,
msg: {
tcid:''
},
dataList:[],
};
},
methods: {
getList() {
//获取数据
this.loading=true;
this.apipost(
"travel_post_GetPriceIncomeConfirmInfo",
this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'data');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
},
mounted() {
this.msg.tcid = this.$route.query.TCID;
this.getList();
}
};
</script>
src/components/systemManagement/lineManagement.vue
View file @ abd027d1
<style>
.lineMG .query_box {
.lineManagement .query_box {
font-size: 12px;
padding: 29px 0;
padding-right: 30px;
......@@ -7,22 +7,22 @@
justify-content: space-between;
}
.lineMG .el-switch.is-checked .el-switch__core {
.lineManagement .el-switch.is-checked .el-switch__core {
border-color: #4bca81;
background-color: #4bca81;
}
.lineMG .addCompany {
.lineManagement .addCompany {
width: 440px;
max-height: 600px;
}
.lineMG .addCompany .el-dialog__body {
.lineManagement .addCompany .el-dialog__body {
height: 486px;
overflow: auto;
}
.lineMG .query_box div label {
.lineManagement .query_box div label {
display: inline-block;
min-width: 80px;
text-align: right;
......@@ -39,7 +39,7 @@ input[type="number"] {
-moz-appearance: textfield;
}
.lineType {
.lineManagement .lineType {
width: 51px;
height: 24px;
display: inline-block;
......@@ -49,7 +49,7 @@ input[type="number"] {
background-color: #ff9c00;
color: #ffffff;
}
.lineMG .LMTable tr {
.lineManagement .LMTable tr {
height: 70px;
text-align: center !important;
background-color: #fff;
......@@ -68,9 +68,7 @@ input[type="number"] {
.comPanyNum:hover {
color: #e95252;
}
.zhicai:first-child {
}
.zhicai {
.Linezhicai {
color: #47bf8c;
}
......@@ -115,21 +113,21 @@ input[type="number"] {
padding: 9px 15px;
}
.LineName {
.lineManagement .LineName {
display: inline-block;
width: 120px;
margin: 0 0 0 20px;
text-align: left;
}
.lineMG .LM_Back {
.lineManagement .LM_Back {
background-color: #f2f2f2;
}
.redType {
color: #e95252;
}
.lineMG .tbDiv {
.lineManagement .tbDiv {
overflow-y: auto;
}
......@@ -139,18 +137,18 @@ input[type="number"] {
overflow-y: auto;
}
.lineMG .tbDiv::-webkit-scrollbar {
.lineManagement .tbDiv::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.lineMG .tbDiv::-webkit-scrollbar-track {
.lineManagement .tbDiv::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.lineMG .tbDiv::-webkit-scrollbar-thumb {
.lineManagement .tbDiv::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
......@@ -176,11 +174,11 @@ input[type="number"] {
width: 100%;
font-size: 12px;
}
.lineMG .LMTable tr th {
.lineManagement .LMTable tr th {
border-bottom: 1px solid #d1d1d1;
}
.lineMG .tbDiv .LMTable td {
.lineManagement .tbDiv .LMTable td {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
position: relative;
......@@ -189,7 +187,7 @@ input[type="number"] {
min-width: 250px;
}
.lineMG .tbDiv table {
.lineManagement .tbDiv table {
padding-right: 80px;
margin-top: 10px;
border-top: 1px solid #d1d1d1;
......@@ -215,7 +213,7 @@ input[type="number"] {
position: relative;
top: 3px;
}
.lineMG ._addLineTB tr {
.lineManagement ._addLineTB tr {
height: 40px !important;
}
.saveCompanyBtn {
......@@ -229,12 +227,12 @@ input[type="number"] {
right: 13px;
top: 32%;
}
._LMComdiv {
.lineManagement ._LMComdiv {
float: left;
width: 32%;
text-align: left;
}
.LineRank {
.lineManagement .LineRank {
width: 24px;
height: 24px;
background-color: #2aaef2;
......@@ -244,30 +242,30 @@ input[type="number"] {
color: #fff;
margin: 0 auto 5px;
}
.lineMG .joinDepart {
.lineManagement .joinDepart {
display: inline-block;
margin-right: 50px;
text-align: left;
float: left;
width: 180px;
}
.lineMG .LM_Rank {
.lineManagement .LM_Rank {
text-align: center;
}
._LowDisMoney {
.lineManagement ._LowDisMoney {
width: 200px;
float: left;
text-align: left;
margin: 0 0 0 20px;
}
.LM_Btcontent {
.lineManagement .LM_Btcontent {
position: absolute;
right:100px;
top:10px;
text-align: right;
margin-left: 20px;
}
.LM_ul li {
.lineManagement .LM_ul li {
/*height: 78px;*/
margin: 20px 0 0px 0px;
transition: linear all 0.5s;
......@@ -278,18 +276,16 @@ input[type="number"] {
position: relative;
padding: 10px 0;
}
.LM_BTNList {
}
.lineMG .el-button-group .el-button {
.lineManagement .el-button-group .el-button {
padding: 5px;
}
.lineMG .LM_ul > li:hover {
.lineManagement .LM_ul > li:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
</style>
<template>
<div class="flexOne lineMG">
<div class="flexOne lineManagement">
<div class="query-box">
<ul>
<li>
......@@ -300,13 +296,13 @@ input[type="number"] {
</li>
<li>
<span>
<em>线路简称</em>
<em>{{$t('Operation.Op_ShortName')}}</em>
<el-input v-model="msg.lineShortName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<span>
<em>线路代码</em>
<em>{{$t('system.ph_xianluCode')}}</em>
<el-input v-model="msg.lineCode" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
......@@ -329,23 +325,29 @@ input[type="number"] {
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>简称</div>
<div>{{$t('Operation.Op_sname')}}</div>
{{item.lineShortName}}
</div>
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>{{item.lowDeposit}}</div>
<div>最低定金金额</div>
<div>{{$t('Operation.Op_depositAmount')}}</div>
</div>
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>{{item.lineDirection==1?'入境':'出境'}}</div>
<div>线路方向</div>
</div>
</el-col>
<el-col :span="3">
<div class="LineRank">{{item.discountDayNum}}</div>
<div class="LM_Rank">早鸟优惠天数</div>
<div class="LM_Rank">{{$t('Operation.Op_EarlybirdDay')}}</div>
</el-col>
<el-col :span="3">
<div class="LineRank">{{item.rank}}</div>
<div class="LM_Rank">排序</div>
<div class="LM_Rank">{{$t('system.table_rank')}}</div>
</el-col>
<el-col :span="5">
<div class="_LMComdiv">
......@@ -356,8 +358,8 @@ input[type="number"] {
<div class="departListDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th>公司</th>
<th>损失分摊比列</th>
<th>{{$t('system.table_company')}}</th>
<th>{{$t('Operation.Op_LossAllocation')}}</th>
</tr>
<tr v-for="childItem in departCompany" :key="childItem.subCode">
<td width="60%">{{childItem.companyName}}</td>
......@@ -367,7 +369,7 @@ input[type="number"] {
</div>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,1)">{{item.branchCount}}</span>
</el-popover>
<div class="particCompany">参与公司</div>
<div class="particCompany">{{$t('Operation.Op_partInCompany')}}</div>
</div>
<div class="_LMComdiv">
<el-popover
......@@ -377,8 +379,8 @@ input[type="number"] {
<div class="departListDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th width="40%">公司</th>
<th width="60%">部门</th>
<th width="40%">{{$t('system.table_company')}}</th>
<th width="60%">{{$t('admin.admin_Department')}}</th>
</tr>
<tr v-for="childItem in departDepartment" :key="childItem.subCode">
<td>{{childItem.companyName}}</td>
......@@ -386,18 +388,18 @@ input[type="number"] {
</tr>
</table>
</div>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,2)">点击查看</span>
<span slot="reference" class="comPanyNum" @click="getLossCompany(item.lineID,2)">{{$t('pub.clickToView')}}</span>
</el-popover>
<div class="particCompany">所属部门</div>
<div class="particCompany">{{$t('Operation.Op_belongDepartment')}}</div>
</div>
</el-col>
<el-col :span="2">
<div class="zhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
<div class="zhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
<div class="zhicai" :class="{'redType':item.is_PacketGroup=='0'}">{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
<div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
<div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
<div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
</el-col>
<el-col :span="2">
<div class="LM_BTNList">
<div>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit" @click="isShowDIv = true,divTitle='修改线路',updateData(index)"></el-button>
......@@ -423,22 +425,22 @@ input[type="number"] {
<div class="">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-col :span="5">
<el-form-item label="线路名称" prop="lineName">
<el-input v-model="addMsg.lineName" maxlength="20"></el-input>
<el-form-item :label="$t('system.query_lineName')" prop="lineName">
<el-input v-model="addMsg.lineName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路简称" prop="lineShortName">
<el-input v-model="addMsg.lineShortName" maxlength="5"></el-input>
<el-form-item :label="$t('Operation.Op_ShortName')" prop="lineShortName">
<el-input v-model="addMsg.lineShortName"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路编码" prop="lineCode">
<el-input v-model="addMsg.lineCode" maxlength="3"></el-input>
<el-form-item :label="$t('system.table_lineCode')" prop="lineCode">
<el-input v-model="addMsg.lineCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="关联国家" style="display:none;">
<el-form-item :label="$t('Operation.Op_CombinedContry')" style="display:none;">
<el-select v-model="lineCountryArr" class='multiple_input' multiple :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in countryList"
......@@ -450,47 +452,55 @@ input[type="number"] {
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="最低定金" prop="lowDeposit">
<el-form-item :label="$t('Operation.Op_lowDeposit')" prop="lowDeposit">
<el-input v-model="addMsg.lowDeposit" maxlength="10" @keyup.native="checkPrice(addMsg,'lowDeposit')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="优惠天数">
<el-form-item :label="$t('Operation.Op_preferentialDays')">
<el-input v-model="addMsg.discountDayNum" maxlength="3" @keyup.native="checkInteger(addMsg,'discountDayNum')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="排序">
<el-form-item :label="$t('system.table_rank')">
<el-input v-model="addMsg.Rank" @keyup.native="checkInteger(addMsg,'Rank')"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="是否直采">
<el-form-item :label="$t('Operation.Op_isDirect')">
<el-switch v-model="addMsg.isDirect" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="是否显示">
<el-form-item :label="$t('system.table_isShow')">
<el-switch v-model="addMsg.isShow" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="是否共享">
<el-form-item :label="$t('Operation.Op_isShared')">
<el-switch v-model="addMsg.IsShare" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="允许小包团">
<el-form-item :label="$t('Operation.Op_AllowSmallGroup')">
<el-switch v-model="addMsg.Is_PacketGroup" :active-value="isDefaultChecked"
:inactive-value="isDefaultUnchecked"></el-switch>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路方向" prop="LineDirection">
<el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
<el-option label='入境' :value='1'></el-option>
<el-option label='出境' :value='2'></el-option>
</el-select>
</el-form-item>
</el-col>
<div class="LM_Btcontent">
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存"/>
<input type="button" class="hollowFixedBtn" @click="isShowDIv=false" value="取消"/>
<input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')"/>
<input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')"/>
</div>
</el-form>
</div>
......@@ -498,26 +508,26 @@ input[type="number"] {
<div class="managebtmDiv tbDiv" v-if="isShowTwo">
<table class="LMTable _addLineTB" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>项目/公司</th>
<th>{{$t('Operation.Op_Project')}}/{{$t('system.table_company')}}</th>
<th v-for="item in getCompanyList" :key="item.subCode">{{item.companyName}}</th>
</tr>
<tr>
<td class="LM_Back">损失分摊比例</td>
<td class="LM_Back">{{$t('Operation.Op_LossAllocation')}}</td>
<td v-for="item in getCompanyList" :key="item.subCode">
<span v-if="!item.inputShow">{{item.lossAllocation}}</span>
<input type="text" v-model="item.lossAllocation" @blur="setInput(item)"
onkeyup="value=value.replace(/[^\d]/g,'')" class="w80" v-if="item.inputShow"/>
<span v-if="item.lossAllocation!=null">%</span>
<span class="upFentan" v-if="item.lossAllocation>=0&&!item.showSet&&item.selectDepIdArr.length>0"
@click="displayInput(item)">修改</span>
@click="displayInput(item)">{{$t('pub.updateMsg')}}</span>
<div v-if="item.showSet&&item.selectDepIdArr.length>0">
<span>未参与</span>
<span @click="clickedSet(item)" class="setItem">设置</span>
<span>{{$t('Operation.Op_notInvoled')}}</span>
<span @click="clickedSet(item)" class="setItem">{{$t('leader.leader_Set')}}</span>
</div>
</td>
</tr>
<tr>
<td v-on:click='closeDepOption()' class="LM_Back">管理部门</td>
<td v-on:click='closeDepOption()' class="LM_Back">{{$t('Operation.Op_ManageDepartment')}}</td>
<td v-on:click='closeDepOption(item)' v-for="item in getCompanyList" :key="item.subCode">
<span class="joinDepart" v-if="!item.seletShow">{{item.joinDepartment | getJoinDepName}}</span>
<el-select v-model="item.selectDepIdArr" multiple class='w160 multiple_input' filterable
......@@ -531,16 +541,16 @@ input[type="number"] {
</el-option>
</el-select>
<span class="upFentan" v-if="item.selectDepIdArr.length>0"
@click.stop="getSelectList(item,item.rB_Branch_id)">修改</span>
@click.stop="getSelectList(item,item.rB_Branch_id)">{{$t('pub.updateMsg')}}</span>
<div v-if="item.showSelectSet">
<span class="joinDepart">未参与</span>
<span @click.stop="clickedSelectSet(item)" class="setItem">设置</span>
<span class="joinDepart">{{$t('Operation.Op_notInvoled')}}</span>
<span @click.stop="clickedSelectSet(item)" class="setItem">{{$t('leader.leader_Set')}}</span>
</div>
</td>
</tr>
</table>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" value="保存"/>
<input type="button" class="normalBtn" @click="isShowTwo=false" value="取消"/>
<input type="button" class="normalBtn saveCompanyBtn" @click="saveCompany()" :value="$t('pub.saveBtn')"/>
<input type="button" class="normalBtn" @click="isShowTwo=false" :value="$t('pub.cancelBtn')"/>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
......@@ -572,6 +582,7 @@ export default {
lineShortName: "",
IsShare: 0,
Is_PacketGroup: 0,
LineDirection:2,
},
departCompany: "",
departDepartment: "",
......@@ -604,6 +615,9 @@ export default {
],
lineShortName: [
{ required: true, message: "请填线路简称", trigger: "change" }
],
LineDirection:[
{ required: true, message: "请选择线路方向", trigger: "change" }
]
}
};
......@@ -693,7 +707,6 @@ export default {
this.lineCountryArr = [];
var getInfo = this.DataList[index];
// console.log(getInfo)
this.addMsg.lineName = getInfo.lineName;
this.addMsg.lineCode = getInfo.lineCode;
this.addMsg.lineShortName = getInfo.lineShortName;
......@@ -708,6 +721,7 @@ export default {
this.addMsg.discountDayNum = getInfo.discountDayNum;
this.addMsg.IsShare = getInfo.isShare;
this.addMsg.Is_PacketGroup = getInfo.is_PacketGroup;
this.addMsg.LineDirection = getInfo.lineDirection;
},
deletelist(lineID) {
var that = this;
......@@ -859,6 +873,7 @@ export default {
IsShare: 0,
lineCountryList: [],
Is_PacketGroup: 0,
LineDirection:2,
};
this.lineCountryArr = [];
},
......
src/router/config.js
View file @ abd027d1
......@@ -1427,6 +1427,14 @@ export default {
title: '团控列表'
},
},
{
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo',
component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve),
meta: {
title: '收入确认单'
},
},
{
//团控列表 自主开团
path: '/TravelControlListSale',
......
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