Skip to content

V
vue-gjjs
Commit 9adf4f13 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 0c23d2db 98c62802
Showing with 332 additions and 136 deletions
src/model/Bctset/Pattern.js
......@@ -1079,7 +1079,7 @@ export default {
"trtcre.oriamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{type:"number",max: 99999999999999.999,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"trtcre.trdgrp.rec.pctfin":[
......
src/model/Getamc/Pattern.js
......@@ -21,9 +21,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"},
......@@ -34,9 +34,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -76,9 +76,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.cnf.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.rec.partcon":[
{type: "string", required: false, message: "必输项"},
......
src/model/Getopn/Pattern.js
......@@ -23,9 +23,9 @@ export default {
"gidgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.apl.pts.ref":[
......@@ -38,9 +38,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gidgrp.rec.oldref":[
......
src/model/Getset/Pattern.js
......@@ -21,9 +21,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gcdgrp.rec.ownref":[
{type: "string", required: false, message: "必输项"},
......@@ -47,9 +47,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gcdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gcdgrp.apl.pts.ref":[
......@@ -61,9 +61,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gcdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gcdgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"},
......@@ -94,9 +94,9 @@ export default {
],
"gcdgrp.cbs.max2.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gctp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
src/model/Litdck/Pattern.js
......@@ -149,14 +149,14 @@ export default {
{type: "string", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.matdat":[
{type: "string", required: true, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"brdgrp.rec.docsta":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
],
"brdgrp.blk.matper":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
......
src/service/test/atp.js
......@@ -12,6 +12,10 @@ export function add(data) {
return Api.post("/manager/atp/add", data)
}
export function queryCod(cod) {
return Api.post(`/manager/atp/queryCod?cod=${cod}`)
}
export function edit(data) {
return Api.post("/manager/atp/edit", data)
}
......
src/service/test/cty.js
......@@ -12,6 +12,10 @@ export function add(data) {
return Api.post("/manager/cty/add", data)
}
export function queryCod(cod) {
return Api.post(`/manager/cty/queryCod?cod=${cod}`)
}
export function edit(data) {
return Api.post("/manager/cty/edit", data)
}
......
src/service/test/cur.js
......@@ -12,12 +12,16 @@ export function add(data) {
return Api.post("/manager/cur/add", data)
}
export function queryCod(cod) {
return Api.post(`/manager/cur/queryCod?cod=${cod}`)
}
export function edit(data) {
return Api.post("/manager/cur/edit", data)
}
export function deleteById(data) {
return Api.post(`/manager/cur/deleteById`, data)
return Api.post(`/manager/cur/deleteById?inr=${data}`)
}
// export function addAdrData(inr, data) {
......
src/views/Business/Bctset/Trtcrep.vue
......@@ -185,7 +185,7 @@
prop="trtcre.oriamt"
>
<c-input
v-model="model.trtcre.oriamt"
v-model.number="model.trtcre.oriamt"
style="width: 100%"
placeholder="请输入融资金额"
......
src/views/Business/Botcan/index.vue
......@@ -32,8 +32,8 @@
<m-setpan :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="账务" name="glepan">
<!-- 结算 -->
<m-setpan :model="model" :codes="codes" />
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
......@@ -133,6 +133,7 @@ export default {
pattern: Pattern,
rules: null,
codes: { ...CodeTable },
activeNames: ["engp"],
};
},
methods: {
......
src/views/Business/Botset/Cnyp.vue
......@@ -6,11 +6,11 @@
<m-wg :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="涉外收入申请单-基础信息" name="basp3" v-if="model.bopmod.szflg=='1' && model.lendoc.actflg=='X'">
<el-collapse-item title="涉外收入申请单-基础信息" name="basp3" v-if="model.bopmod.szflg=='1' && model.bopmod.basflg=='X'">
<m-basp3 :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="境内收入申请单-基础信息" name="basp2" v-if="model.bopmod.szflg=='2' && model.lendoc.actflg=='X'">
<el-collapse-item title="境内收入申请单-基础信息" name="basp2" v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'">
<m-basp2 :model="model" :codes="codes" />
</el-collapse-item>
......
src/views/Business/Botset/Setp.vue
......@@ -432,11 +432,11 @@ export default {
flag1: true,
stmData: {
columns: [
'1 1 "类型" 500',
'2 2 "Dbt" 500',
'3 3 "Cdt" 500',
'4 4 "币种" 500',
'5 5 "金额" 500 2 8 1 4',
'1 1 "类型" 250',
'2 2 "Dbt" 250',
'3 3 "Cdt" 250',
'4 4 "币种" 250',
'5 5 "金额" auto 2 8 1 4',
// '6 6 "Mat.Dat." 500 4 7 1',
{
index: 6,
......
src/views/Business/Botset/index.vue
......@@ -5,7 +5,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
<m-ovwp ref="ovwp" :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......@@ -214,7 +214,7 @@ export default {
"m-coninfp" : Coninfp,
"m-docpan" : Docpan,
"m-doctre" : Doctre,
"m-docpan" : Docpan,
// "m-docpan" : Docpan,
"m-wg" : Wg,
"m-cnyp" : Cnyp,
"m-limitbody" : Limitbody,
......@@ -267,7 +267,12 @@ export default {
if (this.isInDisplay) {
this.restoreDisplay();
}
this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
//多选表格,选择某一行的选中状态,第二个参数设置选中与否,true为选中
if (this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.data.length > 0) {
this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.toggleRowSelection(this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.data[0], true);
}
// this.$refs.ovwp.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
// this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
}else{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
......
src/views/Business/Brtset/Det202cv.vue
......@@ -102,7 +102,7 @@
<c-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<el-form-item label="账户行" :prop="'setmod.setglg.setgll.' + idx + '.setgrp.tri.pts.extkey'">
<el-form-item label="账户行(Tag 57a)" :prop="'setmod.setglg.setgll.' + idx + '.setgrp.tri.pts.extkey'">
<c-fullbox>
<c-input v-model="model.setmod.setglg.setgll[idx].setgrp.tri.pts.extkey" maxlength="16" placeholder="请输入账户行"
@keyup.enter.native="
......@@ -132,7 +132,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="受益人机构" :prop="'setmod.setglg.setgll.' + idx + '.setgrp.bei.pts.extkey'">
<el-form-item label="受益人机构(Tag 58a)" :prop="'setmod.setglg.setgll.' + idx + '.setgrp.bei.pts.extkey'">
<c-fullbox>
<c-input v-model="model.setmod.setglg.setgll[idx].setgrp.bei.pts.extkey" maxlength="16" placeholder="请输入受益人机构"
@keyup.enter.native="
......@@ -162,7 +162,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="发报行对收报行的指示" :prop="'setmod.setglg.setgll.' + idx + '.sespay.strinf202'">
<el-form-item label="发报行对收报行的指示(Tag 72)" :prop="'setmod.setglg.setgll.' + idx + '.sespay.strinf202'">
<c-input rows="4" type="textarea" v-model="model.setmod.setglg.setgll[idx].sespay.strinf202" maxlength="35"
show-word-limit placeholder="请输入发报行对收报行的指示"></c-input>
</el-form-item>
......
src/views/Business/Getamc/Ovwp1.vue
......@@ -415,7 +415,7 @@
<c-input
v-if="model.gitp.swiftflg == 'Y'"
v-model="model.gidgrp.blk.apprultxt"
style="margin: 0 0 0 5px; width: 100%"
style="margin: 0 0 0 5px; width: 90%"
placeholder="请输入申请条款"
disabled
></c-input>
......
src/views/Business/Getopn/Ovwp1.vue
......@@ -77,17 +77,11 @@
<c-col :span="9">
<el-form-item label-width="5px" prop="gidgrp.cbs.max.amt">
<c-input
<c-input-currency
v-model="model.gidgrp.cbs.max.amt"
placeholder="请输入保函金额"
@blur="amtBlur"
@keyup.enter.native="
defaultFunction(
'gidgrp.cbs.max.amt',
model.gidgrp.cbs.max.amt
)
"
></c-input>
@keyup.enter.native="$event.target.blur()"
></c-input-currency>
</el-form-item>
</c-col>
<c-col
......@@ -112,11 +106,12 @@
</c-col>
<c-col :span="9">
<el-form-item label-width="5px" prop="gidgrp.cbs.opn1.amt">
<c-input
<!-- 因暂不确定此金额框能否显示负数，且此框为disabled,暂用-min标签，可回显负数 -->
<c-input-currency-min
disabled
v-model="model.gidgrp.cbs.opn1.amt"
placeholder="请输入"
></c-input>
></c-input-currency-min>
</el-form-item>
</c-col>
<c-col
......@@ -1644,12 +1639,6 @@ export default {
},
methods: {
...Event,
async amtBlur() {
let rtnmsg = await this.executeDefault("gidgrp.cbs.max.amt");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created: function () {},
};
......
src/views/Business/Getset/Gitsetp1.vue
......@@ -69,11 +69,11 @@
</c-col>
<c-col :span="12">
<c-form-item label-width="5px" prop="gcdgrp.cbs.max.amt">
<c-input
<c-input-currency
disabled
v-model="model.gcdgrp.cbs.max.amt"
placeholder="请输入"
></c-input>
></c-input-currency>
</c-form-item>
</c-col>
</c-col>
......@@ -91,11 +91,12 @@
</c-col>
<c-col :span="12">
<c-form-item label-width="5px" prop="gcdgrp.cbs.opn1.amt">
<c-input
<!-- 不确定此空是否能输负数，因此空disabled,暂用可显示负数的标签-min -->
<c-input-currency-min
disabled
v-model="model.gcdgrp.cbs.opn1.amt"
placeholder="请输入"
></c-input>
></c-input-currency-min>
</c-form-item>
</c-col>
</c-col>
......@@ -139,11 +140,12 @@
</c-col>
<c-col :span="12">
<c-form-item label-width="5px" prop="gidgrp.cbs.opn1.amt">
<c-input
<!-- 不确定此空是否能输负数，因此空disabled,暂用可显示负数的标签-min -->
<c-input-currency-min
disabled
v-model="model.gidgrp.cbs.opn1.amt"
placeholder="请输入"
></c-input>
></c-input-currency-min>
</c-form-item>
</c-col>
</c-col>
......@@ -225,11 +227,11 @@
</c-col>
<c-col :span="12">
<c-form-item label-width="5px" prop="gcdgrp.cbs.max.amt">
<c-input
<c-input-currency
disabled
v-model="model.gcdgrp.cbs.max.amt"
placeholder="请输入"
></c-input>
></c-input-currency>
</c-form-item>
</c-col>
</c-col>
......@@ -247,11 +249,11 @@
</c-col>
<c-col :span="12">
<c-form-item label-width="5px" prop="gcdgrp.cbs.max2.amt">
<c-input
<c-input-currency
disabled
v-model="model.gcdgrp.cbs.max2.amt"
placeholder=""
></c-input>
></c-input-currency>
</c-form-item>
</c-col>
<c-col :span="24">
......
src/views/Business/Getset/index.vue
......@@ -45,7 +45,7 @@
<!-- 结算 -->
<m-setpan :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item v-if="this.flag" title="会计分录" name="glepan">
<el-collapse-item title="会计分录" name="glepan">
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</el-collapse-item>
......@@ -274,9 +274,6 @@ export default {
if (name === "basp1") {
rulePath = "bopmod.dbdp.basp";
}
if (name === "setpan") {
this.flag = true;
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
......
src/views/Business/Infltd/Infsea.vue
......@@ -238,6 +238,12 @@
</el-form>
</template>
</c-list-search>
<c-col :span="24" style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" title="LTTOPN"
@click="toLttopn">
转让信用证开立
</c-button>
</c-col>
<c-col :span="24">
<c-istream-table
......
src/views/Business/Litame/Amep.vue
......@@ -181,6 +181,7 @@
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="寄单期限" prop="oldlidgrp.rec.prepers18">
<c-input
v-model.number="model.oldlidgrp.rec.prepers18"
......@@ -189,6 +190,10 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="1" style="margin-left: -80px">
<el-form-item label="天"> </el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="寄单期限(原)" prop="oldlidgrp.rec.prepertxts18">
<c-input
......@@ -339,6 +344,7 @@
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="交单期限(新)" prop="trnmod.swiadd.prepers18">
<c-input
......@@ -347,6 +353,10 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="3" style="margin-left: -80px">
<el-form-item label="天"> </el-form-item>
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="交单期限描述" prop="trnmod.swiadd.prepertxts18">
<c-input
......
src/views/Business/Litdla/Amep.vue
......@@ -203,8 +203,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="交单期限描述" prop="trnmod.swiadd.prepertxts18">
<c-input disabled v-model="model.trnmod.swiadd.prepertxts18" maxlength="35" placeholder="请输入交单期限描述"></c-input>
<el-form-item label="交单期限描述" prop="oldlidgrp.rec.prepertxts18">
<c-input disabled v-model="model.oldlidgrp.rec.prepertxts18" maxlength="35" placeholder="请输入交单期限描述"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litdla/Detp.vue
......@@ -142,11 +142,11 @@
</c-col>
<c-col :span="24">
<el-form-item label="寄单描述" prop="lidgrp.blk.preper">
<el-form-item label="寄单描述" prop="lidgrp.rec.prepertxts18">
<c-input
disabled
:rows="4"
type="textarea" v-model="model.lidgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入内容" ></c-input>
type="textarea" v-model="model.lidgrp.rec.prepertxts18" maxlength="35" show-word-limit placeholder="请输入内容" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......
src/views/Business/Litdla/Ovwp1.vue
......@@ -127,21 +127,15 @@
</c-col>
<c-col :span="12">
<el-form-item label="分批装运" prop="lidgrp.rec.shppar">
<c-select disabled v-model="model.lidgrp.rec.shppar" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="分批装运" prop="lidgrp.rec.shppars18">
<c-select disabled v-model="model.lidgrp.rec.shppars18" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="是否可转运" prop="lidgrp.rec.shptrs">
<c-select disabled v-model="model.lidgrp.rec.shptrs" style="width:100%" placeholder="请选择">
<el-form-item label="是否可转运" prop="lidgrp.rec.shptrss18">
<c-select disabled v-model="model.lidgrp.rec.shptrss18" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Litrog/Shpdet.vue
......@@ -165,7 +165,7 @@
type="primary"
@click=""
>
获取
详情
</c-button>
</template>
</c-fullbox>
......
src/views/Statics/Dbiatp/Atp.js
......@@ -88,6 +88,7 @@ export const Pattern = {
{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
],
"dealtim": [
{"required": true, "message": "无法保存数据"}
],
}
......
src/views/Statics/Dbiatp/AtpInfo.vue
......@@ -160,7 +160,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="交易处理时间" prop="dealtim">
<c-input-currency class="input-currency-left"
<c-input-currency value="0.0" class="input-currency-left"
v-model="model.dealtim"
placeholder="请输入交易处理时间"
>
......
src/views/Statics/Dbiatp/index.vue
......@@ -53,7 +53,7 @@ import Atp, { Pattern } from "./Atp.js";
import AtpInfo from "./AtpInfo.vue";
import { queryById, add, edit, deleteById } from "~/service/test/atp.js";
import { queryById, add, edit, deleteById, queryCod } from "~/service/test/atp.js";
export default {
name: "StaticsDbiatp",
......@@ -103,6 +103,10 @@ export default {
commitAdd() {
this.$refs.modelForm.validate((validated) => {
if (validated) {
queryCod(this.model.cod)
.then((res) => {
console.log("res" + res)
if (!res) {
add(this.model)
.then((res) => {
this.$message.success("添加成功！");
......@@ -112,6 +116,10 @@ export default {
this.$message.error("添加失败！");
});
} else {
return this.$message.error('交易配置信息代码重复');
}
})
} else {
Utils.formValidateTips(this.$refs.modelForm.fields)
}
});
......
src/views/Statics/Dbicty/index.vue
......@@ -59,7 +59,7 @@ import Cty, { Pattern } from "./Cty.js";
import CtyInfo from "./CtyInfo.vue";
import BopctyInfo from "./BopctyInfo.vue";
import { queryById, add, edit, deleteById, editBopctyData, deleteBopctyById} from "~/service/test/cty.js";
import { queryById, add, edit, deleteById, editBopctyData, deleteBopctyById, queryCod} from "~/service/test/cty.js";
export default {
name: "StaticsDbicty",
......@@ -112,6 +112,9 @@ export default {
this.$refs.modelForm.validate((validated) => {
if (validated) {
this.model.codBopcty=this.model.bopcod;
queryCod(this.model.cod)
.then((res) => {
if (!res) {
add(this.model)
.then((res) => {
this.$message.success("保存成功！");
......@@ -120,6 +123,12 @@ export default {
.catch((err) => {
this.$message.error("保存失败！");
});
}
else {
this.$message.error("国家代码重复")
}
})
} else {
Utils.formValidateTips(this.$refs.modelForm.fields)
}
......@@ -132,7 +141,7 @@ export default {
edit(this.model)
.then((res) => {
this.$message.success("国家地区信息保存成功！");
this.goBack()
this.goBack(true)
})
.catch((err) => {
this.$message.error("国家地区信息保存失败！");
......@@ -140,7 +149,7 @@ export default {
editBopctyData(this.model.inr,this.model)
.then((res) => {
this.$message.success("收支申报国家代码表保存成功！");
this.goBack()
this.goBack(true)
})
.catch((err) => {
this.$message.error("收支申报国家代码表保存失败！");
......
src/views/Statics/Dbicur/Currency.vue
......@@ -103,7 +103,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="最大金额" prop="maxamt">
<c-input-currency v-model="model.maxamt" placeholder="请输入最大金额" >
<c-input-currency class="input-currency-left" v-model="model.maxamt" placeholder="请输入最大金额" >
</c-input-currency>
</el-form-item>
</c-col>
......
src/views/Statics/Dbicur/index.vue
......@@ -23,7 +23,7 @@ import Cur, { Pattern } from "../Infcur/Cur.js";
import Currency from "./Currency.vue";
import { curInfo, add, edit, deleteById } from "~/service/test/cur.js";
import { curInfo, add, edit, deleteById,queryCod } from "~/service/test/cur.js";
export default {
name: "StaticsDbicur",
......@@ -75,6 +75,9 @@ export default {
commitAdd() {
this.$refs.modelForm.validate((validated) => {
if (validated) {
queryCod(this.model.cod)
.then(((res) => {
if (!res) {
add(this.model)
.then((res) => {
this.$message.success("保存成功！");
......@@ -84,6 +87,11 @@ export default {
this.$message.error("保存失败！");
});
} else {
this.$message.error("货币种类重复")
}
}))
} else {
Utils.formValidateTips(this.$refs.modelForm.fields)
}
});
......
src/views/Statics/Dbitrl/Trl.js
......@@ -26,8 +26,7 @@ export const Pattern = {
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
],
"relcur": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
{ "required": true, "message": "必输项", "type": "string" },
],
"relamt": [
{ "required": true, "message": "必输项", "trigger": "blur" },
......
src/views/Statics/Dbitrl/index.vue
......@@ -127,7 +127,7 @@ export default {
edit(this.model)
.then((res) => {
this.$message.success("保存成功！");
this.goBack()
this.goBack(true)
})
.catch((err) => {
this.$message.error("保存失败！");
......
src/views/Statics/Infcur/Cur.js
......@@ -64,8 +64,7 @@ export const Pattern = {
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
],
"newcur": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" }
{ "required": true, "message": "必输项", "type": "string" },
],
"altcod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
......@@ -112,10 +111,10 @@ export const Pattern = {
{ "pattern": /^-?\d{0,8}(\.\d{1,3})?$/, "message": "整数不能超过8位，小数不能超过3位", "trigger": "blur" }
],
"begdat": [
{ "type": "date", "trigger": "blur" }
{ "type": "string", "trigger": "blur" }
],
"enddat": [
{ "type": "date", "trigger": "blur" }
{ "type": "string", "trigger": "blur" }
],
"odrintday": [
{ "required": true, "message": "必输项", "trigger": "blur" },
......
src/views/Statics/Infcur/Infsea.vue
......@@ -76,9 +76,15 @@ export default {
],
};
},
activated() {
const { update } = this.$route.params
if (update) {
this.onSearch();
}
},
methods: {
toBbacur(){
this.$router.history.push("/statics/dbacur");
this.$router.push("/statics/dbacur");
},
// handleReset() {
// this.root.$refs.modelForm.resetFields();
......@@ -105,7 +111,6 @@ export default {
this.model.pageNum = res.pageNumber
this.model.pageSize = res.pageSize
this.model.total = res.total
console.log(this.model);
})
},
// async onInfbutSearow() {
......@@ -142,33 +147,38 @@ export default {
// curDelete(index, row) {
// this.$router.push(`/statics/dbdcur/${row.inr}`)
// },
//进行删除统一化
curDelete(idx, row) {
this.$confirm("是否确认删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let paramsData = { };
paramsData.inr = row.inr;
deleteById(paramsData)
.then((res) => {
console.log(res);
this.$message.success("删除成功！");
this.goBack(true)
})
.catch((err) => {
console.log(err);
this.$message.error("删除失败！");
});
}).catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
this.onInfcurSearch();
this.$router.push(`/statics/dbdcur/${row.inr}`)
},
// curDelete(idx, row) {
// this.$confirm("是否确认删除?", "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// })
// .then(() => {
// let paramsData = { };
// paramsData.inr = row.inr;
// deleteById(paramsData)
// .then((res) => {
// console.log(res);
// this.$message.success("删除成功！");
// this.onInfcurSearch();
// // this.onSearch();
// // this.goBack(true)
// })
// .catch((err) => {
// console.log(err);
// this.$message.error("删除失败！");
// });
// }).catch(() => {
// this.$message({
// type: "info",
// message: "已取消删除",
// });
// });
// },
goBack(update) {
this.$store.dispatch("TagsView/delView", this.$route);
this.$router.push({ name: "StaticsInfcur", params: { update } });
......
src/widget/Business/index.vue
......@@ -125,6 +125,7 @@ export default {
relflg: "",
page: 1,
pageSize: 5,
total: 0
},
};
},
......
src/widget/Fee/index.vue
<template>
<div></div>
<div>
<el-form
:model="model"
ref="modelForm"
label-width="100px"
label-position="right"
size="small"
>
<c-col :span="24">
<c-col :span="12" class="col-left">
<el-form-item label="费用代码" prop="codfee">
<c-input
v-model="model.codFee"
placeholder="请输入 费用代码"
style="width: 100%"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="12" class="col-right">
<el-form-item label="收费条件类型" prop="feepri">
<c-select
v-model="model.feepri"
style="width: 100%"
placeholder="请选择收费类型"
:code="getCodesByKey('feepri')"
></c-select>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="8" class="col-left col-right">
<c-col :span="24">
<el-form-item label="账号类型" prop="typ">
<c-select
v-model="model.typ"
placeholder=""
style="width: 100%"
:code="getCodesByKey('recgrptyp')"
></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="账号名称" prop="nam">
<c-input v-model="model.nam" placeholder=""></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="8" class="col-right">
<c-col :span="24">
<el-form-item label="国际银行账户号 " prop="iban">
<c-input
v-model="model.iban"
maxlength="34"
placeholder="请输入IBAN"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="账号币种" prop="cur">
<c-select
v-model="model.cur"
style="width: 100%"
placeholder=""
:code="getCodesByKey('infled_Cur')"
>
</c-select>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24" style="text-align: right">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="small"
@click="doSearch()"
>查询
</el-button>
</c-col>
</el-form>
<c-col :span="24">
<c-paging-table
:data="tableData"
:columns="tableColumns"
:pageNumber="model.pageNum"
:pageSize="model.pageSize"
:total="model.total"
v-on:queryFunc="queryFunc"
:border="true"
>
</c-paging-table>
</c-col>
</div>
</template>
<script>
import codes from "~/config/CodeTable";
import { queryByPage } from "~/service/test/fec.js";
/**
* 费用查询
*/
export default {
name: 'FeeQuery'
name: 'FeeQuery',
data() {
return {
tableData: [],
tableColumns: [
{ label: '费用代码', prop: 'codFee', width: '120' },
{ label: 'Description', prop: '', width: '120' },
{ label: '收费条件类型', prop: 'feepri', width: '120' },
{ label: '最小金额币种', prop: 'maxcur', width: '120' },
{ label: '费用最小金额', prop: 'lowamt', width: '120' },
{ label: '费用最大金额', prop: 'highamt', width: '120' },
{ label: '起始日期', prop: 'begdat', width: '120' },
{ label: '终止日期', prop: 'enddat', width: '120' },
{ label: '计算规则', prop: 'calrul', width: '120' },
{ label: '每份的费用金额', prop: 'untamt', width: '150' },
{ label: '计算费率', prop: 'ratcal', width: '120' },
],
model: {
// fec，查询条件的字段
codfee:"",
feepri:"!",
objtyp:"",
// paging
pageNum: 1,
pageSize: 5,
total: 0
},
};
},
methods: {
handleReset() {
this.$refs.modelForm.resetFields();
},
doSearch() {
queryByPage(this.model).then((res) => {
const list = res.list;
this.tableData = list;
this.model.pageNum = res.pageNumber;
this.model.pageSize = res.pageSize;
this.model.total = res.total;
});
},
queryFunc(pageNumber, pageSize) {
this.model.pageNum = pageNumber;
this.model.pageSize = pageSize;
this.doSearch();
},
getCodesByKey(key) {
return codes[key] ?? [];
},
},
}
</script>
......
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