Skip to content

V
vue-gjjs
Commit 8c86cb04 by zhanghou
Options

提交fee的修改版本

parent ecf73b73
Showing with 173 additions and 66 deletions
src/config/CodeTable/index.js
...@@ -7752,6 +7752,120 @@ const CodeTable = { ...@@ -7752,6 +7752,120 @@ const CodeTable = {
{ label: "Various correspondence charges", value: "CROC" }, { label: "Various correspondence charges", value: "CROC" },
{ label: "Guarantee comission", value: "GIC" }, { label: "Guarantee comission", value: "GIC" },
], ],
feecod3: [
{ label: '', value: '' },
{ label: '', value: '' },
{ label: '', value: '' },
{ label: 'ADVAME', value: '出口信用证修改通知费' },
{ label: 'ADVFEE', value: '信用证通知费转递费' },
{ label: 'AMECCV', value: '进口信用证修改费' },
{ label: 'AMEFEE', value: '进口信用证修改费' },
{ label: 'ATIFEE', value: '境内汇入汇款手续费' },
{ label: 'ATOFEE', value: '境内汇出汇款手续费' },
{ label: 'BACOM', value: '进口信用证承兑费' },
{ label: 'BFINT', value: '偿付手续费(停用)' },
{ label: 'CANFEE', value: '进口信用证撤销手续费' },
{ label: 'CCFEE', value: '光票托收手续费' },
{ label: 'CEFEE', value: '出口托收手续费' },
{ label: 'CIFEE', value: '进口代收手续费' },
{ label: 'CNFFEE', value: '进口信用证保兑手续费' },
{ label: 'COFEE', value: '出口信用证保兑费' },
{ label: 'COLAME', value: '托收修改手续费' },
{ label: 'CPIFEE', value: '汇入汇款手续费' },
{ label: 'CPOFEE', value: '汇出汇款手续费' },
{ label: 'DADVAM', value: '国内信用证修改通知手续费' },
{ label: 'DADVFE', value: '国内信用证通知手续费' },
{ label: 'DAMEFE', value: '国内信用证修改手续费' },
{ label: 'DBACOM', value: '国内信用证承付手续费' },
{ label: 'DCANFE', value: '国内信用证注销手续费' },
{ label: 'DDHL11', value: '普通业务国内快邮费' },
{ label: 'DDISCR', value: '国内信用证不符点处理费' },
{ label: 'DFFFEE', value: '同业代付风险参与手续费(停用)' },
{ label: 'DHL01', value: '境外快邮费' },
{ label: 'DHL02', value: '境外快邮费' },
{ label: 'DHL03', value: '境外快邮费' },
{ label: 'DHL04', value: '境外快邮费' },
{ label: 'DHL05', value: '境外快邮费' },
{ label: 'DHL06', value: '境外快邮费' },
{ label: 'DHL07', value: '境外快邮费' },
{ label: 'DHL08', value: '境外快邮费' },
{ label: 'DHL09', value: '境外快邮费' },
{ label: 'DHL10', value: '境外快邮费' },
{ label: 'DINFEE', value: '贸金顾问咨询手续费' },
{ label: 'DISCOM', value: '国内信用证开立手续费' },
{ label: 'DISCRE', value: '不符点手续费' },
{ label: 'DJYFEE', value: '代加押手续费' },
{ label: 'DMJFEE', value: '票据转卖收入(国内证)(停用)' },
{ label: 'DPOST', value: '普通业务国内平邮费' },
{ label: 'DPRECK', value: '国内信用证议付&单手续费' },
{ label: 'DSENBK', value: '国内信用证退单手续费' },
{ label: 'DTELEX', value: '国内信用证电讯费' },
{ label: 'FFTDOM', value: '国内福费庭业务手续费' },
{ label: 'FFTDRF', value: '国内福费庭风险承担费已停用]' },
{ label: 'FFTFEE', value: '国际福费庭业务手续费' },
{ label: 'FFTRSK', value: '国际福费庭风险承担费' },
{ label: 'FOGFEE', value: '贸易融资额度管理费' },
{ label: 'FORINT', value: '国外利息(停用)' },
{ label: 'FREPAY', value: '无偿交单手续费' },
{ label: 'GACOM', value: '保函开立手续费' },
{ label: 'GECRQ', value: '保函代索赔手续费' },
{ label: 'GETAMC', value: '保函保兑手续费' },
{ label: 'GETAME', value: '保函修改通知费' },
{ label: 'GETOPN', value: '保函通知手续费' },
{ label: 'GlAME', value: '保函修改手续费' },
{ label: 'GlAME1', value: '保函修改手续费' },
{ label: 'GIAME2', value: '保函修改手续费' },
{ label: 'GlAME3', value: '保函修改手续费' },
{ label: 'GlAME4', value: '保函修改手续费' },
{ label: 'GIAME5', value: '保函修改手续费' },
{ label: 'GIAME6', value: '保函修改手续费' },
{ label: 'GIAME7', value: '保函修改手续费' },
{ label: 'GlAME8', value: '保函修改手续费' },
{ label: 'GIAME9', value: '保函修改手续费' },
{ label: 'GIFEE4', value: '保函开立手续费(停用)' },
{ label: 'GIOPN1', value: '保函开立手续费' },
{ label: 'GIOPN2', value: '保函开立手续费' },
{ label: 'GIOPN3', value: '保函开立手续费' },
{ label: 'GIOPN4', value: '保函开立手续费' },
{ label: 'GIOPN5', value: '保函开立手续费' },
{ label: 'GIOPN6', value: '转开保函手续费' },
{ label: 'GIOPN7', value: '保函开立手续费' },
{ label: 'GIOPN8', value: '信贷证明手续费' },
{ label: 'GIOPN9', value: '预开银关保函手续费' },
{ label: 'GIOTH', value: '保函代审核及其他手续费' },
{ label: 'GPGFEE', value: '货押北务管理费' },
{ label: 'GYLFEE', value: '供应链融资手续费（停用)' },
{ label: 'HTEMIN', value: '十个月浮动利息' },
{ label: 'HYJFEE', value: '代核印鉴手续费' },
{ label: 'ISSCCV', value: '进口信用证开证手续费' },
{ label: 'ISSCOM', value: '进口信用证开证手续费' },
{ label: 'LCRETU', value: '进口代收退单手续费' },
{ label: 'LSBFEE', value: '贸金业务额度管理费' },
{ label: 'MORFE2', value: '商通赢手续费' },
{ label: 'MORFE3', value: '保兑仓手续费' },
{ label: 'MORFEE', value: '保付加签手续费' },
{ label: 'NONEXC', value: '无兑换手续费《停用)' },
{ label: 'OTHER', value: '查询费其他费用' },
{ label: 'OTMFEE', value: '其他国内贸金结算手续费' },
{ label: 'PCINT', value: '同业代付手续费' },
{ label: 'POST', value: '普通业务国外平邮费' },
{ label: 'PREADY', value: '出口信用证预通知手续费' },
{ label: 'PRECHK', value: '出口信用证议付/验单手续费' },
{ label: 'REPFEE', value: '汇款止付/修改/退汇手续费' },
{ label: 'SENBAK', value: '进口信用证退单手续费' },
{ label: 'SGDFEE', value: '提货担保手续费' },
{ label: 'TELEX', value: '境外电讯费' },
{ label: 'TELEXH', value: '境外电讯费(开立)' },
{ label: 'TELEXJ', value: '境内电讯费' },
{ label: 'TFINT', value: '票据转卖收入《停用)' },
{ label: 'TRAFEE', value: '转汇手续费' },
{ label: 'TRANSF', value: '出口信用证转让手续费' },
{ label: 'URPINT', value: '第三方风险参货' },
{ label: 'UUFEE', value: '托收退票/退单/撤销手续费' },
{ label: 'cpifee', value: '境外汇入汇款手续费' },
{ label: 'cpofee', value: '境外汇出汇款手续费' },
{ label: 'preadv', value: '出口信用证预通知手续费(停用)' },
],
} }
export default CodeTable; export default CodeTable;
src/views/Statics/Dbifee/FeeInfo.vue
...@@ -2,110 +2,115 @@ ...@@ -2,110 +2,115 @@
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="12" class="col-left"> <c-col :span="12" class="col-left">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Code" prop="cod"> <el-form-item label="费用代码" prop="cod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.cod" v-model="model.cod"
placeholder="请选择Fee Code" placeholder="请选择费用代码"
:code="getCodesByKey('fepfeecod')" :code="getCodesByKey('feecod3')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Relevant Amount" prop="reltir"> <el-form-item label="相关金额类型" prop="reltir">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.reltir" v-model="model.reltir"
placeholder="请选择Relevant Amount" placeholder="请选择相关金额类型"
:code="getCodesByKey('calcbs')" :code="getCodesByKey('calcbs')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="SWIFT Code" prop="sftcod"> <el-form-item label="SWIFT报文描述" prop="sftcod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.sftcod" v-model="model.sftcod"
placeholder="请选择SWIFT Code" placeholder="请选择SWIFT报文类型"
:code="getCodesByKey('swtcod')" :code="getCodesByKey('swtcod')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Code for DTA Messages" prop="dtacod"> <el-form-item label="DTA报文中的费用代码" prop="dtacod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.dtacod" v-model="model.dtacod"
placeholder="请选择Fee Code for DTA Messages" placeholder="请选择DTA报文中的费用代码"
:code="getCodesByKey('dtacod')" :code="getCodesByKey('dtacod')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Booking Type" prop="staflg"> <el-form-item label="统计标志" prop="staflg">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.staflg" v-model="model.staflg"
placeholder="请选择Booking Type" placeholder="请选择统计标志"
:code="getCodesByKey('staflgFee')" :code="getCodesByKey('staflgFee')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.incflg" >Income</c-checkbox> <c-checkbox v-model="model.incflg" >收入</c-checkbox>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Payer(Deafult) " prop="rol"> <el-form-item label="支付此费用的默认角色" prop="rol">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.rol" v-model="model.rol"
placeholder="请选择Fee Payer(Deafult)" placeholder="请选择支付此费用的角色"
:code="getCodesByKey('rol')" :code="getCodesByKey('rol')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Account" prop="acc"> <el-form-item label="账号" prop="acc">
<c-input v-model="model.acc" placeholder="请输入Account"> </c-input> <c-input v-model="model.acc" placeholder="请输入账号"> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="12" class="col-right"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.dscmodflg">Modification of Description Allowed in Settlement</c-checkbox> <c-checkbox v-model="model.dscmodflg">结算中允许修改描述</c-checkbox>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="accruing Account" prop="accacr"> <el-form-item label="循环收费账号" prop="accacr">
<c-input v-model="model.accacr" placeholder="请输入accruing Account"> <c-input v-model="model.accacr" placeholder="请输入循环收费账号">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Usable in" prop="reltrn"> <el-form-item label="有关交易及业务部门" prop="reltrn">
<c-input v-model="model.reltrn" maxlength="40" placeholder="请输入Relevant Transaction and Business Sector"></c-input> <c-input v-model="model.reltrn" maxlength="40" placeholder="请输入有关交易及业务部门"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Begin Date" prop="begdat"> <el-form-item label="开始日期" prop="begdat">
<c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择Begin Date"></c-date-picker> <c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择开始日期"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="End Date" prop="enddat"> <el-form-item label="结束日期" prop="enddat">
<c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择End Date"></c-date-picker> <c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择结束日期"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Group Code" prop="grpcod"> <el-form-item label="费用分组" prop="grpcod">
<c-select v-model="model.grpcod" style="width:100%" placeholder="请选择Group Code"> <c-select
v-model="model.grpcod"
style="width:100%"
placeholder="请选择费用的组"
:code="getCodesByKey('grpcod')"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -120,8 +125,8 @@ ...@@ -120,8 +125,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Tax Account" prop="taxacc"> <el-form-item label="传真账号" prop="taxacc">
<c-input v-model="model.taxacc" maxlength="34" placeholder="请输入Tax Account"></c-input> <c-input v-model="model.taxacc" maxlength="34" placeholder="请输入传真账号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Statics/Inffee/Infsea.vue
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<c-col :span="12" class="col-left"> <c-col :span="12" class="col-left">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="FeeCode" prop="cod"> <el-form-item label="费用代码" prop="cod">
<c-input <c-input
v-model="model.cod" v-model="model.cod"
placeholder="请输入FeeCode" placeholder="请输入费用代码"
style="width: 100%" style="width: 100%"
> >
</c-input> </c-input>
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<c-col :span="12" class="col-right"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Description" prop="nam"> <el-form-item label="名称" prop="nam">
<c-input <c-input
v-model="model.nam" v-model="model.nam"
placeholder="请输入Description" placeholder="请输入名称"
style="width: 100%" style="width: 100%"
> >
</c-input> </c-input>
...@@ -111,14 +111,14 @@ export default { ...@@ -111,14 +111,14 @@ export default {
return { return {
feeData: [], feeData: [],
feeColumns: [ feeColumns: [
{ label: 'Fee Code', prop: 'cod', width: '120' }, { label: '费用代码', prop: 'cod', width: '120' },
{ label: 'Description', prop: 'descrp', width: '120' }, { label: '名称', prop: 'descrp', width: '120' },
{ label: 'Relevant Amount', prop: 'reltir', width: '150' }, { label: '相关金额类型', prop: 'reltir', width: '150' },
{ label: 'SWIFT COD', prop: 'sftcod', width: '150' }, { label: 'SWIFT报文描述', prop: 'sftcod', width: '150' },
{ label: 'DTA COD', prop: 'dtacod', width: '150' }, { label: 'DTA报文中的费用代码', prop: 'dtacod', width: '170' },
{ label: 'Booking Type', prop: 'staflg', width: '150' }, { label: '统计标志', prop: 'staflg', width: '120' },
{ label: 'Fee Payer(Deafult)', prop: 'rol', width: '170' }, { label: '支付此费用的默认角色', prop: 'rol', width: '170' },
{ label: 'Account', prop: 'acc', width: '120' } { label: '账号', prop: 'acc', width: '120' }
], ],
}; };
}, },
...@@ -146,12 +146,20 @@ export default { ...@@ -146,12 +146,20 @@ export default {
map.set(objectArr[i].value,objectArr[i].label); map.set(objectArr[i].value,objectArr[i].label);
} }
var feeList = []; var feeList = [];
if(!this.model.cod&&this.model.nam){
for(var fee of map){
if(fee[1].includes(this.model.nam)){
feeList.push(fee[0])
}
}
}
if(this.model.cod&&this.model.nam){
for(var fee of map){ for(var fee of map){
console.log(fee[0])
if(fee[0].includes(this.model.cod)&&fee[1].includes(this.model.nam)){ if(fee[0].includes(this.model.cod)&&fee[1].includes(this.model.nam)){
feeList.push(fee[0]) feeList.push(fee[0])
} }
} }
}
this.model.feelist = feeList; this.model.feelist = feeList;
console.log(this.model) console.log(this.model)
queryByPage(this.model).then(res => { queryByPage(this.model).then(res => {
...@@ -161,25 +169,6 @@ export default { ...@@ -161,25 +169,6 @@ export default {
* total: 69 * total: 69
* totalPage: 0 * totalPage: 0
*/ */
// const objectArr = codes['fepfeecod'];
// const feeCodeArr = new Array();
// for (let i = 0; i < objectArr.length; i++) {
// let descrp = objectArr[i].label;
// if(descrp.includes(this.model.nam)){
// feeCodeArr.push(objectArr[i].value);
// }
// }
// const feecod = feeCodeArr;
// const list = res.list;
// const list2 = [];
// for (let i = 0; i < list.length; i++) {
// for (let j = 0; j < feecod.length; j++) {
// if(cod.includes(feecod[j])){
// debugger
// list2.push(list[i]);
// }
// }
// }
const list = res.list; const list = res.list;
this.feeData = list; this.feeData = list;
for(let i =0;i<list.length;i++){ for(let i =0;i<list.length;i++){
...@@ -188,6 +177,7 @@ export default { ...@@ -188,6 +177,7 @@ export default {
this.model.pageNum = res.pageNumber this.model.pageNum = res.pageNumber
this.model.pageSize = res.pageSize this.model.pageSize = res.pageSize
this.model.total = res.total this.model.total = res.total
this.model.feelist=[];
}) })
}, },
queryFunc(pageNumber, pageSize) { queryFunc(pageNumber, pageSize) {
......
src/views/Statics/Inffee/index.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
import Infsea from "./Infsea"; import Infsea from "./Infsea";
export default { export default {
name: "StaticsInffec", name: "StaticsInffee",
components: { components: {
"m-infsea": Infsea, "m-infsea": Infsea,
}, },
...@@ -38,10 +38,8 @@ export default { ...@@ -38,10 +38,8 @@ export default {
return { return {
tabVal: "infsea", tabVal: "infsea",
model: { model: {
codfee:"", cod:"",
feepri:"!", nam:"",
objtyp:"",
// paging
pageNum: 1, pageNum: 1,
pageSize: 5, pageSize: 5,
total: 0 total: 0
......
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