Skip to content

V
vue-gjjs
Commit 0319d7af by wangna
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 2f97628a 415206f1
Showing with 200 additions and 177 deletions
src/components/HighlightContent.vue
......@@ -65,7 +65,7 @@ export default {
/* overflow: hidden; */
border: 1px solid rgba(0,0,0,0);
border-radius: 5px;
margin: -1px;
/* margin: -1px; */
}
.c-highlight-content.change-light {
border: 1px solid rgb(201, 171, 1);
......
src/config/CodeTable/index.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/Business/Fctopn/Opnp1.vue
<template>
<div class="eibs-tab">
<c-col :span="24">
<c-col :span="12">
<c-col :span="12" style="padding-right: 20px;">
<c-col :span="24">
<c-fullbox>
<el-form-item label="申请人" prop="fcdgrp.apl.pts.extkey">
......@@ -21,111 +21,101 @@
</template>
</c-fullbox>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="fcdgrp.apl.pts.nam">
<c-input
v-model="model.fcdgrp.apl.pts.nam"
maxlength="40"
placeholder="请输入"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="fcdgrp.apl.pta.nam1">
<c-input
v-model="model.fcdgrp.apl.pta.nam1"
maxlength="40"
placeholder="请输入Externally Visible Name of Address"
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="" prop="aplp.ptsget.sdamod.seainf">
<c-input v-model="model.aplp.ptsget.sdamod.seainf" placeholder="请输入"></c-input>
</el-form-item>
</c-col> -->
<el-form-item label="" prop="fcdgrp.apl.pts.nam">
<c-input
v-model="model.fcdgrp.apl.pts.nam"
maxlength="40"
placeholder="请输入"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<c-col :span="14">
<el-form-item label="保证金账号" prop="cashacc">
<!-- <c-select
v-model="model.cashacc"
style="width: 100%"
placeholder="请选择account"
>
</c-select> -->
<c-input
v-model="model.cashacc"
placeholder="请选择account"
></c-input>
</el-form-item>
</c-col>
<c-col :span="10">
<el-form-item label="科目" label-width="60px" prop="trmtyp">
<c-select
v-model="model.trmtyp"
style="width: 100%"
placeholder="请选择科目"
>
<el-option v-for="k in codes.trmtyp" :label="k" :value="k.split('\t')[0]" :key="k"></el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="说明" prop="reason">
<c-input
v-model="model.reason"
maxlength="40"
placeholder="请输入collect reason"
></c-input>
</el-form-item>
<c-col :span="24">
<el-form-item label="" prop="fcdgrp.apl.pta.nam1">
<c-input
v-model="model.fcdgrp.apl.pta.nam1"
maxlength="40"
placeholder="请输入Externally Visible Name of Address"
></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<c-fullbox>
<c-col :span="12">
<el-form-item label="金额" prop="cashcur">
<c-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<c-col :span="13">
<el-form-item label="保证金账号" prop="cashacc">
<!-- <c-select
v-model="model.cashacc"
style="width: 100%"
placeholder="请选择account"
>
</c-select> -->
<c-select
v-model="model.cashcur"
v-model="model.cashacc"
placeholder="请选择account"
></c-select>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="科目" label-width="60px" prop="trmtyp">
<c-select
v-model="model.trmtyp"
style="width: 100%"
placeholder="请选择currency"
placeholder="请选择科目"
>
<el-option v-for="k in codes.cashcur" :label="k" :value="k" :key="k"></el-option>
<el-option v-for="k in codes.trmtyp" :label="k" :value="k.split('\t')[0]" :key="k"></el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-fullbox>
<c-col :span="12">
<el-form-item label="金额" prop="cashcur">
<c-select
v-model="model.cashcur"
style="width: 100%"
placeholder="请选择currency"
:code="codes.infled_Cur"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" label-width="20px" prop="cashamt">
<c-col :span="12">
<el-form-item label="" label-width="5px" prop="cashamt">
<c-input-currency
v-model="model.cashamt"
placeholder="请输入金额"
></c-input-currency>
</el-form-item>
</c-col>
<template slot="footer">
<c-button size="small" type="primary" @click="onGet" disabled>
Get
</c-button>
</template>
</c-fullbox>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="说明" prop="reason">
<c-input
v-model="model.cashamt"
placeholder="请输入金额"
v-model="model.reason"
maxlength="40"
placeholder="请输入collect reason"
></c-input>
</el-form-item>
</c-col>
<template slot="footer">
<c-button size="small" type="primary" @click="onGet" disabled>
Get
</c-button>
</template>
</c-fullbox>
</c-col>
<c-col :span="12">
<el-form-item label="" prop="gleflg">
<c-checkbox v-model="model.gleflg">是否过帐</c-checkbox>
</el-form-item>
<c-col :span="4">
<el-form-item label="" prop="gleflg" label-width="0px">
<c-checkbox v-model="model.gleflg">是否过帐</c-checkbox>
</el-form-item>
</c-col>
</c-col>
</c-col>
</c-col>
<c-col :span="24">
<c-istream-table
:list="model.cshstm.rows || []"
......
src/views/Business/Fctopn/index.vue
<template>
<c-page title="保证金收取">
<div class="eContainer">
<div class="bus-button">
<c-button type="primary" v-on:click="handleSave">{{ $t("buttons.save") }}</c-button>
<c-button type="primary" v-on:click="handleCheck">{{ $t("buttons.check") }}</c-button>
</div>
<div class="eContainer">
<c-page title="保证金收取">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000002 -->
<el-tab-pane label="PD000002" name="opnp1">
<el-tab-pane label="概要" name="opnp1">
<c-content>
<m-opnp1 :model="model" :codes="codes"/>
</c-content>
......@@ -21,9 +16,15 @@
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</el-form>
</div>
</c-page>
</c-page>
</div>
</template>
<script>
import Api from "~/service/Api"
......@@ -59,7 +60,8 @@ export default {
rules: null,
codes: {
cashcur: [],
trmtyp: []
trmtyp: [],
...CodeTable,
},
}
},
......@@ -109,6 +111,9 @@ export default {
//TODO 处理数据逻辑
this.codes.cashcur = rtnmsg.codeSet.cashcur
this.codes.trmtyp = rtnmsg.codeSet.trmtyp
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else
{
......
src/views/Business/Gitrop/Ovwp.vue
......@@ -2,7 +2,7 @@
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="重新开业" name="rop">
<el-collapse-item title="重新开立" name="rop">
<m-rop :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
......
src/views/Review/Business/ReviewFctopn.vue 0 → 100644
<template>
<ReviewWrapper>
<Fctopn></Fctopn>
</ReviewWrapper>
</template>
<script>
import Fctopn from "~/views/Business/Fctopn";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewFctopn",
components: { ReviewWrapper, Fctopn },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/ReviewRouter.js
......@@ -136,6 +136,7 @@ import ReviewBttdck from "./Business/ReviewBttdck.vue";
import ReviewGctrop from "./Business/ReviewGctrop.vue";
import ReviewGitrop from "./Business/ReviewGitrop.vue";
import ReviewGctfee from "./Business/ReviewGctfee.vue";
import ReviewFctopn from "./Business/ReviewFctopn.vue";
const ReviewRouter = [
......@@ -290,6 +291,8 @@ const ReviewRouter = [
{ path: "gctrop", component: ReviewGctrop, name: "ReviewGctrop", meta: { title: "复核-Gctrop" } },
{ path: "gitrop", component: ReviewGitrop, name: "ReviewGitrop", meta: { title: "复核-Gitrop" } },
{ path: "gctfee", component: ReviewGitrop, name: "ReviewGctfee", meta: { title: "复核-Gctfee" } },
{ path: "fctopn", component: ReviewFctopn, name: "ReviewFctopn", meta: { title: "复核-Fctopn" } },
];
......
src/views/Statics/Dbifee/Fee.js
......@@ -33,15 +33,15 @@ export const Pattern = {
],
"cod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
{ "trigger": "blur" }
],
"stfcod": [
"sftcod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
{ "trigger": "blur" }
],
"rol": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
{ "trigger": "blur" }
],
"incflg": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
......@@ -77,7 +77,7 @@ export const Pattern = {
],
"grpcod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
{ "trigger": "blur" }
],
"ver": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
......@@ -93,7 +93,7 @@ export const Pattern = {
],
"dtacod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 8, "message": "最大长度40个字符", "trigger": "blur" }
{ "trigger": "blur" }
],
"etgextkey": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
......
src/views/Statics/Dbifee/FeeInfo.vue
......@@ -2,110 +2,127 @@
<div class="eibs-tab">
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="Fee Code" prop="cod">
<el-form-item label="费用代码" prop="cod">
<c-select
style="width: 100%"
v-model="model.cod"
placeholder="请选择Fee Code"
:code="getCodesByKey('fepfeecod')"
placeholder="请选择费用代码"
:code="getCodesByKey('feecod3')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Relevant Amount" prop="reltir">
<el-form-item label="相关金额类型" prop="reltir">
<c-select
style="width: 100%"
v-model="model.reltir"
placeholder="请选择Relevant Amount"
placeholder="请选择相关金额类型"
:code="getCodesByKey('calcbs')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="SWIFT Code" prop="sftcod">
<el-form-item label="SWIFT报文描述" prop="sftcod">
<c-select
style="width: 100%"
v-model="model.sftcod"
placeholder="请选择SWIFT Code"
placeholder="请选择SWIFT报文类型"
:code="getCodesByKey('swtcod')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Fee Code for DTA Messages" prop="dtacod">
<el-form-item label="DTA报文中的费用代码" prop="dtacod">
<c-select
style="width: 100%"
v-model="model.dtacod"
placeholder="请选择Fee Code for DTA Messages"
placeholder="请选择DTA报文中的费用代码"
:code="getCodesByKey('dtacod')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Booking Type" prop="staflg">
<el-form-item label="统计标志" prop="staflg">
<c-select
style="width: 100%"
v-model="model.staflg"
placeholder="请选择Booking Type"
placeholder="请选择统计标志"
:code="getCodesByKey('staflgFee')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.incflg" >Income</c-checkbox>
<el-form-item label="是否收入" prop="incflgFee">
<c-select style="width: 100%"
v-model="model.incflg"
:code="getCodesByKey('incflgFee')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Fee Payer(Deafult) " prop="rol">
<el-form-item label="支付此费用的默认角色" prop="rol">
<c-select
style="width: 100%"
v-model="model.rol"
placeholder="请选择Fee Payer(Deafult)"
placeholder="请选择支付此费用的角色"
:code="getCodesByKey('rol')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Account" prop="acc">
<c-input v-model="model.acc" placeholder="请输入Account"> </c-input>
<el-form-item label="账号" prop="acc">
<c-input v-model="model.acc" placeholder="请输入账号"> </c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12" class="col-right">
<c-col :span="24">
<c-checkbox v-model="model.dscmodflg">Modification of Description Allowed in Settlement</c-checkbox>
</c-col>
<el-form-item label="费用描述是否允许修改" prop="dscmodflg">
<c-select style="width: 100%"
v-model="model.dscmodflg"
:code="getCodesByKey('dscmodflg')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="accruing Account" prop="accacr">
<c-input v-model="model.accacr" placeholder="请输入accruing Account">
<el-form-item label="循环收费账号" prop="accacr">
<c-input v-model="model.accacr" placeholder="请输入循环收费账号">
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Usable in" prop="reltrn">
<c-input v-model="model.reltrn" maxlength="40" placeholder="请输入Relevant Transaction and Business Sector"></c-input>
<el-form-item label="有关交易及业务部门" prop="reltrn">
<c-input v-model="model.reltrn" maxlength="40" placeholder="请输入有关交易及业务部门"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Begin Date" prop="begdat">
<c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择Begin Date"></c-date-picker>
<el-form-item label="开始日期" prop="begdat">
<c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择开始日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="End Date" prop="enddat">
<c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择End Date"></c-date-picker>
<el-form-item label="结束日期" prop="enddat">
<c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择结束日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Group Code" prop="grpcod">
<c-select v-model="model.grpcod" style="width:100%" placeholder="请选择Group Code">
<el-form-item label="费用分组" prop="grpcod">
<c-select
v-model="model.grpcod"
style="width:100%"
placeholder="请选择费用的组"
:code="getCodesByKey('grpcod')"
>
</c-select>
</el-form-item>
</c-col>
......@@ -120,8 +137,8 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Tax Account" prop="taxacc">
<c-input v-model="model.taxacc" maxlength="34" placeholder="请输入Tax Account"></c-input>
<el-form-item label="传真账号" prop="taxacc">
<c-input v-model="model.taxacc" maxlength="34" placeholder="请输入传真账号"></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Statics/Inffee/Infsea.vue
......@@ -3,10 +3,10 @@
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="FeeCode" prop="cod">
<el-form-item label="费用代码" prop="cod">
<c-input
v-model="model.cod"
placeholder="请输入FeeCode"
placeholder="请输入费用代码"
style="width: 100%"
>
</c-input>
......@@ -17,10 +17,10 @@
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="Description" prop="nam">
<el-form-item label="名称" prop="nam">
<c-input
v-model="model.nam"
placeholder="请输入Description"
placeholder="请输入名称"
style="width: 100%"
>
</c-input>
......@@ -111,14 +111,14 @@ export default {
return {
feeData: [],
feeColumns: [
{ label: 'Fee Code', prop: 'cod', width: '120' },
{ label: 'Description', prop: 'descrp', width: '120' },
{ label: 'Relevant Amount', prop: 'reltir', width: '150' },
{ label: 'SWIFT COD', prop: 'sftcod', width: '150' },
{ label: 'DTA COD', prop: 'dtacod', width: '150' },
{ label: 'Booking Type', prop: 'staflg', width: '150' },
{ label: 'Fee Payer(Deafult)', prop: 'rol', width: '170' },
{ label: 'Account', prop: 'acc', width: '120' }
{ label: '费用代码', prop: 'cod', width: '120' },
{ label: '名称', prop: 'descrp', width: '120' },
{ label: '相关金额类型', prop: 'reltir', width: '150' },
{ label: 'SWIFT报文描述', prop: 'sftcod', width: '150' },
{ label: 'DTA报文中的费用代码', prop: 'dtacod', width: '170' },
{ label: '统计标志', prop: 'staflg', width: '120' },
{ label: '支付此费用的默认角色', prop: 'rol', width: '170' },
{ label: '账号', prop: 'acc', width: '120' }
],
};
},
......@@ -146,11 +146,19 @@ export default {
map.set(objectArr[i].value,objectArr[i].label);
}
var feeList = [];
for(var fee of map){
console.log(fee[0])
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){
if(fee[0].includes(this.model.cod)&&fee[1].includes(this.model.nam)){
feeList.push(fee[0])
}
}
}
this.model.feelist = feeList;
console.log(this.model)
......@@ -161,25 +169,6 @@ export default {
* total: 69
* 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;
this.feeData = list;
for(let i =0;i<list.length;i++){
......@@ -188,6 +177,7 @@ export default {
this.model.pageNum = res.pageNumber
this.model.pageSize = res.pageSize
this.model.total = res.total
this.model.feelist=[];
})
},
queryFunc(pageNumber, pageSize) {
......
src/views/Statics/Inffee/index.vue
......@@ -25,7 +25,7 @@
import Infsea from "./Infsea";
export default {
name: "StaticsInffec",
name: "StaticsInffee",
components: {
"m-infsea": Infsea,
},
......@@ -38,10 +38,8 @@ export default {
return {
tabVal: "infsea",
model: {
codfee:"",
feepri:"!",
objtyp:"",
// paging
cod:"",
nam:"",
pageNum: 1,
pageSize: 5,
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