Skip to content

V
vue-gjjs
Commit bcfa46ff by nanrui
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 26ab4bf4 864a8da7
Showing with 119 additions and 83 deletions
src/model/Botame/Pattern.js
......@@ -16,23 +16,23 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"botamep.amedat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"oldbodgrp.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位" }
],
"trnmod.swiadd.ameamt":[
{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位" }
],
"trnmod.swiadd.newamt":[
{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位" }
],
......@@ -58,7 +58,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.ametxt":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"botp.recget.sdamod.dadsnd":[
......@@ -134,7 +134,7 @@ export default {
],
"bodgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bodgrp.drr.adrelc":[
{type: "string", required: true, message: "必输项"},
......@@ -199,7 +199,7 @@ export default {
],
"bodgrp.blk.bogdet":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 43,message:"长度不能超过43"}
],
"bodgrp.dre.pts.ref":[
......@@ -254,12 +254,12 @@ export default {
"bodgrp.blk.chgtxt":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bodgrp.blk.dftins":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
......@@ -287,16 +287,16 @@ export default {
],
"bodgrp.blk.intins":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"bodgrp.blk.setinsbo":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"bodgrp.blk.agtaut":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bodgrp.rec.shpfro":[
......@@ -308,7 +308,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"bodgrp.blk.goddes":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"setmod.ref":[
......@@ -338,18 +338,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: "必输项"},
......
src/model/Botame/index.js
......@@ -150,6 +150,7 @@ export default class Botame{
},
},
docgrdm:{
docgrd:"",
docdsclab:"", // Label of document description .botp.docgrdm.docdsclab
},
drrp:{
......
src/model/Botcan/Pattern.js
......@@ -17,7 +17,7 @@ export default {
],
"bodgrp.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位" }
],
......@@ -27,7 +27,7 @@ export default {
],
"bodgrp.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 {
{type: "date", required: false, message: "输入正确的日期"}
],
"bodgrp.rec.matpercnt":[
{type: "string", required: false, message: "必输项"},
{type: "int", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
......@@ -73,7 +73,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"}
],
"strinf":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
......@@ -100,18 +100,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: "必输项"},
......
src/model/Botcan/index.js
import Api from "~/service/Api"
import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Botcan{
constructor () {
......@@ -114,6 +115,10 @@ export default class Botcan{
filrecv:"", // File Receiver .trnmod.trndoc.filrecv
},
},
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
pageId: "" // ctx的key
}
}
......
src/model/Botset/Pattern.js
......@@ -17,7 +17,7 @@ export default {
],
"bodgrp.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位" }
],
......@@ -27,7 +27,7 @@ export default {
],
"bodgrp.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位" }
],
......@@ -101,7 +101,7 @@ export default {
"bodgrp.blk.chgtxt":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
......@@ -272,18 +272,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: "必输项"},
......@@ -329,12 +329,12 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lendoc.account":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 25,message:"长度不能超过25"}
],
"lendoc.vercerref":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"lendoc.decnum":[
......@@ -349,7 +349,7 @@ export default {
"bopmod.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
......
src/views/Business/Botame/Amep.vue
......@@ -89,7 +89,7 @@
disabled
v-model="model.oldbodgrp.cbs.max.amt"
style="text-align: left; width: 100%"
placeholder="请选择Original Amount"
placeholder="请输入Original Amount"
@keyup.enter.native="defaultFunction('oldbodgrp.cbs.max.amt', model.oldbodgrp.cbs.max.amt)"
></c-input-currency>
</el-form-item>
......@@ -178,7 +178,14 @@
<c-col :span="7">
<el-form-item label="" prop="trnmod.swiadd.newmatpertyp" label-width="5px">
<c-input disabled v-model="model.trnmod.swiadd.newmatpertyp" maxlength="1" placeholder="请选择Days/Month or Year for Maturity Period"></c-input>
<c-select disabled v-model="model.trnmod.swiadd.newmatpertyp" style="width: 100%" placeholder="请选择Days/Month or Year for Maturity Period"></c-select>
<el-option
v-for="item in codes.matper"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-form-item>
</c-col>
......
src/views/Business/Botame/Inst.vue
......@@ -193,7 +193,7 @@
<el-form-item label="Changes Condition" prop="bodgrp.rec.chato" style="padding-top:15px">
<c-select v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"
:code="codes.chato">
:code="codes.chadet">
</c-select>
......
src/views/Business/Botame/Ovwp.vue
......@@ -211,7 +211,7 @@
<el-form-item label="发票类型" prop="bodgrp.rec.invtyp">
<c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" >
<el-option
v-for="item in codes.invtyp"
v-for="item in invtyp"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -372,6 +372,10 @@ import Event from "~/model/Botame/Event"
mixins: [commonProcess],
data() {
return {
invtyp: [
{ label: "type1", value: "1" }
],
codeTable: [
{ label: "Airway Bills", value: "Airway Bills" },
{ label: "Beneficiary's Declaration", value: "Beneficiary's Declaration" },
......
src/views/Business/Botame/index.vue
......@@ -98,6 +98,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Botame from "~/model/Botame"
import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Botame/Check"
import Default from "~/model/Botame/Default"
import Pattern from "~/model/Botame/Pattern"
......@@ -133,7 +134,7 @@ export default {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "amep",
......@@ -149,8 +150,6 @@ export default {
}
},
methods:{
tabClick(){
}
},
created:async function(){
console.log("进入botame交易");
......
src/views/Business/Botcan/Canp.vue
......@@ -122,7 +122,7 @@
placeholder="请选择Collection Condition"
>
<el-option
v-for="item in codes.doctyp"
v-for="item in codes.doctypcod"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -185,7 +185,7 @@
placeholder="请选择Start of Maturity Period MATBEG"
>
<el-option
v-for="item in codes.matbeg"
v-for="item in codes.matperbeg"
:key="item.value"
:label="item.label"
:value="item.value"
......
src/views/Business/Botcan/index.vue
......@@ -31,27 +31,36 @@
</c-content>
</el-tab-pane>
<!--账务 -->
<el-tab-pane label="账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--附言 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<!--报文及面函 -->
<el-tab-pane label="报文及面函" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--附件 -->
<el-tab-pane label="附件" name="doctre">
<m-doctre :model="model" :codes="codes" />
<!--Liability -->
<!-- 或有 -->
<el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--Settlement -->
<el-tab-pane label="Settlement" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--Bookings -->
<el-tab-pane label="Bookings" name="glepan">
<m-glepan :model="model" :codes="codes"/>
</el-tab-pane>
<!--Completion -->
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--Messages -->
<el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--Attachments -->
<el-tab-pane label="Attachments" name="doctre">
<m-doctre :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
......@@ -69,6 +78,7 @@ import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable";
import Botcan from "~/model/Botcan";
import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Botcan/Check";
import Default from "~/model/Botcan/Default";
import Pattern from "~/model/Botcan/Pattern";
......@@ -81,6 +91,8 @@ import Doctre from "./Doctre";
import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan"
import Coninfp from "~/views/Public/Coninfp"
import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
export default {
components: {
......@@ -89,13 +101,15 @@ export default {
"m-coninfp": Coninfp,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-engp": Engp,
"m-glepan" : Glepan,
},
provide() {
return {
root: this,
};
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "canp",
......@@ -109,7 +123,7 @@ export default {
};
},
methods: {
tabClick() {},
// tabClick() {},
},
created: async function() {
console.log("进入botcan交易");
......
src/views/Business/Botset/Inst.vue
......@@ -193,7 +193,7 @@
<el-form-item label="Changes Condition" prop="bodgrp.rec.chato" style="padding-top:15px">
<c-select disabled v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"
:code="codes.chato">
:code="codes.chadet">
</c-select>
......
src/views/Business/Botset/Wg.vue
......@@ -11,7 +11,7 @@
placeholder="请选择申报类型"
>
<el-option
v-for="item in codes.szflg1"
v-for="item in codes.szflg"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -38,10 +38,10 @@
v-model="model.bopmod.acttyp"
style="width: 100%"
placeholder="请选择款项来源"
disabled
>
<el-option
v-for="item in codes.acttyp"
v-for="item in acttyp"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -59,7 +59,7 @@
v-model="model.bopmod.ownextkey"
style="width: 100%"
placeholder="请选择地区机构号"
disabled
>
</c-select>
</el-form-item>
......@@ -71,11 +71,11 @@
<c-select
v-model="model.bopmod.outchargeccy"
placeholder="请选择国外银行扣费（涉外收入申报专用）"
disabled
style="width: 100%"
>
<el-option
v-for="item in codes.curtxt1"
v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -89,7 +89,7 @@
<c-input
v-model="model.bopmod.outchargeamt"
placeholder="请输入国外银行扣费（涉外收入申报专用）"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -153,7 +153,13 @@ export default {
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
return {
acttyp: [
{ label: "境外", value: "(JW)" },
{ label: "境内非居民", value: "(JN)" },
],
};
},
methods: { ...Event },
created: function () {},
......
src/views/Business/Botset/index.vue
......@@ -103,6 +103,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Botset from "~/model/Botset"
import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs"
import Check from "~/model/Botset/Check"
import Default from "~/model/Botset/Default"
import Pattern from "~/model/Botset/Pattern"
......@@ -144,7 +145,7 @@ export default {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "setp",
......@@ -160,8 +161,7 @@ export default {
}
},
methods:{
tabClick(){
}
//tabClick(){}
},
created:async function(){
console.log("进入botset交易");
......
src/views/Business/Infgid/Infsea.vue
......@@ -443,7 +443,7 @@
size="medium"
type="primary"
@click="toGitopn"
>开立进口保函</c-button
>进口保函开立</c-button
>
</c-col>
......@@ -514,7 +514,7 @@
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gidgrp" :model="gitselModel" tabIndex=3 @onChoose="onChoose">11</m-busbtn>
<m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gidgrp" :model="gitselModel" tabIndex=1 @onChoose="onChoose">11</m-busbtn>
</div>
</el-dialog>
......
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