Commit 894af9bd by liuxin

小调整

parent 7a7102ca
<template> <template>
<div class="bus-button"> <div class="bus-button">
<c-button type="primary" v-onclick="save">提交</c-button> <c-button type="primary" v-on:click="save">提交</c-button>
<c-button type="primary" v-onclick="pedding">暂存</c-button> <c-button type="primary" v-on:click="pedding">暂存</c-button>
<c-button type="primary" v-onclick="check">校核</c-button> <c-button type="primary" v-on:click="check">校核</c-button>
<c-button v-onclick="exit">退出</c-button> <c-button v-on:click="exit">退出</c-button>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:["parent"], props:["parent"],
data(){ data(){
return{
}
}, },
methods:{ methods:{
save(){ save(){
...@@ -29,7 +31,7 @@ export default { ...@@ -29,7 +31,7 @@ export default {
} }
</script> </script>
<style> <style>
.bus-button{ .bus-button {
text-align: center; text-align: center;
} }
</style> </style>
\ No newline at end of file
...@@ -5,44 +5,36 @@ ...@@ -5,44 +5,36 @@
import Api from "~/service/Api"; import Api from "~/service/Api";
export default { export default {
"sptstm" :defaultSptstm, "sptstm": defaultSptstm,
"dlaxq" :defaultDlaxq, "dlaxq": defaultDlaxq,
"usfmod.labtxt" :defaultUsfmodLabtxt, "usfmod.labtxt": defaultUsfmodLabtxt,
"usfmod.flt" :defaultUsfmodFlt, "usfmod.flt": defaultUsfmodFlt,
"usfmod.shwflt" :defaultUsfmodShwflt, "usfmod.shwflt": defaultUsfmodShwflt,
"dlmft" :defaultDlmft, "dlmft": defaultDlmft,
"butimg" :defaultButimg, "butimg": defaultButimg,
"dflg" :defaultDflg, "dflg": defaultDflg,
"yptinf" :defaultYptinf, "yptinf": defaultYptinf,
"usfmod.usr.extkey" :defaultUsfmodUsrExtkey, "usfmod.usr.extkey": defaultUsfmodUsrExtkey,
} }
function defaultSptstm() function defaultSptstm() {
{
} }
function defaultDlaxq() function defaultDlaxq() {
{
} }
function defaultUsfmodLabtxt() function defaultUsfmodLabtxt() {
{
} }
function defaultUsfmodFlt() function defaultUsfmodFlt() {
{
} }
function defaultUsfmodShwflt() function defaultUsfmodShwflt() {
{
} }
function defaultDlmft() function defaultDlmft() {
{
} }
function defaultButimg() function defaultButimg() {
{
} }
function defaultDflg() function defaultDflg() {
{
} }
function defaultYptinf() function defaultYptinf() {
{ console.log(this.model.yptinf)
} }
function defaultUsfmodUsrExtkey() function defaultUsfmodUsrExtkey() {
{
} }
...@@ -3,122 +3,103 @@ ...@@ -3,122 +3,103 @@
* Trnrel Default规则 * Trnrel Default规则
*/ */
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index";
export default { export default {
"relcor" :defaultRelcor, "relcor": defaultRelcor,
"recpan.butspt" :defaultRecpanButspt, "recpan.butspt": defaultRecpanButspt,
"recpan.ackstm" :defaultRecpanAckstm, "recpan.ackstm": defaultRecpanAckstm,
"seaown" :defaultSeaown, "seaown": defaultSeaown,
"trn.inftxt" :defaultTrnInftxt, "trn.inftxt": defaultTrnInftxt,
"numtrn" :defaultNumtrn, "numtrn": defaultNumtrn,
"recpan.butord" :defaultRecpanButord, "recpan.butord": defaultRecpanButord,
"recpan.inftxt.buttxmsel" :defaultRecpanInftxtButtxmsel, "recpan.inftxt.buttxmsel": defaultRecpanInftxtButtxmsel,
"trn.infdsp" :defaultTrnInfdsp, "trn.infdsp": defaultTrnInfdsp,
"recpan.incben" :defaultRecpanIncben, "recpan.incben": defaultRecpanIncben,
"usrcon" :defaultUsrcon, "usrcon": defaultUsrcon,
"imgmod.hisimg" :defaultImgmodHisimg, "imgmod.hisimg": defaultImgmodHisimg,
"recpan.con" :defaultRecpanCon, "recpan.con": defaultRecpanCon,
"seajbh" :defaultSeajbh, "seajbh": defaultSeajbh,
"recpan.det" :defaultRecpanDet, "recpan.det": defaultRecpanDet,
"trncorco.trnstm" :defaultTrncorcoTrnstm, "trncorco.trnstm": defaultTrncorcoTrnstm,
"imgmod.newhisimg" :defaultImgmodNewhisimg, "imgmod.newhisimg": defaultImgmodNewhisimg,
"recpan.cpltxt" :defaultRecpanCpltxt, "recpan.cpltxt": defaultRecpanCpltxt,
"trncorco.dflg" :defaultTrncorcoDflg, "trncorco.dflg": defaultTrncorcoDflg,
"orddsp" :defaultOrddsp, "orddsp": defaultOrddsp,
"recpan.usr.extkey" :defaultRecpanUsrExtkey, "recpan.usr.extkey": defaultRecpanUsrExtkey,
"atptxt" :defaultAtptxt, "atptxt": defaultAtptxt,
"recpan.ackgrp.rec.sndref" :defaultRecpanAckgrpRecSndref, "recpan.ackgrp.rec.sndref": defaultRecpanAckgrpRecSndref,
"syswrn.butshw" :defaultSyswrnButshw, "syswrn.butshw": defaultSyswrnButshw,
"imgmod.newimg" :defaultImgmodNewimg, "imgmod.newimg": defaultImgmodNewimg,
"recpan.inc" :defaultRecpanInc, "recpan.inc": defaultRecpanInc,
"printe" :defaultPrinte, "printe": defaultPrinte,
"trn.inr" :defaultTrnInr, "trn.inr": defaultTrnInr,
"imgmod.image" :defaultImgmodImage, "imgmod.image": defaultImgmodImage,
} }
function defaultRelcor() function defaultRelcor() {
{
} }
function defaultRecpanButspt() function defaultRecpanButspt() {
{
} }
function defaultRecpanAckstm() function defaultRecpanAckstm() {
{
} }
function defaultSeaown() function defaultSeaown() {
{
} }
function defaultTrnInftxt() function defaultTrnInftxt() {
{
} }
function defaultNumtrn() function defaultNumtrn() {
{
} }
function defaultRecpanButord() function defaultRecpanButord() {
{
} }
function defaultRecpanInftxtButtxmsel() function defaultRecpanInftxtButtxmsel() {
{
} }
function defaultTrnInfdsp() function defaultTrnInfdsp() {
{
} }
function defaultRecpanIncben() function defaultRecpanIncben() {
{
} }
function defaultUsrcon() function defaultUsrcon() {
{
} }
function defaultImgmodHisimg() function defaultImgmodHisimg() {
{
} }
function defaultRecpanCon() function defaultRecpanCon() {
{
} }
function defaultSeajbh() function defaultSeajbh() {
{
} }
function defaultRecpanDet() function defaultRecpanDet() {
{
} }
function defaultTrncorcoTrnstm() function defaultTrncorcoTrnstm() {
{
} }
function defaultImgmodNewhisimg() function defaultImgmodNewhisimg() {
{
} }
function defaultRecpanCpltxt() function defaultRecpanCpltxt() {
{
} }
function defaultTrncorcoDflg() async function defaultTrncorcoDflg() {
{ let rtnmsg = await Api.post("trnrel/default/trncorco.dflg", Utils.flatObject(this.model))
if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑
console.log(rtnmsg)
console.log(rtnmsg.data)
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
} }
function defaultOrddsp() function defaultOrddsp() {
{
} }
function defaultRecpanUsrExtkey() function defaultRecpanUsrExtkey() {
{
} }
function defaultAtptxt() function defaultAtptxt() {
{
} }
function defaultRecpanAckgrpRecSndref() function defaultRecpanAckgrpRecSndref() {
{
} }
function defaultSyswrnButshw() function defaultSyswrnButshw() {
{
} }
function defaultImgmodNewimg() function defaultImgmodNewimg() {
{
} }
function defaultRecpanInc() function defaultRecpanInc() {
{
} }
function defaultPrinte() function defaultPrinte() {
{
} }
function defaultTrnInr() function defaultTrnInr() {
{
} }
function defaultImgmodImage() function defaultImgmodImage() {
{
} }
import Api from "~/service/Api" import Api from "~/service/Api";
import Utils from "~/utils/index";
export default { export default {
onSeaown() { onSeaown() {
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
if (!valid) if (!valid)
return; return;
let rtnmsg = await Api.post("trnrel/seaown", { data: this.model }) let rtnmsg = await Api.post("trnrel/seaown", Utils.flatObject(this.model))
if (rtnmsg.retcod == SUCCESS) { if (rtnmsg.respCode == "AAAAAA") {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.trncorco_trnstm.rows;
} }
else { else {
this.$notify.error({ title: '错误', message: '服务请求失败!' }); this.$notify.error({ title: '错误', message: '服务请求失败!' });
......
export default class Utils{ export default class Utils {
static toDepthObject(obj) static toDepthObject(obj) {
{
var target = {}; var target = {};
for(var key in obj) for (var key in obj) {
{
var keyArr = key.split("_"); //以下划线或分割 var keyArr = key.split("_"); //以下划线或分割
var tempobj = target; var tempobj = target;
for(var i=0;i<keyArr.length - 1;i++) for (var i = 0; i < keyArr.length - 1; i++) {
{ if (tempobj[keyArr[i]])
if(tempobj[keyArr[i]])
tempobj = tempobj[keyArr[i]]; tempobj = tempobj[keyArr[i]];
else else {
{
tempobj[keyArr[i]] = {}; tempobj[keyArr[i]] = {};
tempobj = tempobj[keyArr[i]]; tempobj = tempobj[keyArr[i]];
} }
} }
//给叶子元素赋值 //给叶子元素赋值
tempobj[keyArr[keyArr.length - 1]]=obj[key]; tempobj[keyArr[keyArr.length - 1]] = obj[key];
} }
return target; return target;
} }
static flatObject(obj,target,pkey) static flatObject(obj, target, pkey) {
{ target = target || {};
target = target||{}; for (var key in obj) {
for(var key in obj) var nkey = pkey ? pkey + "_" + key : key;
{ if (!obj[key])
var nkey = pkey?pkey+"_"+key:key;
if(!obj[key])
target[nkey] = obj[key]; target[nkey] = obj[key];
else if(obj[key] instanceof Array) else if (obj[key] instanceof Array)
target[nkey] = obj[key]; target[nkey] = obj[key];
else if(obj[key] instanceof Date) else if (obj[key] instanceof Date)
target[nkey] = obj[key]; target[nkey] = obj[key];
else if(typeof obj[key] == "object") else if (typeof obj[key] == "object")
Utils.flatObject(obj[key],target,nkey); //递归赋值 Utils.flatObject(obj[key], target, nkey); //递归赋值
else else
target[nkey] = obj[key]; target[nkey] = obj[key];
} }
return target; return target;
} }
static copyValueFromVO(model,vo) static copyValueFromVO(model, vo) {
{
var target = model; var target = model;
for(var key in vo) for (var key in vo) {
{
var keyArr = key.split("_"); //以下划线或分割 var keyArr = key.split("_"); //以下划线或分割
var tempobj = target; var tempobj = target;
for(var i=0;i<keyArr.length - 1;i++) for (var i = 0; i < keyArr.length - 1; i++) {
{ if (tempobj[keyArr[i]])
if(tempobj[keyArr[i]])
tempobj = tempobj[keyArr[i]]; tempobj = tempobj[keyArr[i]];
else else {
{
tempobj = null; tempobj = null;
break; break;
} }
} }
//给叶子元素赋值 //给叶子元素赋值
if(tempobj ) if (tempobj) {
{
let leafProp = keyArr[keyArr.length - 1]; let leafProp = keyArr[keyArr.length - 1];
if(tempobj.hasOwnProperty(leafProp)) if (tempobj.hasOwnProperty(leafProp))
tempobj[leafProp]=vo[key]; tempobj[leafProp] = vo[key];
} }
} }
return target; return target;
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Branch"> <el-form-item label="Branch">
<c-select v-model="model.bchcon" style="width:100%" placeholder="请选择Branch"> <c-select v-model="model.bchcon" style="width:100%" placeholder="请选择Branch">
...@@ -33,8 +31,6 @@ ...@@ -33,8 +31,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Drag Drop Sender"> <el-form-item label="Drag Drop Sender">
...@@ -43,8 +39,6 @@ ...@@ -43,8 +39,6 @@
</el-col> </el-col>
--> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="Between"> <el-form-item label="Between">
<el-date-picker type="date" v-model="model.trncorco.inidatfro" style="width:45%" placeholder="请选择Date of entry of Transaction"></el-date-picker> <el-date-picker type="date" v-model="model.trncorco.inidatfro" style="width:45%" placeholder="请选择Date of entry of Transaction"></el-date-picker>
...@@ -68,7 +62,6 @@ ...@@ -68,7 +62,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="信用证标志"> <el-form-item label="信用证标志">
<c-select v-model="model.trncorco.dflg" style="width:100%" placeholder="请选择信用证标志"> <c-select v-model="model.trncorco.dflg" style="width:100%" placeholder="请选择信用证标志">
...@@ -104,7 +97,7 @@ ...@@ -104,7 +97,7 @@
Search Own Search Own
</c-button> </c-button>
<c-button size="small" type="primary" @click="onSearow"> <c-button size="small" type="primary" @click="onSeajbh">
Search All Search All
</c-button> </c-button>
...@@ -227,120 +220,8 @@ ...@@ -227,120 +220,8 @@
</c-button> </c-button>
</el-col> --> </el-col> -->
<!--<p>{{model.trncorco.trnstm}}</p>--> <!--<p>{{model.trncorco.trnstm}}</p>-->
<c-table style="text-align:center"
:list="stmData" <c-istream-table :list="stmData.data" :columns="stmData.columns"></c-istream-table>
>
<el-table-column
label="TRN"
width=60
prop="10"
>
</el-table-column>
<el-table-column
label="Own Reference"
width=60
prop="11"
>
</el-table-column>
<el-table-column
label="Addtional Text"
width=60
prop="17"
>
</el-table-column>
<el-table-column
label="Cur"
width=50
prop="12"
>
</el-table-column>
<el-table-column
label="Relevent Amount"
width=70
prop="13"
>
</el-table-column>
<el-table-column
label="Entry"
width=100
prop="14"
>
</el-table-column>
<el-table-column
label="Req"
width=50
prop="9"
>
</el-table-column>
<el-table-column
label="Sig"
width=50
prop="2"
>
</el-table-column>
<el-table-column
label="Rq0"
width=30
prop="6"
>
</el-table-column>
<el-table-column
label="Rel0"
width=100
prop="3"
>
</el-table-column>
<el-table-column
label="Rq1"
width=30
prop="7"
>
</el-table-column>
<el-table-column
label="Rel1"
width=100
prop="4"
>
</el-table-column>
<el-table-column
label="Rq2"
width=30
prop="8"
>
</el-table-column>
<el-table-column
label="Rel2"
width=100
prop="5"
>
</el-table-column>
<el-table-column
label="Branch"
width=50
prop="15"
>
</el-table-column>
<el-table-column
label=" User"
width=50
prop="16"
>
</el-table-column>
<el-table-column
label=""
width=50
prop="18"
>
</el-table-column>
<el-table-column
label="Status"
width=50
prop="0"
>
</el-table-column>
</c-table>
<c-istream-table :list="testJson.data" :columns="testJson.columns"></c-istream-table>
</div> </div>
</template> </template>
...@@ -357,67 +238,20 @@ export default { ...@@ -357,67 +238,20 @@ export default {
}, },
data(){ data(){
return { return {
testJson: { stmData: {
columns: [ columns: [
"10 1 \"TRN\" 50 1 tdViewTypeEdit:0 3 ATPTXT",
"11 2:1 \"Own Reference\" 112",
"17 2:2 \"Addtional Text\" 112",
"12 3 \"Cur\" 37",
"13 4 \"Relevant Amount\" 101 2 8:1 2 5",
"14 5 \"Entry\" 104 20 DateTime 1",
"9 6:1 \"Req\" 39",
"2 6:2 \"Sig\" 35",
"6 8:1 \"Rq0\" 40",
"3 8:2 \"Rel0\" 40",
"7 9:1 \"Rq1\" 40",
"4 9:2 \"Rel1\" 40",
"8 10:1 \"Rq2\" 40",
"5 10:2 \"Rel2\" 40",
"15 13 \"Branch\" 142",
"16 11:1 \"User\" 62",
"18 11:2 \"\" 62",
"0 12 \"Status\" 54 1 tdViewTypeEdit:0 1 RELSTA",
"P COLORED TRUE",
"P VERTLINES TRUE",
"P HORZLINES TRUE"
], ],
data: [ data: [
"DITOPN\t10.00 13213 2000007350 GUONEI\t00000101\t2021-04-23 11:26:54.444\tZL \tKZ3500210003AA \t10\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"BTTSND\t \t00000100\t2020-06-19 16:10:57.739\tZL \tBP3500200002AAT \t20000\tW\tNN \tOA \tNN \tNN \tUSD\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"BTTDCK\t \t00000099\t2020-06-19 16:03:34.871\tZL \tBP3500200002AAT \t20000\tW\tNN \tOA \tNN \tNN \tUSD\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"LTTDCK\t \t00000098\t2020-06-19 15:58:24.007\tZL \tBP3500200002AAT \t16000\tW\tNN \tOA \tNN \tNN \tUSD\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"LTTOPN\t \t00000096\t2020-06-19 15:54:14.219\tZL \tTC3500200001AA \t66000\tW\tNN \tOA \tNN \tNN \tUSD\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"LETOPN\t100,000.00\t00000095\t2020-06-19 15:42:45.222\tZL \tAD3500200002AA \t110000\tW\tNN \tOB \tNN \tNN \tUSD\t北京分行 \tO \tNN \tZHL \tNB \tNN ",
"BDTDCK\tGUONEI\t00000094\t2020-06-11 09:25:30.824\tZL \tDD3500190001AA02\t6\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"BDTDCR\tGUONEI\t00000093\t2020-06-11 09:12:19.237\tZL \tDD3500190001AA02\t8\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"BDTDCK\tGUONEI\t00000092\t2020-06-11 09:10:27.276\tZL \tDD3500190001AA02\t8\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"DITDCK\t0.00 北京三优机电设备有限公司 2000007350 GUONEI\t00000091\t2020-06-10 18:04:40.818\tZL \tDD3500190001AA02\t10\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN ",
"DITOPN\t100,000.00 北京宇宙中心第一家有限公司 2000007350 GUONEI\t00000087\t2020-06-10 15:42:44.7\tZL \tKZ3500200002AA \t100000\tW\tNN \tOA \tNN \tNN \tCNY\t北京分行 \tO \tNN \tZHL \tNA \tNN "
] ]
} }
} }
}, },
methods:{...Event}, methods:{...Event},
created:function(){ created:function(){
}, },
computed:{ computed:{
stmData(){
let data = this.model.trncorco.trnstm
if(!data)
return []
data = this.model.trncorco.trnstm.map(item=>{
let obj = {}
item.split("\t").forEach((item,index)=>{
obj[(index)+""]=item;
});
return obj;
})
return data;
}
} }
} }
</script> </script>
<style> <style>
</style> </style>
...@@ -3,11 +3,10 @@ ...@@ -3,11 +3,10 @@
<el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small"> <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
<el-tabs ref="elment" type="border-card" @tab-click="tabClick"> <el-tabs ref="elment" type="border-card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询"> <el-tab-pane label="复核夹查询">
<m-inftrnps :model="model" :codes="codes" /> <m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -31,6 +30,7 @@ import Prtswtp from "./Prtswtp" ...@@ -31,6 +30,7 @@ import Prtswtp from "./Prtswtp"
import Xmldoc from "./Xmldoc" import Xmldoc from "./Xmldoc"
import Prtswtrp from "./Prtswtrp" import Prtswtrp from "./Prtswtrp"
import Prtp from "./Prtp" import Prtp from "./Prtp"
import Utils from "~/utils/index"
// import * as poinMessage from '@/util/poin-common/messageManage.js' // import * as poinMessage from '@/util/poin-common/messageManage.js'
import { TabPane,Col,Table,Form,FormItem,Upload,TableColumn,Card,Input,Button,Dialog,Select,Tabs,Option,DatePicker,Row} from 'element-ui' import { TabPane,Col,Table,Form,FormItem,Upload,TableColumn,Card,Input,Button,Dialog,Select,Tabs,Option,DatePicker,Row} from 'element-ui'
...@@ -67,15 +67,12 @@ export default { ...@@ -67,15 +67,12 @@ export default {
console.log("进入trnrel交易"); console.log("进入trnrel交易");
let rtnmsg = await Api.post("trnrel/init",{params:{}}) let rtnmsg = await Api.post("trnrel/init", Utils.flatObject(this.model))
// if(rtnmsg.respCode == SUCCESS)
if(rtnmsg.respCode == "AAAAAA") if(rtnmsg.respCode == "AAAAAA")
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.model.trncorco.trnstm=rtnmsg.data.trncorco_trnstm.rows Utils.copyValueFromVO(this.model, rtnmsg.data);
this.model.trncorco.inidatfro = rtnmsg.data.trncorco_inidatfro this.$refs.inftrnps.stmData.columns=rtnmsg.data.trncorco_trnstm.rows
this.model.trncorco.inidattil = rtnmsg.data.trncorco_inidattil
this.model.trncorco.relflg = rtnmsg.data.trncorco_relflg
} }
else else
{ {
...@@ -85,5 +82,4 @@ export default { ...@@ -85,5 +82,4 @@ export default {
} }
</script> </script>
<style> <style>
</style> </style>
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