Skip to content

V
vue-gjjs
Commit c99ff69d by wangyanjiao
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 13401a8a f17e8bea
Showing with 111 additions and 67 deletions
src/model/Ditdav/Pattern.js
......@@ -17,7 +17,7 @@ export default {
],
"didgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -30,7 +30,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"didgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -53,7 +53,7 @@ export default {
],
"didgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"didgrp.rec.opndat":[
{type: "date", required: false, message: "输入正确的日期"}
......@@ -93,10 +93,10 @@ export default {
"bddgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bddgrp.rec.disdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bddgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -130,7 +130,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bddgrp.prb.adrelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"setmod.ref":[
......@@ -156,18 +156,18 @@ export default {
"mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"}
//{type: "string", required: true, message: "必输项"},
//{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"}
//{type: "string", required: true, message: "必输项"},
//{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
......@@ -250,7 +250,7 @@ export default {
],
"liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -263,7 +263,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"liaall.limmod.ccvamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -286,22 +286,22 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"bddgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bddgrp.cbs.max2.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bddgrp.blk.chaded":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.blk.chaadd":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.rec.totcur":[
......@@ -309,7 +309,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"bddgrp.rec.totamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -327,19 +327,19 @@ export default {
],
"bddgrp.acb.namelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.acb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.acb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.acb.adrelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.blk.docdis":[
......@@ -348,7 +348,7 @@ export default {
],
"bddgrp.blk.nartxt77a":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bdtp.rmbp.ptsget.sdamod.dadsnd":[
......@@ -365,19 +365,19 @@ export default {
],
"bddgrp.rmb.namelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.rmb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.rmb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.rmb.adrelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bdtp.bebp.ptsget.sdamod.dadsnd":[
......@@ -394,22 +394,22 @@ export default {
],
"bddgrp.beb.namelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.beb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.beb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.beb.adrelc":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bddgrp.rec.totdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
}
\ No newline at end of file
src/model/Ditdla/Pattern.js
......@@ -25,7 +25,7 @@ export default {
"didgrp.cbs.opn1.amt": [
{ type: "string", required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
//{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"didgrp.avbnam": [
{ type: "string", required: false, message: "必输项" },
......@@ -58,7 +58,7 @@ export default {
{ type: "string", required: false, message: "输入正确的日期" }
],
"didgrp.rec.expplc": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"didgrp.adv.pts.nam": [
......@@ -219,7 +219,7 @@ export default {
{ max: 3, message: "长度不能超过3" }
],
"didgrp.apl.namelc": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"didgrp.apl.pts.adrblk": [
......@@ -235,7 +235,7 @@ export default {
{ max: 76, message: "长度不能超过76" }
],
"didgrp.apl.adrelc": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"didgrp.rec.nomtop": [
......@@ -284,7 +284,7 @@ export default {
{ max: 3, message: "长度不能超过3" }
],
"didgrp.ben.namelc": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"didgrp.ben.pts.adrblk": [
......@@ -296,7 +296,7 @@ export default {
{ max: 35, message: "长度不能超过35" }
],
"didgrp.ben.adrelc": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
......@@ -346,7 +346,7 @@ export default {
{ max: 35, message: "长度不能超过35" }
],
"didgrp.blk.preper": [
{ type: "string", required: true, message: "必输项" },
//{ type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" }
],
"didgrp.rec.shpfro": [
......
src/views/Business/Ditdav/Davp.vue
......@@ -118,7 +118,7 @@
placeholder="请选择兑付方式"
>
<el-option
v-for="item in codes.avbby"
v-for="item in codes.avbby0"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -303,7 +303,7 @@
v-model="model.bddgrp.rec.advtyp"
style="width:100%"
placeholder="请选择Type of Advice"
:code="codes.advtyp"
:code="advtyp"
></c-select>
</el-form-item>
</c-col>
......@@ -312,7 +312,7 @@
<c-col :span="12">
<el-form-item label="Payment" prop="bddgrp.rec.advdat">
<c-date-picker
disabled
:disabled="model.bddgrp.rec.advtyp=='750' || model.bddgrp.rec.advtyp=='oth'"
type="date"
v-model="model.bddgrp.rec.advdat"
style="width:100%"
......@@ -323,7 +323,8 @@
<c-col :span="12">
<el-form-item label="Discrep" prop="bddgrp.rec.disdat">
<c-date-picker
<c-date-picker
:disabled="model.bddgrp.rec.advtyp=='754' || model.bddgrp.rec.advtyp=='oth'"
type="date"
v-model="model.bddgrp.rec.disdat"
style="width:100%"
......@@ -332,7 +333,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<!-- <c-col :span="24">
<el-form-item label="">
<c-checkbox v-model="model.bdtp.setnowflg">Register to Send and Settle Document</c-checkbox>
</el-form-item>
......@@ -342,7 +343,7 @@
<el-form-item label="">
<c-checkbox v-model="model.bdtp.dcrflg" >Register to Handle Discrepancies</c-checkbox>
</el-form-item>
</c-col>
</c-col> -->
</c-col>
......@@ -378,7 +379,7 @@
</el-form-item>
</c-col>
<c-col :span="24" >
<!-- <c-col :span="24" >
<el-form-item label="Reference" prop="bddgrp.prb.pts.ref">
<c-input
v-model="model.bddgrp.prb.pts.ref"
......@@ -386,9 +387,23 @@
placeholder="请输入Reference"
></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24" >
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: 'ExtKey',
grp: 'bddgrp',
rol: 'prb',
}"
:disabled="true"
:onlySearch="true"
>
</c-ptap>
</c-col>
<!-- <c-col :span="24" >
<c-col :span="19">
<el-form-item label="ExtKey" prop="bddgrp.prb.pts.extkey">
<c-input v-model="model.bddgrp.prb.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input>
......@@ -408,12 +423,12 @@
Details
</c-button>
</c-col>
</c-col>
</c-col> -->
<c-col :span="24" >
<el-form-item label="名称" prop="bddgrp.prb.namelc">
<c-input type="textarea" v-model="model.bddgrp.prb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
<c-input disabled type="textarea" v-model="model.bddgrp.prb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
</el-form-item>
</c-col>
......@@ -434,13 +449,20 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Ditdav/Event"
import Ptap from "~/views/Public/Ptap";
export default {
components: { "c-ptap": Ptap },
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
advtyp: [
{ label: "Advice of Discrepancy (MT750)", value: "750" },
{ label: "Advice of Payment (MT754)", value: "754" },
{ label: "Other", value: "oth" },
],
};
},
......
src/views/Business/Ditdav/Mt750p.vue
......@@ -3,7 +3,7 @@
<c-col>
<c-col :span="7">
<el-form-item label="单据金额" prop="bddgrp.cbs.max.cur">
<c-input v-model="model.bddgrp.cbs.max.cur" maxlength="3" placeholder="请输入单据金额" disabled></c-input>
<c-select disabled v-model="model.bddgrp.cbs.max.cur" style="width:100%" placeholder="请选择单据金额" :code="codes.cur " ></c-select>
</el-form-item>
</c-col>
......
src/views/Business/Ditdav/Othadvtypp.vue
......@@ -76,7 +76,7 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item label="名称" prop="bddgrp.acb.namelc">
<c-input type="textarea" v-model="model.bddgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
</el-form-item>
</c-col>
......@@ -84,19 +84,19 @@
<c-col :span="12">
<el-form-item label="Address Block" prop="bddgrp.acb.pts.adrblk">
<c-input type="textarea" v-model="model.bddgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="Chinese address" prop="bddgrp.acb.dbfadrblkcn">
<c-input type="textarea" v-model="model.bddgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="地址" prop="bddgrp.acb.adrelc">
<c-input type="textarea" v-model="model.bddgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
</el-form-item>
</c-col>
......@@ -122,25 +122,25 @@
<c-col>
<c-col :span="12">
<el-form-item label="名称" prop="bddgrp.beb.namelc">
<c-input type="textarea" v-model="model.bddgrp.beb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.beb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Address Block" prop="bddgrp.beb.pts.adrblk">
<c-input type="textarea" v-model="model.bddgrp.beb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.beb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Chinese address" prop="bddgrp.beb.dbfadrblkcn">
<c-input type="textarea" v-model="model.bddgrp.beb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.beb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="地址" prop="bddgrp.beb.adrelc">
<c-input type="textarea" v-model="model.bddgrp.beb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
<c-input type="textarea" disabled v-model="model.bddgrp.beb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Ditdav/index.vue
......@@ -53,7 +53,9 @@
<!--PD000000 -->
<el-tab-pane label="账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000000 -->
......
src/views/Business/Ditdla/Accp.vue
......@@ -135,6 +135,13 @@
style="width: 100%"
placeholder="请选择Available by"
>
<el-option
v-for="item in codes.avbby0"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
......@@ -238,6 +245,13 @@
style="width: 100%"
placeholder="请选择Form of Documentary Credit"
>
<el-option
v-for="item in codes.lcrtyp"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
......@@ -245,6 +259,8 @@
<!--右边-->
<c-col :span="12"><el-form-item label=""></el-form-item></c-col>
<c-col :span="12">
<el-row>
<c-col :span="20">
......@@ -322,7 +338,7 @@
</c-col>
<c-col :span="23">
<c-col :span="24">
<el-form-item label="Decrease limits stream" prop="decstm">
<c-istream-table
:list="model.decstm.rows || []"
......
src/views/Business/Ditdla/Ovwp.vue
......@@ -419,7 +419,7 @@
placeholder="请选择假远期信用证"
>
<el-option
v-for="item in codes.jyqflg"
v-for="item in jyqflg"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -581,14 +581,13 @@
</c-col>
<c-col :span="24">
<el-form-item label="申请人账号" prop="didgrp.apl.pts.extact">
<c-select
<el-form-item label="申请人账号" style="width: 100%" prop="didgrp.apl.pts.extact">
<c-input
disabled
v-model="model.didgrp.apl.pts.extact"
style="width: 100%"
maxlength="20"
placeholder="请选择External Account"
>
</c-select>
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -831,6 +830,10 @@ export default {
mixins: [commonProcess],
data() {
return {
jyqflg: [
{ label: "否", value: "" },
{ label: "是", value: "X" },
],
jigomcFlag: false,
trade: "",
};
......
src/views/Business/Ditdla/index.vue
......@@ -222,7 +222,7 @@ export default {
};
},
methods: {
tabClick() {},
// tabClick() {},
},
created: async function () {
console.log("进入ditdla交易");
......
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