Commit d811d516 by fukai

合并冲突

parents 878ed045 89688815
...@@ -13,6 +13,7 @@ export default { ...@@ -13,6 +13,7 @@ export default {
data(){ data(){
return{ return{
} }
}, },
methods:{ methods:{
...@@ -43,7 +44,7 @@ export default { ...@@ -43,7 +44,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
...@@ -75,7 +75,6 @@ export default { ...@@ -75,7 +75,6 @@ export default {
pageSize: 5 pageSize: 5
}; };
}, },
mounted: {},
methods: { methods: {
sizeChange(size) { sizeChange(size) {
this.pageSize = size; this.pageSize = size;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Ditopn Default规则 * Ditopn Default规则
*/ */
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index"
export default { export default {
"didgrp.rec.resflg" :defaultDidgrpRecResflg, "didgrp.rec.resflg" :defaultDidgrpRecResflg,
......
...@@ -3,46 +3,47 @@ ...@@ -3,46 +3,47 @@
* Sptsel Default规则 * Sptsel Default规则
*/ */
import Api from "~/service/Api"; import Api from "~/service/Api";
import Utils from "~/utils/index"
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() async function defaultDflg() {
{ let rtnmsg = await Api.post("sptsel/default/dflg", Utils.flatObject(this.model))
if (rtnmsg.retcod == "AAAAAA") {
//TODO 处理数据逻辑
this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
} }
function defaultYptinf() function defaultYptinf() {
{ console.log(this.model.yptinf)
} }
function defaultUsfmodUsrExtkey() function defaultUsfmodUsrExtkey() {
{
} }
import Api from "~/service/Api" import Api from "~/service/Api"
import Utils from "~/utils/index"
export default { export default {
onUsfmodShwflt() { onUsfmodShwflt(){
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("sptsel/usfmod_shwflt", { data: this.model }) let rtnmsg = await Api.post("sptsel/usfmod_shwflt",Utils.flatObject(this.model))
if (rtnmsg.retcod == SUCCESS) { if(rtnmsg.respCode == "AAAAAA")
//TODO 处理数据逻辑 {
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
}) }
}, })
onButypt() { },
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { onButypt(){
if (!valid) this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
return; if(!valid)
let rtnmsg = await Api.post("sptsel/butypt", { data: this.model }) return;
if (rtnmsg.retcod == SUCCESS) { let rtnmsg = await Api.post("sptsel/butypt",Utils.flatObject(this.model))
//TODO 处理数据逻辑 if(rtnmsg.respCode == "AAAAAA")
{
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
}) }
}, })
onDlmft() { },
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { onDlmft(){
if (!valid) this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
return; if(!valid)
let rtnmsg = await Api.post("sptsel/dlmft", { data: this.model }) return;
if (rtnmsg.retcod == SUCCESS) { let rtnmsg = await Api.post("sptsel/dlmft",Utils.flatObject(this.model))
//TODO 处理数据逻辑 if(rtnmsg.respCode == "AAAAAA")
{
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
}) }
}, })
onDlaxq() { },
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { onDlaxq(){
if (!valid) this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
return; if(!valid)
let rtnmsg = await Api.post("sptsel/dlaxq", { data: this.model }) return;
if (rtnmsg.retcod == SUCCESS) { let rtnmsg = await Api.post("sptsel/dlaxq",Utils.flatObject(this.model))
//TODO 处理数据逻辑 if(rtnmsg.respCode == "AAAAAA")
{
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
}) }
}, })
onButimg() { },
this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => { onButimg(){
if (!valid) this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
return; if(!valid)
let rtnmsg = await Api.post("sptsel/butimg", { data: this.model }) return;
if (rtnmsg.retcod == SUCCESS) { let rtnmsg = await Api.post("sptsel/butimg",Utils.flatObject(this.model))
//TODO 处理数据逻辑 if(rtnmsg.respCode == "AAAAAA")
{
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
}) }
}, })
tabClick() { },
},
} }
\ No newline at end of file
...@@ -3,122 +3,102 @@ ...@@ -3,122 +3,102 @@
* 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 处理数据逻辑
this.model = Utils.copyValueFromVO(this.model, 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() {
{
} }
...@@ -82,7 +82,7 @@ export default class Api ...@@ -82,7 +82,7 @@ export default class Api
if(data && data[CODE_KEY] == 'L0003'){ if(data && data[CODE_KEY] == 'L0003'){
window.sessionStorage.removeItem("token") window.sessionStorage.removeItem("token")
window.sessionStorage.removeItem("userId") window.sessionStorage.removeItem("userId")
MessageBox.alert({ MessageBox.alert({
title:'会话超时', title:'会话超时',
message:'即将退出,请重新登录', message:'即将退出,请重新登录',
showClose:false, showClose:false,
......
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];
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 Array)
target[nkey] = obj[key]; target[nkey] = obj[key];
else if(typeof obj[key] == "object") else if (obj[key] instanceof Date)
Utils.flatObject(obj[key],target,nkey); //递归赋值 target[nkey] = obj[key];
else else if (typeof obj[key] == "object")
target[nkey] = obj[key]; Utils.flatObject(obj[key], target, nkey); //递归赋值
} else
return target; target[nkey] = obj[key];
}
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;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="货物/服务名称"> <el-form-item label="货物/服务名称">
<c-input v-model="model.godnam" maxlength="40" style="width:40%" placeholder="货物服务名称"></c-input> <c-input v-model="model.godnam" maxlength="40" style="width:80%" placeholder="货物服务名称"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="特殊规定"> <el-form-item label="特殊规定">
<c-select v-model="model.litameadv" style="width:40%" placeholder="请选择特殊规定"> <c-select v-model="model.litameadv" style="width:80%" placeholder="请选择特殊规定">
</c-select> </c-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label=""> <el-form-item label="">
<c-input type="textarea" v-model="model.ameadvrmk" maxlength="34" style="width:40%" show-word-limit placeholder="请输入特殊规定条件" ></c-input> <c-input type="textarea" v-model="model.ameadvrmk" maxlength="34" style="width:80%" show-word-limit placeholder="请输入特殊规定条件" ></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="开证行"> <el-form-item label="开证行">
<c-input v-model="model.bchname" maxlength="40" style="width:40%" placeholder="请输入branch name"></c-input> <c-input v-model="model.bchname" maxlength="40" style="width:80%" placeholder="请输入branch name"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div> </div>
......
...@@ -34,15 +34,21 @@ ...@@ -34,15 +34,21 @@
</el-col> </el-col>
--> -->
<el-col :span="12"> <el-col :span="10">
<el-form-item label="开证授信额度主体编号"> <el-form-item label="开证授信额度主体编号">
<c-input style="width:70%;margin-right:20px" v-model="model.liaall.limmod.limpts.wrk.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> <c-input v-model="model.liaall.limmod.limpts.wrk.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label="" label-width="20px">
<c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel">
Details Details
</c-button> </c-button>
</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-input v-model="model.liaall.limmod.limpts.wrk.pts.nam" maxlength="40" placeholder="请输入Name of Party"></c-input> <c-input v-model="model.liaall.limmod.limpts.wrk.pts.nam" maxlength="40" placeholder="请输入Name of Party"></c-input>
...@@ -143,58 +149,56 @@ ...@@ -143,58 +149,56 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-row> <el-col :span="24">
<el-col :span="24"> <c-table style="text-align:center" :data="tableData">
<c-table style="text-align:center"> <el-table-column
<el-table-column label="可否串用"
label="可否串用" width="60"
width=60 >
> </el-table-column> -->
</el-table-column> <el-table-column
<el-table-column label="序号"
label="序号" width="60"
width=60 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="额度类型"
label="额度类型" width="50"
width=50 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="入账机构"
label="入账机构" width="70"
width=70 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="额度编号"
label="额度编号" width="100"
width=100 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="额度明细编号"
label="额度明细编号" width="100"
width=100 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="额度品种代码"
label="额度品种代码" width="30"
width=30 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label="品种代码描述"
label="品种代码描述" width="100"
width=100 >
> </el-table-column>
</el-table-column> <el-table-column
<el-table-column label=""
label="" width="50"
width=50 >
> </el-table-column>
</el-table-column>
</c-table>
</c-table> </el-col>
</el-col>
</el-row>
</div> </div>
</template> </template>
<script> <script>
...@@ -206,7 +210,9 @@ ...@@ -206,7 +210,9 @@
props:["model","codes"], props:["model","codes"],
data(){ data(){
return { return {
tableData:{
}
} }
}, },
methods:{...Event}, methods:{...Event},
......
...@@ -12,10 +12,12 @@ ...@@ -12,10 +12,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button> <el-form-item label="" label-width="15px">
<c-button size="small" type="primary" @click="onDitpButgetref"> <c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button>
获取 <c-button size="small" type="primary" @click="onDitpButgetref">
</c-button> 获取
</c-button>
</el-form-item>
</el-col> </el-col>
<!-- <!--
...@@ -34,13 +36,15 @@ ...@@ -34,13 +36,15 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属客户经理"> <el-form-item label="所属客户经理">
<c-input v-model="model.ditp.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input> <c-input v-model="model.ditp.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" style="text-align:center"> <el-col :span="4">
<c-checkbox v-model="model.didgrp.rec.resflg">Reserved Contract</c-checkbox> <el-form-item label="" label-width="15px">
</el-col> <c-checkbox v-model="model.didgrp.rec.resflg">Reserved Contract</c-checkbox>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申请人 参考号"> <el-form-item label="申请人 参考号">
...@@ -48,17 +52,17 @@ ...@@ -48,17 +52,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="信用证金额"> <el-form-item label="信用证金额">
<c-select v-model="model.didgrp.cbs.nom1.cur" style="width:100%" placeholder="请选择Currency"> <c-select v-model="model.didgrp.cbs.nom1.cur" style="width:100%" placeholder="请选择Currency">
</c-select> </c-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="6" >
<el-form-item style="text-align:left"> <el-form-item style="text-align:left" label-width="20px">
<c-input v-model="model.didgrp.cbs.nom1.amt" style="text-align:left;width:100%" placeholder="请输入信用证金额"></c-input> <c-input v-model="model.didgrp.cbs.nom1.amt" style="text-align:left;width:100%" placeholder="请输入信用证金额"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <!--
<el-col :span="12"> <el-col :span="12">
...@@ -80,10 +84,12 @@ ...@@ -80,10 +84,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button> <el-form-item label="" label-width="15px">
<c-button size="small" type="primary" @click="onAplpDet"> <c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button>
Details <c-button size="small" type="primary" @click="onAplpDet">
</c-button> Details
</c-button>
</el-form-item>
</el-col> </el-col>
<!-- <!--
...@@ -126,7 +132,7 @@ ...@@ -126,7 +132,7 @@
</el-col> </el-col>
<el-col :span="6" style="text-align:left" > <el-col :span="6" style="text-align:left" >
<el-form-item label="-" style="text-align:left"> <el-form-item label="-" style="text-align:left;margin-left: 12px;" label-width="20px">
<c-input v-model="model.didgrp.rec.nomton" maxlength="6" placeholder="请输入Amount Tolerance - Negative"></c-input> <c-input v-model="model.didgrp.rec.nomton" maxlength="6" placeholder="请输入Amount Tolerance - Negative"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -142,13 +148,13 @@ ...@@ -142,13 +148,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="7">
<el-form-item label="邮编"> <el-form-item label="邮编">
<c-input v-model="model.didgrp.apl.pts.youzbm" maxlength="6" placeholder="请输入邮编"></c-input> <c-input v-model="model.didgrp.apl.pts.youzbm" maxlength="6" placeholder="请输入邮编"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="5">
<el-form-item label="电话"> <el-form-item label="电话" label-width="40px" style="margin-left: 12px;">
<c-input v-model="model.didgrp.apl.pts.dihdig" maxlength="16" placeholder="请输入电话"></c-input> <c-input v-model="model.didgrp.apl.pts.dihdig" maxlength="16" placeholder="请输入电话"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -165,15 +171,15 @@ ...@@ -165,15 +171,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="7">
<el-form-item label="信用证最大金额"> <el-form-item label="信用证最大金额">
<c-select v-model="model.didgrp.cbs.max.cur" style="width:100%" placeholder="请选择Currency"> <c-select v-model="model.didgrp.cbs.max.cur" style="width:100%" placeholder="请选择Currency">
</c-select> </c-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="5">
<el-form-item label=""> <el-form-item label="" label-width="20px">
<c-input v-model="model.didgrp.cbs.max.amt" placeholder="请输入信用证最大金额"></c-input> <c-input v-model="model.didgrp.cbs.max.amt" placeholder="请输入信用证最大金额"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -225,10 +231,12 @@ ...@@ -225,10 +231,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="" label-width="12px">
<c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button> <c-button size="small" type="primary;width:10%" @click="onSeainf">i</c-button>
<c-button size="small" type="primary" @click="onBenpDet"> <c-button size="small" type="primary" @click="onBenpDet">
Details Details
</c-button> </c-button>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -296,13 +304,13 @@ ...@@ -296,13 +304,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="7">
<el-form-item label="邮编"> <el-form-item label="邮编">
<c-input v-model="model.didgrp.ben.pts.youzbm" maxlength="6" placeholder="请输入邮编 电证用"></c-input> <c-input v-model="model.didgrp.ben.pts.youzbm" maxlength="6" placeholder="请输入邮编 电证用"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<el-form-item label="电话"> <el-form-item label="电话" label-width="40px" style="margin-left: 12px;">
<c-input v-model="model.didgrp.ben.pts.dihdig" maxlength="16" placeholder="请输入邮编"></c-input> <c-input v-model="model.didgrp.ben.pts.dihdig" maxlength="16" placeholder="请输入邮编"></c-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
methods:{...Event}, methods:{...Event},
mounted:async function(){ mounted:async function(){
console.log("进入sptsel交易"); console.log("进入sptsel交易");
let rtnmsg = await Api.post(this,"init",{params:{}}) let rtnmsg = await Api.post("sptsel/init",{params:{}})
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
......
<template> <template>
<div class="eContainer"> <div class="eContainer">
<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>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
...@@ -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'
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
codes: { codes: {
}, },
declareParams:{"fileName":"trnrel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/trnrel/init"}, declareParams:{"fileName":"trnrel.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/trnrel/init"},
} }
}, },
methods:{ methods:{
...@@ -67,14 +67,12 @@ export default { ...@@ -67,14 +67,12 @@ export default {
console.log("进入trnrel交易"); console.log("进入trnrel交易");
let rtnmsg = await Api.post(this,"init",{params:{}}) let rtnmsg = await Api.post("trnrel/init", Utils.flatObject(this.model))
if(rtnmsg.respCode == SUCCESS) 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
{ {
...@@ -84,5 +82,4 @@ export default { ...@@ -84,5 +82,4 @@ export default {
} }
</script> </script>
<style> <style>
</style> </style>
...@@ -17,27 +17,27 @@ module.exports = (options = {}) => ({ ...@@ -17,27 +17,27 @@ module.exports = (options = {}) => ({
}, },
module: { module: {
rules: [{ rules: [{
test: /\.vue$/, test: /\.vue$/,
use: ['vue-loader'] use: ['vue-loader']
}, },
{ {
test: /\.js$/, test: /\.js$/,
use: ['babel-loader'], use: ['babel-loader'],
exclude: /node_modules/ exclude: /node_modules/
}, },
{ {
test: /\.css$/, test: /\.css$/,
use: ['style-loader', 'css-loader', 'postcss-loader'] use: ['style-loader', 'css-loader', 'postcss-loader']
}, },
{ {
test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/, test: /\.(png|jpg|jpeg|gif|eot|ttf|woff|woff2|svg|svgz)(\?.+)?$/,
use: [{ use: [{
loader: 'url-loader', loader: 'url-loader',
options: { options: {
limit: 10000 limit: 10000
} }
}] }]
} }
] ]
}, },
plugins: [ plugins: [
......
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