Skip to content

V
vue-gjjs
Commit 7bd2a840 by liuxin
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 9fed74e0 d5871dc3
Showing with 429 additions and 15 deletions
src/model/Cptadv/Check.js
......@@ -10,31 +10,47 @@ let checkObj = {
"cpdgrp.orc.pts.extkey" :null,
"cnybop.outflg" :null,
"cpdgrp.pye.namelc" :null,
"cnybop.cnyinc.sbalancemode" :null,
"cnybop.cnyinc.spayercountrycode" :null,
"cptp.draweecountcode" :null,
"setmod.dspflg" :null,
"cpdgrp.rec.ownref" :null,
"cpdgrp.orc.adrelc" :null,
"cpdgrp.pye.pts.extkey" :null,
"cnybop.cnyinc.frecordamt" :null,
"cptp.uetr" :null,
"cnybop.cnyinc.dpayeedate" :null,
"cpdgrp.pye.pts.adrblk" :null,
"cpdgrp.rec.trntyp" :null,
"cnybop.cnyinc.sbankorgcode" :null,
"cpdgrp.ori.namelc" :null,
"cnybop.cnyflg" :null,
"cnybop.saddword" :null,
"cpdgrp.rec.sztyp" :null,
"cnybop.cnyinc.sorilevyno" :null,
"cnybop.cnyinc.sbanktrano" :null,
"cptp.pyebchnam" :null,
"cpdgrp.pye.adrelc" :null,
"cpdgrp.rec.valdat" :null,
"cpdgrp.rec.swftyp" :null,
"cptp.orcnam" :null,
"cnybop.cnyinc.iaccountperiod" :null,
"cnybop.spayeename" :null,
"lendoc.account" :null,
"cpdgrp.rec.clityp" :null,
"cnybop.cnyinc.cpayeeattr" :null,
"cpdgrp.rec.paytype" :null,
"cnybop.cnyinc.spayeeorgcode" :null,
"cpdgrp.snd.adrelc" :null,
"cnybop.incscale" :null,
"cpdgrp.orc.pts.adrblk" :null,
"cnybop.cnyinc.sswiftbic" :null,
"bopmod.szflg" :null,
"cnybop.cnyinc.fpayeeamt" :null,
"cptp.secmod" :null,
"cpdgrp.orc.namelc" :null,
"cnybop.traflg" :null,
"cnybop.sbankname" :null,
"cpdgrp.ori.adrelc" :null,
"cpdgrp.snd.pts.adrblk" :null,
"cpdgrp.ori.pts.ref" :null,
......@@ -42,9 +58,12 @@ let checkObj = {
"cpdgrp.ori.pts.extkey" :null,
"cptp.pyebchkey" :null,
"cpdgrp.cbs.max.amt" :null,
"cnybop.cnyinc.ftotalamt" :null,
"cnybop.cnyinc.spayeecny" :null,
"cpdgrp.snd.pts.extkey" :null,
"bopmod.basflg" :null,
"mtabut.coninf.conexedat" :null,
"cnybop.spayername" :null,
"cpdgrp.rec.paydat" :null,
"cnybop.libflg" :null,
"cpdgrp.cbs.max.cur" :null,
......@@ -53,6 +72,7 @@ let checkObj = {
"setmod.docamt" :null,
"bopmod.acttyp" :null,
"cpdgrp.snd.namelc" :null,
"cnybop.cnyinc.cpayeraccttyp" :null,
"cnybop.vouflg" :null,
}
......
src/model/Cptadv/Default.js
......@@ -57,6 +57,7 @@ export default {
"cpdgrp.rec.f23b" :Utils.defaultFunction,
"cpdgrp.pye.adrelc" :Utils.defaultFunction,
"cpdgrp.pye.namelc" :Utils.defaultFunction,
"cnybop.cnyinc.spayercountrycode" :Utils.defaultFunction,
"lendoc.actflg" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
......
src/model/Cptadv/Event.js
......@@ -218,5 +218,17 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onIncctySelbut1(){
let rtnmsg = await this.executeRule("inccty.selbut1")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
}
\ No newline at end of file
src/model/Cptadv/Pattern.js
......@@ -415,6 +415,119 @@ export default {
{max: 22,message:"长度不能超过22"}
],
"cnybop.cnyinc.spk":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"cnybop.cnyinc.sbanktrano":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"cnybop.sbankname":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnyinc.sbankorgcode":[
{type: "string", required: false, message: "必输项"},
{max: 12,message:"长度不能超过12"}
],
"cnybop.cnyinc.spayeeacct":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"cnybop.cnyinc.spayeeorgcode":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"cnybop.spayeename":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnyinc.spayercountrycode":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"cnybop.spayername":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
"cnybop.cnyinc.sswiftbic":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"cnybop.cnyinc.smidtransbank":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"cnybop.cnyinc.spayeracct":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"cnybop.incscale":[
{type: "string", required: false, message: "必输项"},
{max: 4,message:"长度不能超过4"}
],
"cnybop.cnyinc.dpayeedate":[
{type: "date", required: false, message: "输入正确的日期"}
],
"cnybop.cnyinc.fprepayeeamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.iaccountperiod":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"cnybop.cnyinc.ftotalamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.sorilevyno":[
{type: "string", required: false, message: "必输项"},
{max: 24,message:"长度不能超过24"}
],
"cnybop.cnyinc.fpayeeamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.fonshoreamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.fcustomsamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.foffshoreamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.frecordamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.cnyinc.fnogoodsamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"cnybop.saddword":[
{type: "string", required: false, message: "必输项"},
{max: 80,message:"长度不能超过80"}
],
......
src/model/Cptadv/index.js
......@@ -167,6 +167,37 @@ export default class Cptadv{
outflg:"", // 是否报送跨境人民币2111表 .cnybop.outflg
libflg:"", // 是否报送跨境人民币2106表 .cnybop.libflg
vouflg:"", // 是否报送跨境人民币2122表 .cnybop.vouflg
cnyinc:{
spk:"", // 业务主键 .cnybop.cnyinc.spk
sbankorgcode:"", // 银行机构代码 .cnybop.cnyinc.sbankorgcode
spayeeorgcode:"", // 收款人机构代码 .cnybop.cnyinc.spayeeorgcode
sswiftbic:"", // 付款行SWIFT BIC .cnybop.cnyinc.sswiftbic
spayeracct:"", // 清算（结算）账户账号 .cnybop.cnyinc.spayeracct
smidtransbank:"", // .cnybop.cnyinc.smidtransbank
dpayeedate:"", // 收款日期 .cnybop.cnyinc.dpayeedate
sbalancemode:"", // 结算方式 .cnybop.cnyinc.sbalancemode
sorilevyno:"", // 原申报号码 .cnybop.cnyinc.sorilevyno
sbanktrano:"", // 银行业务编号 .cnybop.cnyinc.sbanktrano
fpayeeamt:"", // 货物贸易收款金额 .cnybop.cnyinc.fpayeeamt
fcustomsamt:"", // 已报关收款金额 .cnybop.cnyinc.fcustomsamt
frecordamt:"", // 已备案收款金额 .cnybop.cnyinc.frecordamt
fprepayeeamt:"", // 预收款金额 .cnybop.cnyinc.fprepayeeamt
iaccountperiod:"", // .cnybop.cnyinc.iaccountperiod
fonshoreamt:"", // 无货物报关进出境物流货物金额 .cnybop.cnyinc.fonshoreamt
foffshoreamt:"", // 无货物报关离岸转手买卖金额 .cnybop.cnyinc.foffshoreamt
fnogoodsamt:"", // 无货物报关其他金额 .cnybop.cnyinc.fnogoodsamt
cpayeeattr:"", // 收款人属性 .cnybop.cnyinc.cpayeeattr
cpayeraccttyp:"", // 清算（结算）帐户类型 .cnybop.cnyinc.cpayeraccttyp
spayercountrycode:"", // 付款人常驻国家（地区）代码 .cnybop.cnyinc.spayercountrycode
spayeecny:"", // 收款币种 .cnybop.cnyinc.spayeecny
spayeeacct:"", // 收款人账号 .cnybop.cnyinc.spayeeacct
ftotalamt:"", // 原币金额 .cnybop.cnyinc.ftotalamt
},
spayeename:"", // 收款人名称 .cnybop.spayeename
spayername:"", // 付款人名称 .cnybop.spayername
saddword:"", // 交易附言 .cnybop.saddword
sbankname:"", // 银行机构名称 .cnybop.sbankname
incscale:"", // INCSCALE .cnybop.incscale
},
pageId: "" // ctx的key
}
......
src/views/Business/Cptadv/Opnp1.vue
......@@ -266,7 +266,7 @@
</c-col>
<c-col :span="13">
<el-form-item label="解付日期" prop="cpdgrp.rec.paydat">
<el-form-item label="解付日期">
<c-date-picker
type="date"
v-model="model.cpdgrp.rec.paydat"
......@@ -276,7 +276,7 @@
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="起息日" label-width="40%" prop="cpdgrp.rec.valdat">
<el-form-item label="起息日" label-width="40%">
<c-date-picker
type="date"
v-model="model.cpdgrp.rec.valdat"
......
src/views/Business/Cptadv/index.vue
......@@ -21,7 +21,6 @@
ref="modelForm"
label-width="150px"
size="small"
:validate-on-rule-change="false"
>
<c-tabs ref="elment" :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="基本信息" name="opnp1">
......@@ -59,6 +58,11 @@
<!--PD000546 -->
<m-sbxx :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="2101跨境收入信息" name="incp" v-if="model.cnybop.cnyflg === '1'">
<c-content>
<m-incp :model="model" :codes="codes"></m-incp>
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
</div>
......@@ -81,6 +85,7 @@ import Check from "~/model/Cptadv/Check";
// import Coninfp from "./Coninfp";
// import Docpan from "./Docpan";
import Sbxx from "./Sbxx";
import Incp from "./Incp";
import Doctre from "~/views/Public/Doctre";
import Setpan from "~/views/Public/Setpan";
......@@ -100,7 +105,8 @@ export default {
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-ptap": Ptap,
"m-docpan2" : Docpan2
"m-docpan2" : Docpan2,
"m-incp" : Incp
},
provide() {
return {
......
src/views/Business/Cptopn/Payment103.vue
......@@ -230,7 +230,7 @@
</c-col>
<!-- ------------------Right------------------>
<c-col :span="11">
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item
label="Account with Institution/Account(Tag 54a)"
......
src/views/Business/Cptopn/index.vue
......@@ -37,7 +37,7 @@
<m-AdditionalInfo :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="账务" name="setpan">
<el-tab-pane label="费用及账务" name="setpan">
<!--PD000000 -->
<m-setpan :model="model" :codes="codes" />
</el-tab-pane>
......
src/views/Business/Infcpd/BusNavbar.vue
......@@ -114,6 +114,7 @@ export default {
this.navcode.splice(i,0,newList)
}
this.navcode.push({code:"",label:"退汇",isDis:"N",title:""})
}else{
......
src/views/Public/CptOpnp1Common.vue
......@@ -23,6 +23,9 @@
v-model="model.cpdgrp.ori.pts.extkey"
placeholder=""
style="width:100%"
@keyup.enter.native="
showGridPromptDialog('cpdgrp.ori.pts.extkey')
"
></c-input>
</el-form-item>
<!-- </c-col>
......
src/views/Public/Docpan.vue
......@@ -128,7 +128,7 @@
</el-table-column>
<el-table-column label="操作" width="115px" fixed="right">
<template slot-scope="scope">
<el-button
<c-button
type="primary"
size="small"
:disabled="
......@@ -139,15 +139,15 @@
@click="handleDisplay(scope.row.index, scope.row,model.trnmod.trndoc.doceot[scope.row.index])"
icon="el-icon-search"
style="margin-left:0"
></el-button
></c-button
>
<el-button
<c-button
size="small"
type="primary"
icon="el-icon-edit"
style="margin-left:0"
@click="handleDetail(scope.row.index, scope.row)"
></el-button
></c-button
>
</template>
</el-table-column>
......@@ -374,17 +374,17 @@
/></el-form-item>
</c-col>
<c-col :span="2">
<el-button size="mini">... </el-button>
<c-button size="mini">... </c-button>
</c-col>
</c-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="saveDialog"
>确 定</el-button
<c-button type="primary" @click="saveDialog"
>确 定</c-button
>
<el-button @click="centerDialogVisible = false"
>取 消</el-button
<c-button @click="centerDialogVisible = false"
>取 消</c-button
>
</span>
</template>
......
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