Skip to content

V
vue-gjjs
Commit a1591c63 by liushikai
Options

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

parents d85ce50e 0acb5727
Showing with 144 additions and 133 deletions
src/model/Bdtdcr/Pattern.js
......@@ -77,8 +77,8 @@ export default {
{type: "date", required: false, message: "输入正确的日期"}
],
"bddgrp.rec.tenmaxday":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
{type: "number", required: false, message: "必输项"},
//{max: 3,message:"长度不能超过3"}
],
"bddgrp.ben.pts.nam":[
{type: "string", required: false, message: "必输项"},
......@@ -301,7 +301,7 @@ export default {
],
"liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"},
//{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -314,7 +314,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"liaall.limmod.ccvamt":[
{type: "number", required: false, message: "必输项"},
//{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/model/Bdtset/index.js
import Api from "~/service/Api"
import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Bdtset{
constructor () {
this.data = {
liaall:{
tenstm:"", // Tenor Stream .liaall.tenstm
misamt:"", // Amount not yet assigned .liaall.misamt
concur:"", // External Booking Amount .liaall.concur
outpct:"", // Sight Amount Percentage .liaall.outpct
outamt:"", // Sight Amount .liaall.outamt
exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
exttotamt:"", // Total booking amount external assinged .liaall.exttotamt
liaccv:{
newamt:"", // 合同金额 .liaall.liaccv.newamt
concur:"", // 应付保证金金额 .liaall.liaccv.concur
totcovamt:"", // 金额总和 .liaall.liaccv.totcovamt
newresamt:"", // Reserved Amount .liaall.liaccv.newresamt
addinf:"", // Additional Information .liaall.liaccv.addinf
cshpct:"", // 保证金应收比例 .liaall.liaccv.cshpct
relcshpct:"", // 保证金实收比例 .liaall.liaccv.relcshpct
gleflg:"", // Create gle flag .liaall.liaccv.gleflg
chgcurflg:"", // Change currency flag .liaall.liaccv.chgcurflg
pctresamt:"", // reserve amount based percent .liaall.liaccv.pctresamt
},
limmod:{
limpts:{
wrklab:"", // Label .liaall.limmod.limpts.wrklab
othlab:"", // Label .liaall.limmod.limpts.othlab
othlabss:"", // Label .liaall.limmod.limpts.othlabss
wrk:{
pts:new Pts().data,
},
oth:{
pts:new Pts().data,
},
lsh:"", // 合同流�'号 .liaall.limmod.limpts.lsh
nonrevflg1:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg1
pfcod1:"", // 合同流�'号 .liaall.limmod.limpts.pfcod1
nonrevflg2:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg2
pfcod2:"", // 合同流�'号 .liaall.limmod.limpts.pfcod2
},
wrkp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.wrkp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.wrkp.ptsget.sdamod.seainf
},
},
},
othp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.othp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.othp.ptsget.sdamod.seainf
},
},
},
ownref:"", // 国结业务编号 .liaall.limmod.ownref
comamt:"", // 业务余额 .liaall.limmod.comamt
ccvamt:"", // 保证金余额 .liaall.limmod.ccvamt
ecifno:"", // ECIFNO .liaall.limmod.ecifno
},
},
liaall: new Pub().data.Liaall,
setmod:{
doccur:"", // document currency .setmod.doccur
docamt:"", // document amount .setmod.docamt
......@@ -219,29 +162,7 @@ export default class Bdtset{
extrat:"", // Exchange Rate .trtcre.extrat
},
paypsb:"", // Unpaid by Applicant .paypsb
mtabut:{
clsflg:"", // Close Flag .mtabut.clsflg
coninf:{
oitinf:{
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit:{
inftxt:"", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
},
},
oitset:{
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit:{
inftxt:"", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitset.oit.inflev
},
},
conexedat:"", // 执行日期 .mtabut.coninf.conexedat
usr:{
extkey:"", // User ID .mtabut.coninf.usr.extkey
},
},
},
mtabut: new Pub().data.Mtabut,
bddgrp:{
rec:{
frepayflg:"", // Free of Payment Flag .bddgrp.rec.frepayflg
......@@ -390,16 +311,7 @@ export default class Bdtset{
dfucur:"", // 代付金额： .dftcre.dfucur
dfuamt:"", // 代付金额： .dftcre.dfuamt
},
trnmod:{
trndoc:{
advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
amdnam:"", // AMDNAM .trnmod.trndoc.amdnam
advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc
advnam:"", // 国内证落款 .trnmod.trndoc.advnam
amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl
doceot: [],
},
},
trnmod: new Pub().data.Trnmod,
fkr:"", // 付款人： .fkr
fkzh:"", // 付款账号： .fkzh
qxr:"", // 起息日： .qxr
......
src/views/Business/Bdtdcr/Brtdcrd.vue
......@@ -16,15 +16,26 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
</c-row>
<el-form-item label="快递单号">
<c-input
type="textarea"
:disabled="false"
:rows="2"
v-model="model.expmno"
maxlength="120"
show-word-limit
placeholder="请输入单号"
></c-input>
</el-form-item>
<c-row>
<c-col :span="24">
<c-istream-table
:list="model.bdtp.docgrdm.docgrd"
:columns="columns"
>
</c-istream-table>
</c-col>
</c-row>
</c-col>
......@@ -37,8 +48,6 @@
>
</div>
</c-col>
</c-row>
</c-col>
</c-row>
......
src/views/Business/Bdtdcr/index.vue
......@@ -90,7 +90,7 @@ import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan";
import Limitbody from "./Limitbody";
import Limitbody from "~/views/Public/Limitbody";
export default {
name: "Bdtdcr",
......
src/views/Business/Bdtset/Utlp.vue
......@@ -440,20 +440,65 @@
v-model="model.bddgrp.rec.docprbrol"
style="width: 100%"
placeholder="请选择Presented by"
:code="getValues('bddgrp.rec.docprbrol')"
@change="docprbrolChange"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交单行BIC" prop="bddgrp.apl.pts.extkey">
<c-col :span="24">
<el-form-item label="交单行BIC" prop="bddgrp.prb.pts.extkey">
<c-input
v-model="model.bddgrp.prb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
style="width: 100%"
placeholder="请输入交单行BIC"
:disabled="model.bddgrp.rec.docprbrol == 'PRB' ? false : true"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交单行联行行号" prop="bddgrp.prb.pts.bankno">
<c-input
v-model="model.bddgrp.prb.pts.bankno"
maxlength="20"
style="width: 100%"
placeholder="请输入交单行联行行号"
:disabled="model.bddgrp.rec.docprbrol == 'PRB' ? false : true"
@keyup.enter.native="showGridPromptDialog('bddgrp.prb.pts.bankno')"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交单行联行名称(电证用)">
<c-input
type="textarea"
v-model="model.bddgrp.prb.pts.jigomc"
style="width: 100%"
maxlength="35"
show-word-limit
placeholder="请输入联行名称"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="交单行地址(电证用)">
<c-input
type="textarea"
v-model="model.bddgrp.prb.pts.dizhii"
style="width: 100%"
maxlength="35"
show-word-limit
placeholder="请输入交单行地址"
:disabled="model.bddgrp.rec.docprbrol == 'PRB' ? false : true"
></c-input>
</el-form-item>
</c-col>
<c-ptapdome
<!-- <c-ptapdome
:disabledJigomc="true"
:disabledDizhii="true"
:model="model"
......@@ -462,7 +507,7 @@
rol: 'apl',
grp: 'bddgrp',
}"
></c-ptapdome>
></c-ptapdome> -->
......@@ -584,6 +629,7 @@ import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Bdtset/Event";
import PtapDome from "~/views/Public/PtapDome";
import Utils from "~/utils";
export default {
components: { "c-ptapdome": PtapDome },
......@@ -599,13 +645,22 @@ export default {
'3 3 "Cdt" 0 ',
'4 4 "Cur" 0 ',
'5 5 "Amt" 0 ',
'6 6 "Mat.Dat." 0 ',
'6 6 "Mat Dat" 0 ',
],
data: [],
},
};
},
methods: { ...Event },
methods: { ...Event,
docprbrolChange(){
this.executeRule("bddgrp.rec.docprbrol").then((res) => {
if ((res.respCode = SUCCESS)) {
debugger;
Utils.copyValueFromVO(this.model, res.data);
}
});
},
},
created: function () {},
};
</script>
......
src/views/Business/Bdtset/index.vue
......@@ -17,12 +17,12 @@
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000005 -->
<el-tab-pane label="付款信息" name="utlp">
<c-content>
<m-utlp :model="model" :codes="codes"/>
<m-utlp :model="model" :codes="codes" ref="utlp"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="融资" name="crefin" v-if="model.trtcre.crefinflg">
......@@ -84,6 +84,8 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</template>
......@@ -174,16 +176,17 @@ export default {
}
},
methods:{
tabClick(){
}
},
created:async function(){
console.log("进入bdtset交易");
console.log(new Bdtset().data)
let rtnmsg = await this.init({})
let that = this;
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
that.$refs.utlp.stmData.data=rtnmsg.data.liaall_tenstm.rows
//TODO 处理数据逻辑
}
......
src/views/Business/Ditdck/Litdckp.vue
......@@ -154,7 +154,7 @@
type="date"
v-model="model.didgrp.rec.opndat"
disabled
style="width: 95%"
style="width: 100%"
placeholder="请选择开证日期"
>
</c-date-picker>
......@@ -180,7 +180,7 @@
type="date"
v-model="model.didgrp.rec.expdat"
disabled
style="width: 95%"
style="width: 100%"
placeholder="到期日"
>
</c-date-picker>
......@@ -597,6 +597,7 @@
style="width: 100%"
placeholder="请输入交单行联行行号"
:disabled="model.bddgrp.rec.docprbrol == 'PRB' ? false : true"
@keyup.enter.native="showGridPromptDialog('bddgrp.prb.pts.bankno')"
></c-input>
</el-form-item>
</c-col>
......@@ -667,7 +668,7 @@
<c-col :span="24">
<el-form-item label="" prop="model.bddgrp.rec.dscinsflg">
<c-checkbox v-model="model.bddgrp.rec.dscinsflg"
<c-checkbox v-model="model.bddgrp.rec.dscinsflg" @change="isShowDocpre"
>录入单据、不符点、结算指示和货运详细信息</c-checkbox
>
</el-form-item>
......@@ -733,6 +734,9 @@ export default {
}
});
},
isShowDocpre(val){
this.$emit("changeShowDocpre", val)
},
},
created: function () {},
};
......
src/views/Business/Ditdck/index.vue
......@@ -16,7 +16,7 @@
<!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp">
<c-content>
<m-litdckp :model="model" :codes="codes" />
<m-litdckp :model="model" :codes="codes" v-on:changeShowDocpre="changeShowDocpre"/>
</c-content>
</el-tab-pane>
......@@ -26,9 +26,10 @@
</el-tab-pane> -->
<!--PD000062 -->
<el-tab-pane label="单据详情" name="docpre">
<el-tab-pane label="单据详情" name="docpre" v-if="isShowDocpre">
<m-docpre :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane>
<!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet">
......@@ -115,6 +116,7 @@ export default {
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
data() {
return {
isShowDocpre:false,
tabVal: "litdckp",
trnName: "ditdck",
model: new Ditdck().data,
......@@ -129,7 +131,7 @@ export default {
};
},
methods: {
tabClick() {},
},
created: async function () {
// console.log("进入ditdck交易");
......@@ -157,6 +159,11 @@ export default {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
},
methods: {
changeShowDocpre(val) {
this.isShowDocpre = val
}
}
};
</script>
<style>
......
src/views/Business/Infbdd/Infsea.vue
......@@ -14,8 +14,8 @@
<c-row>
<c-col :span="23">
<c-col :span="8">
<el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%">
<c-col :span="6">
<el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%" >
<c-input
v-model="model.infcon.seaownref"
maxlength="16"
......@@ -24,9 +24,12 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="2">
&nbsp;
</c-col>
<c-col :span="10">
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<c-col :span="11">
<c-col :span="10">
<c-date-picker
type="date"
v-model="model.infcon.opndatfrom"
......@@ -37,7 +40,7 @@
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-col :span="10">
<c-date-picker
type="date"
v-model="model.infcon.opndatto"
......@@ -47,7 +50,7 @@
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="6">
<el-form-item label="Name" prop="infcon.nam" style="width: 100%">
<c-input
v-model="model.infcon.nam"
......
src/views/Business/Infdid/Infsea.vue
......@@ -12,7 +12,7 @@
>
<el-row>
<c-col :span="23">
<c-col :span="8">
<c-col :span="6">
<el-form-item
label="Own Reference"
prop="infcon.seaownref"
......@@ -26,13 +26,17 @@
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="2">
&nbsp;
</c-col>
<c-col :span="10">
<el-form-item
label="Opening between"
prop="infcon.opndatfrom"
style="width: 100%"
>
<c-col :span="11">
<c-col :span="10">
<c-date-picker
type="date"
v-model="model.infcon.opndatfrom"
......@@ -44,7 +48,7 @@
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-col :span="10">
<c-date-picker
type="date"
v-model="model.infcon.opndatto"
......@@ -56,7 +60,7 @@
</el-form-item>
</c-col>
<c-col :span="8">
<c-col :span="6">
<el-form-item
label="Party Reference"
prop="infcon.searef"
......
src/views/Public/Ptsmsg.vue
......@@ -6,6 +6,7 @@
v-model="model[argadr.url + 'ref']"
maxlength="16"
:placeholder="'请输入' + argadr.title + '编号'"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
......@@ -16,6 +17,7 @@
v-model="model[argadr.url + 'nam']"
maxlength="40"
:placeholder="'请输入' + argadr.title + '名称'"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
......@@ -28,14 +30,26 @@ import CommonProcess from "~/mixin/CommonProcess";
export default {
inject: ["root"],
mixins: [CommonProcess],
props: ["model", "codes", "argadr"],
props: {
model: {
type: Object,
default: undefined,
},
codes: {},
argadr: {},
disabled: {
//名称地址是否灰显
type: Boolean,
default: false,
},
},
data() {
return {
data: [],
};
},
watch: {},
// methods: { ...Event },
// methods: { ...Event },
created: function () {},
};
</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