Commit f5b7ca37 by wangyanjiao

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 6068c389 bcfa46ff
...@@ -16,23 +16,23 @@ export default { ...@@ -16,23 +16,23 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"botamep.amedat":[ "botamep.amedat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"oldbodgrp.cbs.max.amt":[ "oldbodgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
"trnmod.swiadd.ameamt":[ "trnmod.swiadd.ameamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
"trnmod.swiadd.newamt":[ "trnmod.swiadd.newamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"trnmod.swiadd.ametxt":[ "trnmod.swiadd.ametxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"botp.recget.sdamod.dadsnd":[ "botp.recget.sdamod.dadsnd":[
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
], ],
"bodgrp.rec.shpdat":[ "bodgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"bodgrp.drr.adrelc":[ "bodgrp.drr.adrelc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
], ],
"bodgrp.blk.bogdet":[ "bodgrp.blk.bogdet":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 43,message:"长度不能超过43"} {max: 43,message:"长度不能超过43"}
], ],
"bodgrp.dre.pts.ref":[ "bodgrp.dre.pts.ref":[
...@@ -254,12 +254,12 @@ export default { ...@@ -254,12 +254,12 @@ export default {
"bodgrp.blk.chgtxt":[ "bodgrp.blk.chgtxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bodgrp.blk.dftins":[ "bodgrp.blk.dftins":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
...@@ -287,16 +287,16 @@ export default { ...@@ -287,16 +287,16 @@ export default {
], ],
"bodgrp.blk.intins":[ "bodgrp.blk.intins":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
"bodgrp.blk.setinsbo":[ "bodgrp.blk.setinsbo":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
"bodgrp.blk.agtaut":[ "bodgrp.blk.agtaut":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bodgrp.rec.shpfro":[ "bodgrp.rec.shpfro":[
...@@ -308,7 +308,7 @@ export default { ...@@ -308,7 +308,7 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"bodgrp.blk.goddes":[ "bodgrp.blk.goddes":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
"setmod.ref":[ "setmod.ref":[
...@@ -338,18 +338,18 @@ export default { ...@@ -338,18 +338,18 @@ export default {
], ],
"mtabut.coninf.oitinf.oit.inftxt":[ "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.oitset.oit.inftxt":[ "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"mtabut.coninf.usr.extkey":[ "mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
...@@ -150,6 +150,7 @@ export default class Botame{ ...@@ -150,6 +150,7 @@ export default class Botame{
}, },
}, },
docgrdm:{ docgrdm:{
docgrd:"",
docdsclab:"", // Label of document description .botp.docgrdm.docdsclab docdsclab:"", // Label of document description .botp.docgrdm.docdsclab
}, },
drrp:{ drrp:{
......
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
], ],
"bodgrp.cbs.max.amt":[ "bodgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
], ],
"bodgrp.cbs.opn1.amt":[ "bodgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -53,7 +53,7 @@ export default { ...@@ -53,7 +53,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"bodgrp.rec.matpercnt":[ "bodgrp.rec.matpercnt":[
{type: "string", required: false, message: "必输项"}, {type: "int", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"strinf":[ "strinf":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 50,message:"长度不能超过50"}
], ],
...@@ -100,18 +100,18 @@ export default { ...@@ -100,18 +100,18 @@ export default {
"mtabut.coninf.oitinf.oit.inftxt":[ "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.oitset.oit.inftxt":[ "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"mtabut.coninf.usr.extkey":[ "mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
import Api from "~/service/Api" import Api from "~/service/Api"
import Pts from "../Common/Pts" import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Botcan{ export default class Botcan{
constructor () { constructor () {
...@@ -114,6 +115,10 @@ export default class Botcan{ ...@@ -114,6 +115,10 @@ export default class Botcan{
filrecv:"", // File Receiver .trnmod.trndoc.filrecv 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 pageId: "" // ctx的key
} }
} }
......
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
], ],
"bodgrp.cbs.max.amt":[ "bodgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
], ],
"bodgrp.cbs.opn1.amt":[ "bodgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
"bodgrp.blk.chgtxt":[ "bodgrp.blk.chgtxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
...@@ -272,18 +272,18 @@ export default { ...@@ -272,18 +272,18 @@ export default {
], ],
"mtabut.coninf.oitinf.oit.inftxt":[ "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.oitset.oit.inftxt":[ "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"} //{max: 60,message:"长度不能超过60"}
], ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"mtabut.coninf.usr.extkey":[ "mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -329,12 +329,12 @@ export default { ...@@ -329,12 +329,12 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"lendoc.account":[ "lendoc.account":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 25,message:"长度不能超过25"} {max: 25,message:"长度不能超过25"}
], ],
"lendoc.vercerref":[ "lendoc.vercerref":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 20,message:"长度不能超过20"} {max: 20,message:"长度不能超过20"}
], ],
"lendoc.decnum":[ "lendoc.decnum":[
...@@ -349,7 +349,7 @@ export default { ...@@ -349,7 +349,7 @@ export default {
"bopmod.outchargeamt":[ "bopmod.outchargeamt":[
{type: "number", required: false, message: "必输项"} ], {type: "string", required: false, message: "必输项"} ],
......
...@@ -7,6 +7,7 @@ import Layout from "../views/Layout"; ...@@ -7,6 +7,7 @@ import Layout from "../views/Layout";
import BusRouter from "../views/Business/BusRouter"; import BusRouter from "../views/Business/BusRouter";
import ReviewRouter from "../views/Review/ReviewRouter"; import ReviewRouter from "../views/Review/ReviewRouter";
import DocRouter from "../views/Docpan/DocRouter"; import DocRouter from "../views/Docpan/DocRouter";
import ModelViewer from "../views/ModeViewer"
Vue.use(VueRouter); Vue.use(VueRouter);
...@@ -55,6 +56,7 @@ export const routes = [ ...@@ -55,6 +56,7 @@ export const routes = [
{ path: "/display", component: Display, children: DisplayRouter }, { path: "/display", component: Display, children: DisplayRouter },
{ path: "/login", component: Login, name: "Login" }, { path: "/login", component: Login, name: "Login" },
{ path: "/docpan", component: () => import("../views/Docpan"), children: DocRouter }, { path: "/docpan", component: () => import("../views/Docpan"), children: DocRouter },
{ path: "/model/viewer",component:ModelViewer},
]; ];
const rootRouter = new VueRouter({ const rootRouter = new VueRouter({
......
...@@ -126,7 +126,7 @@ export default class Api ...@@ -126,7 +126,7 @@ export default class Api
static _get(url,data) static _get(url,data)
{ {
// return this._post(url,data,"get"); // return this._post(url,data,"get");
return requestManager.pushRequest(this._post.bind(this, BASE_URI+url, data, "get")) return requestManager.pushRequest(this._post.bind(this, url, data, "get"))
} }
static post(url,data) static post(url,data)
{ {
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
disabled disabled
v-model="model.oldbodgrp.cbs.max.amt" v-model="model.oldbodgrp.cbs.max.amt"
style="text-align: left; width: 100%" 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)" @keyup.enter.native="defaultFunction('oldbodgrp.cbs.max.amt', model.oldbodgrp.cbs.max.amt)"
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
...@@ -178,7 +178,14 @@ ...@@ -178,7 +178,14 @@
<c-col :span="7"> <c-col :span="7">
<el-form-item label="" prop="trnmod.swiadd.newmatpertyp" label-width="5px"> <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> </el-form-item>
</c-col> </c-col>
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<el-form-item label="Changes Condition" prop="bodgrp.rec.chato" style="padding-top:15px"> <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" <c-select v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"
:code="codes.chato"> :code="codes.chadet">
</c-select> </c-select>
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
<el-form-item label="发票类型" prop="bodgrp.rec.invtyp"> <el-form-item label="发票类型" prop="bodgrp.rec.invtyp">
<c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" > <c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" >
<el-option <el-option
v-for="item in codes.invtyp" v-for="item in invtyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -372,6 +372,10 @@ import Event from "~/model/Botame/Event" ...@@ -372,6 +372,10 @@ import Event from "~/model/Botame/Event"
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {
invtyp: [
{ label: "type1", value: "1" }
],
codeTable: [ codeTable: [
{ label: "Airway Bills", value: "Airway Bills" }, { label: "Airway Bills", value: "Airway Bills" },
{ label: "Beneficiary's Declaration", value: "Beneficiary's Declaration" }, { label: "Beneficiary's Declaration", value: "Beneficiary's Declaration" },
......
...@@ -98,6 +98,7 @@ import Api from "~/service/Api" ...@@ -98,6 +98,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Botame from "~/model/Botame" import Botame from "~/model/Botame"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Botame/Check" import Check from "~/model/Botame/Check"
import Default from "~/model/Botame/Default" import Default from "~/model/Botame/Default"
import Pattern from "~/model/Botame/Pattern" import Pattern from "~/model/Botame/Pattern"
...@@ -133,7 +134,7 @@ export default { ...@@ -133,7 +134,7 @@ export default {
root: this root: this
} }
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){ data(){
return { return {
tabVal: "amep", tabVal: "amep",
...@@ -149,8 +150,6 @@ export default { ...@@ -149,8 +150,6 @@ export default {
} }
}, },
methods:{ methods:{
tabClick(){
}
}, },
created:async function(){ created:async function(){
console.log("进入botame交易"); console.log("进入botame交易");
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
placeholder="请选择Collection Condition" placeholder="请选择Collection Condition"
> >
<el-option <el-option
v-for="item in codes.doctyp" v-for="item in codes.doctypcod"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
placeholder="请选择Start of Maturity Period MATBEG" placeholder="请选择Start of Maturity Period MATBEG"
> >
<el-option <el-option
v-for="item in codes.matbeg" v-for="item in codes.matperbeg"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
......
...@@ -31,26 +31,35 @@ ...@@ -31,26 +31,35 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--账务 --> <!--Liability -->
<el-tab-pane label="账务" name="setpan"> <!-- 或有 -->
<c-content> <el-tab-pane label="Liability" name="engp">
<m-setpan :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</c-content> </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> </el-tab-pane>
<!--附言 --> <!--Completion -->
<el-tab-pane label="附言" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--报文及面函 --> <!--Messages -->
<el-tab-pane label="报文及面函" name="docpan"> <el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--附件 --> <!--Attachments -->
<el-tab-pane label="附件" name="doctre"> <el-tab-pane label="Attachments" name="doctre">
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
...@@ -69,6 +78,7 @@ import Utils from "~/utils/index"; ...@@ -69,6 +78,7 @@ import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Botcan from "~/model/Botcan"; import Botcan from "~/model/Botcan";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Botcan/Check"; import Check from "~/model/Botcan/Check";
import Default from "~/model/Botcan/Default"; import Default from "~/model/Botcan/Default";
import Pattern from "~/model/Botcan/Pattern"; import Pattern from "~/model/Botcan/Pattern";
...@@ -81,6 +91,8 @@ import Doctre from "./Doctre"; ...@@ -81,6 +91,8 @@ import Doctre from "./Doctre";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan" import Docpan from "~/views/Public/Docpan"
import Coninfp from "~/views/Public/Coninfp" import Coninfp from "~/views/Public/Coninfp"
import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
export default { export default {
components: { components: {
...@@ -89,13 +101,15 @@ export default { ...@@ -89,13 +101,15 @@ export default {
"m-coninfp": Coninfp, "m-coninfp": Coninfp,
"m-docpan": Docpan, "m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-engp": Engp,
"m-glepan" : Glepan,
}, },
provide() { provide() {
return { return {
root: this, root: this,
}; };
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "canp", tabVal: "canp",
...@@ -109,7 +123,7 @@ export default { ...@@ -109,7 +123,7 @@ export default {
}; };
}, },
methods: { methods: {
tabClick() {}, // tabClick() {},
}, },
created: async function() { created: async function() {
console.log("进入botcan交易"); console.log("进入botcan交易");
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<el-form-item label="Changes Condition" prop="bodgrp.rec.chato" style="padding-top:15px"> <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" <c-select disabled v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"
:code="codes.chato"> :code="codes.chadet">
</c-select> </c-select>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
placeholder="请选择申报类型" placeholder="请选择申报类型"
> >
<el-option <el-option
v-for="item in codes.szflg1" v-for="item in codes.szflg"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
v-model="model.bopmod.acttyp" v-model="model.bopmod.acttyp"
style="width: 100%" style="width: 100%"
placeholder="请选择款项来源" placeholder="请选择款项来源"
disabled
> >
<el-option <el-option
v-for="item in codes.acttyp" v-for="item in acttyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
v-model="model.bopmod.ownextkey" v-model="model.bopmod.ownextkey"
style="width: 100%" style="width: 100%"
placeholder="请选择地区机构号" placeholder="请选择地区机构号"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -71,11 +71,11 @@ ...@@ -71,11 +71,11 @@
<c-select <c-select
v-model="model.bopmod.outchargeccy" v-model="model.bopmod.outchargeccy"
placeholder="请选择国外银行扣费(涉外收入申报专用)" placeholder="请选择国外银行扣费(涉外收入申报专用)"
disabled
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="item in codes.curtxt1" v-for="item in codes.cur"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<c-input <c-input
v-model="model.bopmod.outchargeamt" v-model="model.bopmod.outchargeamt"
placeholder="请输入国外银行扣费(涉外收入申报专用)" placeholder="请输入国外银行扣费(涉外收入申报专用)"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -153,7 +153,13 @@ export default { ...@@ -153,7 +153,13 @@ export default {
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return {}; return {
acttyp: [
{ label: "境外", value: "(JW)" },
{ label: "境内非居民", value: "(JN)" },
],
};
}, },
methods: { ...Event }, methods: { ...Event },
created: function () {}, created: function () {},
......
...@@ -103,6 +103,7 @@ import Api from "~/service/Api" ...@@ -103,6 +103,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Botset from "~/model/Botset" import Botset from "~/model/Botset"
import commonProcess from "~/mixin/commonProcess" import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs"
import Check from "~/model/Botset/Check" import Check from "~/model/Botset/Check"
import Default from "~/model/Botset/Default" import Default from "~/model/Botset/Default"
import Pattern from "~/model/Botset/Pattern" import Pattern from "~/model/Botset/Pattern"
...@@ -144,7 +145,7 @@ export default { ...@@ -144,7 +145,7 @@ export default {
root: this root: this
} }
}, },
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){ data(){
return { return {
tabVal: "setp", tabVal: "setp",
...@@ -160,8 +161,7 @@ export default { ...@@ -160,8 +161,7 @@ export default {
} }
}, },
methods:{ methods:{
tabClick(){ //tabClick(){}
}
}, },
created:async function(){ created:async function(){
console.log("进入botset交易"); console.log("进入botset交易");
......
...@@ -223,6 +223,13 @@ ...@@ -223,6 +223,13 @@
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" :model="BctselModel" ownrefPath="bcdgrp" trnCode="bctsel"
@onChoose="onChoose">11</m-busbtn>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -231,14 +238,21 @@ import commonProcess from "~/mixin/commonProcess" ...@@ -231,14 +238,21 @@ import commonProcess from "~/mixin/commonProcess"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Infbcd/Event" import Event from "~/model/Infbcd/Event"
// import BusNavbar from "./BusNavbar.vue"; import BctselModel from "~/model/Bctsel"
import BusNavbar from "~/views/Public/BusNavbar";
export export
default { default {
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
components: { "m-busbtn": BusNavbar },
data() { data() {
return { return {
BctselModel: new BctselModel().data,
ownref: "",
initdialog: false,
dialogTableVisible: false,
trnData: { trnData: {
columns: [ columns: [
'1 1 "编号" 200', '1 1 "编号" 200',
......
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"> <div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" :model="botselModel" trnCode="botsel" @onChoose="onChoose">11</m-busbtn> <m-busbtn ref="childs" :ownref="ownref" :model="botselModel" ownrefPath="bodgrp" trnCode="botsel" @onChoose="onChoose">11</m-busbtn>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -259,7 +259,7 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -259,7 +259,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infbod/Event"; import Event from "~/model/Infbod/Event";
import BotselModel from "~/model/Botsel" import botselModel from "~/model/Botsel"
import BusNavbar from "~/views/Public/BusNavbar"; import BusNavbar from "~/views/Public/BusNavbar";
export default { export default {
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
components: { "m-busbtn": BusNavbar }, components: { "m-busbtn": BusNavbar },
data() { data() {
return { return {
botselModel: new BotselModel().data, botselModel: new botselModel().data,
ownref: "", ownref: "",
initdialog: false, initdialog: false,
dialogTableVisible: false, dialogTableVisible: false,
......
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
size="medium" size="medium"
type="primary" type="primary"
@click="toGitopn" @click="toGitopn"
>开立进口保函</c-button >进口保函开立</c-button
> >
</c-col> </c-col>
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"> <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> </div>
</el-dialog> </el-dialog>
......
import Api from "~/service/Api"
const prefix = "gjjs/business"
const cache = {}
function viewAllTrans(){
return Api.pget(`/${prefix}/model/view/all`)
}
async function viewModelData(trans){
if(cache.trans){
return new Promise(resolve=>resolve(cache.trans))
}
let rtndata = Api.pget(`/${prefix}/model/view/${trans}`)
if(rtndata.respCode == SUCCESS){
cache[trans] = rtndata
}
return rtndata
}
export default {viewAllTrans,viewModelData}
\ No newline at end of file
<template>
<div class="structShow">
<div class="structFields">
<el-table
size="medium"
:data="simpleFields"
height="300px"
style="width: 100%">
<el-table-column
prop="name"
label="Datafields"
width="200">
</el-table-column>
<el-table-column
prop="typeName"
label="Data Type"
>
</el-table-column>
</el-table>
</div>
<div class="structRules">
<!-- tree -->
<b>Rules:</b>
<br/>
<el-tree
:data="ruleData"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<img :src="getRuleIcon(node,data)" class="ruleIcon"/>
<span :title="data.methodName">{{ node.label }}</span>
</span>
</el-tree>
</div>
</div>
</template>
<script>
export default {
props:{
fields:{
type: Array,
default:()=>[]
},
initList:{
type: Array,
default:()=>[]
},
ruleList:{
type: Array,
default:()=>[]
},
checkList:{
type: Array,
default:()=>[]
},
defaultList:{
type: Array,
default:()=>[]
},
globalList:{
type: Array,
default:()=>[]
},
staticList:{
type: Array,
default:()=>[]
},
},
data(){
return {
}
},
methods:{
getRuleIcon(node,data){
if(node.level == 1){
if(data.id == "0"){
return require("~/assets/model/ruleFunctionGroup.gif")
}else if(data.id == "1"){
return require("~/assets/model/ruleFunctionGroup.gif")
}else if(data.id == "2"){
return require("~/assets/model/ruleDefaultGroup.gif")
}else if(data.id == "3"){
return require("~/assets/model/ruleDefaultGroup.gif")
}else if(data.id == "4"){
return require("~/assets/model/ruleCheckGroup.gif")
}else if(data.id == "5"){
return require("~/assets/model/ruleEventGroup.gif")
}
}else{
if(data.ruleType == "GLOBAL"){
return require("~/assets/model/ruleFunction.gif")
}else if(data.ruleType == "STATIC"){
return require("~/assets/model/ruleFunction.gif")
}else if(data.ruleType == "INIT"){
return require("~/assets/model/ruleInit.gif")
}else if(data.ruleType == "DEFAULT"){
return require("~/assets/model/ruleDefault.gif")
}else if(data.ruleType == "CHECK"){
return require("~/assets/model/ruleCheck.gif")
}else if(data.ruleType == "RULE"){
return require("~/assets/model/ruleEvent.gif")
}
}
}
},
mounted(){
},
computed:{
simpleFields(){
return this.fields.filter(item=>item.type === 0 && !item.typeName.endsWith("IPanel"))
},
ruleData(){
const rules = []
const globalNode = {id:"0",label:"global"}
const initNode = {id:"2",label:"init"}
const defaultNode = {id:"3",label:"default"}
const staticNode = {id:"1",label:"static"}
const ruleNode = {id:"5",label:"rule"}
const checkNode = {id:"4",label:"check"}
rules.push(globalNode)
rules.push(staticNode)
rules.push(initNode)
rules.push(defaultNode)
rules.push(checkNode)
rules.push(ruleNode)
globalNode.children = this.globalList.map((ruleItem,idx)=>{
return {id:globalNode.id+idx,ruleType:"GLOBAL",label:ruleItem.methodName}
});
initNode.children = this.initList.map((ruleItem,idx)=>{
return {id:initNode.id+idx,ruleType:"INIT",label:`\\<order=${ruleItem.order},method=${ruleItem.methodName}>`}
});
defaultNode.children = this.defaultList.map((ruleItem,idx)=>{
return {id:defaultNode.id+idx,ruleType:"DEFAULT",label:`${ruleItem.dotPath.replace(/\./g,"\\")}<order=${ruleItem.order},method=${ruleItem.methodName}>`}
});
checkNode.children = this.checkList.map((ruleItem,idx)=>{
return {id:checkNode.id+idx,ruleType:"CHECK",label:`${ruleItem.dotPath.replace(/\./g,"\\")}<order=${ruleItem.order},method=${ruleItem.methodName}>`}
});
ruleNode.children = this.ruleList.map((ruleItem,idx)=>{
return {id:ruleNode.id+idx,ruleType:"RULE",label:`${ruleItem.dotPath.replace(/\./g,"\\")}<order=${ruleItem.order},method=${ruleItem.methodName}>`}
});
staticNode.children = this.staticList.map((ruleItem,idx)=>{
return {id:staticNode.id+idx,ruleType:"STATIC",label:ruleItem.methodName}
});
return rules
}
}
}
</script>
<style>
.structShow{
display: flex;
flex-direction: column;
height:100%;
}
.structShow .structFields{
flex: 2;
}
.structShow .structRules{
flex: 3;
overflow: auto;
}
</style>
\ No newline at end of file
<template>
<div :style="{height:innerHeight+'px'}">
<el-container style="height:100%">
<el-aside width="300px" style="height:100%;overflow:auto;">
<el-tree
:props="props"
:load="loadNode"
@node-click="onModelSelect"
:default-expanded-keys="['root']"
:highlight-current="true"
lazy
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<img :src="getModuleIcon(node,data)" class="moduleIcon"/>
<span :title="data.typeName">{{ node.label.toLowerCase() }}</span>
</span>
</el-tree>
</el-aside>
<el-main style="padding:0;padding-left:5px;height:100%">
<struct-show
:fields="fields"
:initList="rules.initList"
:ruleList="rules.ruleList"
:checkList="rules.checkList"
:defaultList="rules.defaultList"
:globalList="rules.globalList"
:staticList="rules.staticList"
>
</struct-show>
</el-main>
</el-container>
</div>
</template>
<script>
import Service from "./Service"
import StructShow from "./StructShow"
export default {
props:['trans','innerHeight'],
components:{StructShow},
data(){
return {
props:{
label: 'name',
children: 'modules',
isLeaf: 'leaf'
},
fields:[],
rules:{
initList:[],
ruleList:[],
checkList:[],
defaultList:[],
globalList:[],
staticList:[]
}
}
},
mounted(){
this.updateModel(this.trans)
},
methods:{
async updateModel(modelPath){
let rtndata = await Service.viewModelData(modelPath)
if(rtndata.respCode == SUCCESS){
this.fields = rtndata.data.fields
this.rules.initList = rtndata.data.rules.initList
this.rules.ruleList = rtndata.data.rules.ruletList
this.rules.checkList = rtndata.data.rules.checkList
this.rules.defaultList = rtndata.data.rules.defaultList
this.rules.globalList = rtndata.data.rules.globalList
this.rules.staticList = rtndata.data.rules.staticList
}
},
async loadNode(node, resolve){
if (node.level === 0) {
return resolve([{name:this.splitItem(this.trans).title,id:"root",typeName:this.trans}])
}
else{
let rtndata = await Service.viewModelData(node.data.typeName)
if(rtndata.respCode == SUCCESS){
let fields = rtndata.data.fields.filter(item=>item.type!=0 && item.type!=4).map(item=>{
let splitItem = this.splitItem(item.typeName);
item.name = splitItem.title+":"+item.name
item.singleName = splitItem.title
if(item.typeName.endsWith(".bo." + item.singleName)){
item.leaf = true
}
else if(item.typeName.endsWith("IModule")){
item.leaf = true
}
return item;
})
return resolve(fields)
}
}
},
onModelSelect(model){
//更新结构显示
this.updateModel(model.typeName)
},
splitItem(trans){
let dotIdx = trans.lastIndexOf(".");
let title = trans.substring(dotIdx+1);
return {title,name:trans}
},
getModuleIcon(node,data){
if(node.level == 1){
return require("~/assets/model/transactionIcon.png");
}
if(data.typeName.endsWith(".bo." + data.singleName)){
return require("~/assets/model/moduleSingleIcon.png");
}
else if(data.type == 2){
return require("~/assets/model/moduleListIcon.png");
}
else if(data.type == 3){
return require("~/assets/model/moduleArgumentIcon.png");
}
return require("~/assets/model/moduleIcon.png")
}
},
computed:{
simpleFields(){
return this.fields.filter(item=>item.type === 0 && !item.typeName.endsWith("IPanel"))
}
}
}
</script>
<style>
.moduleIcon{
vertical-align:middle;
margin-right:3px;
}
</style>
\ No newline at end of file
<template>
<div style="height:100%">
<el-container style="height:100%">
<el-aside width="300px" style="height:100%">
<el-input v-model="input" size="medium" :placeholder="`交易总数:${transList.length},输入交易码快速筛选`"></el-input>
<div class="transList">
<el-table :data="transItemList" row-class-name="transRow" @row-dblclick="onTransOpen" stripe
:show-header="false"
style="width: 100%;">
<el-table-column prop="title" label="交易列表">
<template slot-scope="scope">
<span>
<b>{{scope.row.title}}</b>
<span>{{`(${scope.row.name})`}}</span>
</span>
</template>
</el-table-column>
</el-table>
</div>
</el-aside>
<el-main style="padding:0;padding-left:5px;">
<el-tabs v-model="curTrans" type="card" size="medium" closable @edit="handleTabsEdit">
<el-tab-pane
:key="item.name"
v-for="(item) in transOpened"
:label="item.title"
:name="item.name"
>
<trans-viewer :trans="item.name" :innerHeight="innerHeight"></trans-viewer>
</el-tab-pane>
</el-tabs>
</el-main>
</el-container>
</div>
</template>
<script>
import Service from "./Service"
import TransViewer from "./TransViewer"
export default {
components:{TransViewer},
data(){
return {
transList:[],
curTrans:"",
input:"",
transOpened:[],
innerHeight:300
}
},
methods:{
handleTabsEdit(targetName, action){
if (action === 'remove') {
let tabs = this.transOpened;
let activeName = this.curTrans;
if (activeName === targetName) {
tabs.forEach((tab, index) => {
if (tab.name === targetName) {
let nextTab = tabs[index + 1] || tabs[index - 1];
if (nextTab) {
activeName = nextTab.name;
}
}
});
}
this.curTrans = activeName;
this.transOpened = tabs.filter(tab => tab.name !== targetName);
}
},
splitItem(trans){
let dotIdx = trans.lastIndexOf(".");
let title = trans.substring(dotIdx+1);
return {title,name:trans}
},
onTransOpen(row){
// alert(row.title)
if(this.transOpened.filter(item=>item.name == row.name).length==0){
this.transOpened.push({...row})
}
this.curTrans = row.name
},
calcInnerHeight(){
this.innerHeight = this.$el.clientHeight - 60
}
},
async mounted(){
window.addEventListener("resize",this.calcInnerHeight)
this.calcInnerHeight()
let rtndata = await Service.viewAllTrans()
if(rtndata.respCode == SUCCESS){
this.transList = rtndata.data.sort()
if(this.transList.length>0){
let first = this.transList[0];
this.curTrans = first
this.transOpened.push(this.splitItem(first))
}
}
},
beforeDestroy(){
window.removeEventListener("resize",this.calcInnerHeight)
},
computed:{
transItemList(){
return this.transList.map(item=>{
return this.splitItem(item)
}).filter(item=>{
return !this.input || (this.input && item.title.toLowerCase().indexOf(this.input.toLowerCase())>-1)
})
}
}
}
</script>
<style>
.transList {
height: calc(100% - 40px);
overflow: auto;
}
.transRow{
cursor: pointer;
color: deepskyblue;
text-indent: 1em;
}
</style>
\ No newline at end of file
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