Commit a757bd1a by fukai
parents 593ae06a 81f3294c
...@@ -289,4 +289,9 @@ ...@@ -289,4 +289,9 @@
} }
.el-table--border td.lastColumn{ .el-table--border td.lastColumn{
border-right: 0!important; border-right: 0!important;
}
.el-table__fixed,
.el-table__fixed-right {
height: 100% !important;
bottom:17px;
} }
\ No newline at end of file
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
arr.push({ arr.push({
prop: vals[0], prop: vals[0],
label: vals[1], label: vals[1],
width: "auto", width: vals[2] ? vals[2] : "auto",
}); });
this.column.push(vals[0]); this.column.push(vals[0]);
} }
......
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
this.executeDefault("dspstm").then(res => { this.executeDefault("dspstm").then(res => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.dspstm.rows; this.stmData.data = res.data.dspstm.rows;
this.$store.commit("setTaskList", {key: "diasel", val: this.stmData.data.length});
}) })
}, },
......
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -150,6 +151,7 @@ export default { ...@@ -150,6 +151,7 @@ export default {
// }) // })
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptbrk", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
......
...@@ -391,6 +391,7 @@ export default { ...@@ -391,6 +391,7 @@ export default {
const res = await this.executeRule("searow") const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
// if (res.data.trncorco_trnstm.rows.length == 0) { // if (res.data.trncorco_trnstm.rows.length == 0) {
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -401,6 +402,16 @@ export default { ...@@ -401,6 +402,16 @@ export default {
this.$refs.paramsForm.clearValidate(); this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields) Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
}, },
async trnfndhandleSearch() {
const that = this.root;
const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
},
async handleReset() { async handleReset() {
this.model.bchcon = ""; this.model.bchcon = "";
......
...@@ -26,6 +26,7 @@ const Status = { ...@@ -26,6 +26,7 @@ const Status = {
taskList: { taskList: {
sptsel: 0, sptsel: 0,
trnrel: 0, trnrel: 0,
trnfnd: 0,
bopsel: 0, bopsel: 0,
sptbrk: 0, sptbrk: 0,
diasel: 0, diasel: 0,
......
...@@ -18,6 +18,7 @@ import Api from "~/service/Api" ...@@ -18,6 +18,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Diasel from "~/model/Diasel" import Diasel from "~/model/Diasel"
import CommonProcess from "~/mixin/CommonProcess" import CommonProcess from "~/mixin/CommonProcess"
import Utils from "~/utils/index"
import Check from "~/model/Diasel/Check" import Check from "~/model/Diasel/Check"
import Default from "~/model/Diasel/Default" import Default from "~/model/Diasel/Default"
import Pattern from "~/model/Diasel/Pattern" import Pattern from "~/model/Diasel/Pattern"
...@@ -70,7 +71,7 @@ export default { ...@@ -70,7 +71,7 @@ export default {
} }
}); });
let rtnmsg = await this.init({}) /* let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
...@@ -80,7 +81,13 @@ export default { ...@@ -80,7 +81,13 @@ export default {
else else
{ {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} } */
const that = this;
that.init(that.model).then(res => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data)
this.$refs.diaselp.handleSearch();
})
} }
} }
</script> </script>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="ameadvrmk"> <el-form-item label="" prop="ameadvrmk">
<c-input <c-input
:disabled="model.litameadv == '无特殊规定'" :disabled="model.litameadv === '无特殊规定'"
type="textarea" type="textarea"
v-model="model.ameadvrmk" v-model="model.ameadvrmk"
:rows="4" :rows="4"
...@@ -46,15 +46,57 @@ ...@@ -46,15 +46,57 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="开证行" prop="bchname" style="width: 65%"> <el-form-item label="开证行" prop="bchname">
<c-input <c-input
v-model="model.bchname" v-model="model.bchname"
maxlength="40" maxlength="40"
style="width: 81.2%" style="width: 50%"
placeholder="请输入branch name" placeholder="请输入branch name"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="开证行地址" prop="issadr">
<c-input
v-model="model.issadr"
type="textarea"
:rows="4"
maxlength="40"
style="width: 50%"
show-word-limit
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="开证行邮编" prop="pobzip">
<c-input
v-model="model.pobzip"
maxlength="10"
style="width: 50%"
placeholder="请输入pobzip"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="开证行电话" prop="tel">
<c-input
v-model="model.tel"
maxlength="16"
style="width: 50%"
placeholder="请输入tel"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="开证行传真" prop="fax">
<c-input
v-model="model.fax"
maxlength="16"
style="width: 50%"
placeholder="请输入fax"
></c-input>
</el-form-item>
</c-col>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="修改日期"> <el-form-item label="修改日期" prop="trnmod.swiadd.amedat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.trnmod.swiadd.amedat" v-model="model.trnmod.swiadd.amedat"
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
<el-form-item label="溢短装" prop="olddidgrp.rec.nomtop"> <el-form-item label="溢短装" prop="olddidgrp.rec.nomtop">
<c-input <c-input
v-model="model.olddidgrp.rec.nomtop" v-model="model.olddidgrp.rec.nomtop"
style="width: 46.9%" style="width: 48%"
disabled disabled
></c-input> ></c-input>
<label style="display: inline-block; width: 28px; text-align: center" <label style="display: inline-block; width: 2%; text-align: center"
>-</label> >-</label>
<c-input <c-input
v-model="model.olddidgrp.rec.nomton" v-model="model.olddidgrp.rec.nomton"
style="width: 47%" style="width: 48%"
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="" label-width="0" prop="trnmod.swiadd.ameamt"> <el-form-item label="" label-width="0">
<c-input <c-input
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
style="width: 100%" style="width: 100%"
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
<el-form-item prop="trnmod.swiadd.newnomtopame"> <el-form-item prop="trnmod.swiadd.newnomtopame">
<c-input <c-input
v-model="model.trnmod.swiadd.newnomtopame" v-model="model.trnmod.swiadd.newnomtopame"
style="width: 46.9%" style="width: 48%"
></c-input> ></c-input>
<label style="display: inline-block; width: 28px; text-align: center">-</label> <label style="display: inline-block; width: 2%; text-align: center">-</label>
<c-input <c-input
v-model="model.trnmod.swiadd.newnomtoname" v-model="model.trnmod.swiadd.newnomtoname"
style="width: 47%" style="width: 48%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<el-form-item label="合同金额" prop="didgrp.rec.conamt"> <el-form-item label="合同金额" prop="didgrp.rec.conamt">
<c-col :span="10"> <c-col :span="10">
<c-select v-model="model.didgrp.rec.concur" style="width:90%" placeholder="请选择"> <c-select v-model="model.didgrp.rec.concur" style="width:95%" placeholder="请选择">
<el-option label="CNY 人民币" value="CNY"></el-option> <el-option label="CNY 人民币" value="CNY"></el-option>
</c-select> </c-select>
</c-col> </c-col>
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="20">
<el-form-item label="MT799(79)签名" prop="ditp.signam"> <el-form-item label="MT799(79)签名" prop="ditp.signam">
<c-input v-model="model.ditp.signam" maxlength="50" @blur="BlurSignam" ></c-input> <c-input v-model="model.ditp.signam" maxlength="50" @blur="BlurSignam" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="15"> <c-col :span="20">
<el-form-item label="MT799(79)备注" prop="ditp.remark"> <el-form-item label="MT799(79)备注" prop="ditp.remark">
<c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="10" ></c-input> <c-input type="textarea" v-model="model.ditp.remark" maxlength="800" :rows="10" ></c-input>
</el-form-item> </el-form-item>
......
...@@ -141,15 +141,15 @@ ...@@ -141,15 +141,15 @@
<c-input <c-input
v-model="model.didgrp.rec.nomtop" v-model="model.didgrp.rec.nomtop"
maxlength="9" maxlength="9"
style="width: 44.3%" style="width: 48%"
disabled disabled
placeholder="请输入Amount Tolerance - Positive" placeholder="请输入Amount Tolerance - Positive"
></c-input> ></c-input>
<label style="display:inline-block;width:10%;text-align:center;">-</label> <label style="display:inline-block;width:2%;text-align:center;">-</label>
<c-input <c-input
v-model="model.didgrp.rec.nomton" v-model="model.didgrp.rec.nomton"
maxlength="9" maxlength="9"
style="width: 44.3%" style="width: 48%"
disabled disabled
placeholder="请输入Amount Tolerance - Negative" placeholder="请输入Amount Tolerance - Negative"
></c-input> ></c-input>
...@@ -808,7 +808,7 @@ export default { ...@@ -808,7 +808,7 @@ export default {
mixins: [CommonProcess], mixins: [CommonProcess],
data() { data() {
return { return {
jigomcFlag: false, jigomcFlag: true,
trade: "", trade: "",
}; };
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-form-item label="不符点"> <el-form-item label="不符点">
<c-col :span="21"> <c-col :span="21">
<c-input type="textarea" v-model="model.bddgrp.blk.docdis" disabled maxlength="50" show-word-limit <c-input type="textarea" v-model="model.bddgrp.blk.docdis" :disabled="!model.bddgrp.blk.docdisflg" maxlength="50" show-word-limit
placeholder="请输入不符点"></c-input> placeholder="请输入不符点"></c-input>
</c-col> </c-col>
...@@ -158,5 +158,8 @@ export default { ...@@ -158,5 +158,8 @@ export default {
created: function () {}, created: function () {},
}; };
</script> </script>
<style> <style scoped>
.el-checkbox >>> .el-checkbox__label {
width: 70px;
}
</style> </style>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:handleCheck="handleCheck" :handleCheck="handleCheck"
:handleStash="handleStash" :handleStash="handleStash"
> >
</c-function-btn> </c-function-btn>
<el-form <el-form
:model="model" :model="model"
:rules="rules" :rules="rules"
...@@ -17,12 +17,15 @@ ...@@ -17,12 +17,15 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000047 --> <!--PD000047 -->
<el-tab-pane label="单据概况" name="litdckp"> <el-tab-pane label="单据概况" name="litdckp">
<c-content> <c-content>
<m-litdckp :model="model" :codes="codes" v-on:changeShowDocpre="changeShowDocpre"/> <m-litdckp
:model="model"
:codes="codes"
v-on:changeShowDocpre="changeShowDocpre"
/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
...@@ -32,23 +35,22 @@ ...@@ -32,23 +35,22 @@
</el-tab-pane> --> </el-tab-pane> -->
<!--PD000062 --> <!--PD000062 -->
<el-tab-pane label="单据详情" name="docpre" v-if="isShowDocpre"> <el-tab-pane label="单据详情" name="docpre" v-if="isShowDocpre">
<m-docpre :model="model" :codes="codes" /> <m-docpre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000079 --> <!--PD000079 -->
<!-- <el-tab-pane label="Shipping Detail" name="shpdet"> <!-- <el-tab-pane label="Shipping Detail" name="shpdet">
<m-shpdet :model="model" :codes="codes"/> <m-shpdet :model="model" :codes="codes"/>
</el-tab-pane> --> </el-tab-pane> -->
<!-- <el-tab-pane label="或有" name="engp"> <el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes" /> <m-engp :model="model" :codes="codes" />
</el-tab-pane> --> </el-tab-pane>
<el-tab-pane label="费用及账务" name="setpan"> <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="分录" name="glepan"> <!-- <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" /> <m-glepan :model="model" :codes="codes" ref="glepan" />
...@@ -68,11 +70,15 @@ ...@@ -68,11 +70,15 @@
<el-tab-pane label="授信额度" name="limitbody"> <el-tab-pane label="授信额度" name="limitbody">
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"> <c-grid-ety-prompt-dialog
</c-grid-ety-prompt-dialog> ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</c-page> </c-page>
</template> </template>
...@@ -123,57 +129,46 @@ export default { ...@@ -123,57 +129,46 @@ export default {
mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
isShowDocpre:false, isShowDocpre: false,
tabVal: "litdckp", tabVal: "litdckp",
trnName: "ditdck", trnName: "ditdck",
model: new Ditdck().data, model: new Ditdck().data,
// checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { ...CodeTable, codes: { ...CodeTable, invtypCodes: [{ label: "type1", value: "1" }] },
invtypCodes:[
{ label: "type1", value: "1" }
], },
}; };
}, },
methods: { methods: {
changeShowDocpre(val) {
this.isShowDocpre = val;
},
}, },
created: async function () { created: async function () {
console.log("进入ditdck交易"); console.log("进入ditdck交易");
let rtnmsg = await this.init(this.$route.query) let rtnmsg = await this.init(this.$route.query);
if(rtnmsg.respCode == SUCCESS) if (rtnmsg.respCode == SUCCESS) {
{ //TODO 处理数据逻辑
//TODO 处理数据逻辑 console.log(rtnmsg);
console.log(rtnmsg) debugger;
Utils.copyValueFromVO(this.model,rtnmsg.data) Utils.copyValueFromVO(this.model, rtnmsg.data);
console.log(this.model); console.log(this.model);
if(this.isInDisplay){ if (this.isInDisplay) {
this.restoreDisplay() this.restoreDisplay();
} }
}
if(this.model.bddgrp.rec.dscinsflg == "X"){ };
this.isShowDocpre = true; if (this.model.bddgrp.rec.dscinsflg == "X") {
} this.isShowDocpre = true;
else } else {
{ this.$notify.error({ title: "错误", message: "服务请求失败!" });
this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
// console.log("进入ditdck交易");
// let rtnmsg = await this.init({});
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// } else {
// this.$notify.error({ title: "错误", message: "服务请求失败!" });
// }
}, },
methods: {
changeShowDocpre(val) {
this.isShowDocpre = val
}
}
}; };
</script> </script>
<style> <style>
......
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -113,5 +113,6 @@ export default { ...@@ -113,5 +113,6 @@ export default {
<style> <style>
.busnavbar-items{ .busnavbar-items{
/*TODO完善按钮间隔等样式 */ /*TODO完善按钮间隔等样式 */
margin-left:-10px;
} }
</style> </style>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<c-row> <c-row>
<c-col :span="23"> <c-col :span="23">
<c-col :span="6"> <c-col :span="8">
<el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%" > <el-form-item label="Own Reference" prop="infcon.seaownref" style="width: 100%" >
<c-input <c-input
v-model="model.infcon.seaownref" v-model="model.infcon.seaownref"
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> <!-- <c-col :span="2">
&nbsp; &nbsp;
</c-col> </c-col> -->
<c-col :span="10"> <c-col :span="8">
<el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%"> <el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
<c-col :span="10"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.infcon.opndatfrom" v-model="model.infcon.opndatfrom"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<c-col :span="2" style="text-align: center"> <c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label> <label style="display: inline-block; width: 100%">-</label>
</c-col> </c-col>
<c-col :span="10"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.infcon.opndatto" v-model="model.infcon.opndatto"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</c-col> </c-col>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="8">
<el-form-item label="Name" prop="infcon.nam" style="width: 100%"> <el-form-item label="Name" prop="infcon.nam" style="width: 100%">
<c-input <c-input
v-model="model.infcon.nam" v-model="model.infcon.nam"
...@@ -240,12 +240,44 @@ ...@@ -240,12 +240,44 @@
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <!-- <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
> >
详情 详情
</c-button> </c-button> -->
<el-popover
placement="top-start"
title="历史信息"
width="800"
trigger="click"
>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="display(scope.$index, scope.row)"
>
查看详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>
详情
</c-button>
</el-popover>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
...@@ -293,6 +325,17 @@ export default { ...@@ -293,6 +325,17 @@ export default {
return { return {
ownref:"", ownref:"",
initdialog:false, initdialog:false,
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 100',
'3 3 "日期" 200',
'4 4 "状态" 50',
'5 5 "币种" 80',
'6 6 "金额" 80',
],
data: [],
},
stmData: { stmData: {
columns: [ columns: [
'1 1 "Reference" 140 ', '1 1 "Reference" 140 ',
...@@ -333,7 +376,21 @@ export default { ...@@ -333,7 +376,21 @@ export default {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code)
this.initdialog = false this.initdialog = false
} },
async getTrnInfo(idx, row) {
debugger;
this.model.infcon.objinr = row["INR"];
this.model.didgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
}, },
created: function () {}, created: function () {},
}; };
......
<template> <template>
<div class="eContainer"> <div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" <div style="padding:0 15px">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="110px" label-position="right" size="small"
:validate-on-rule-change="false"> :validate-on-rule-change="false">
<!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" class="infbddTab"> --> <!-- <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick" class="infbddTab"> -->
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
</el-tab-pane> --> </el-tab-pane> -->
</el-form> </el-form>
</div>
</div> </div>
</template> </template>
<script> <script>
......
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -108,5 +108,6 @@ export default { ...@@ -108,5 +108,6 @@ export default {
<style> <style>
.busnavbar-items{ .busnavbar-items{
/*TODO完善按钮间隔等样式 */ /*TODO完善按钮间隔等样式 */
margin-left:8px;
} }
</style> </style>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
> >
<el-row> <el-row>
<c-col :span="23"> <c-col :span="23">
<c-col :span="6"> <c-col :span="8">
<el-form-item <el-form-item
label="Own Reference" label="Own Reference"
prop="infcon.seaownref" prop="infcon.seaownref"
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> &nbsp; </c-col> <!-- <c-col :span="2"> &nbsp; </c-col> -->
<c-col :span="10"> <c-col :span="8">
<el-form-item <el-form-item
label="Opening between" label="Opening between"
prop="infcon.opndatfrom" prop="infcon.opndatfrom"
style="width: 100%" style="width: 100%"
> >
<c-col :span="10"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.infcon.opndatfrom" v-model="model.infcon.opndatfrom"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<c-col :span="2" style="text-align: center"> <c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label> <label style="display: inline-block; width: 100%">-</label>
</c-col> </c-col>
<c-col :span="10"> <c-col :span="11">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.infcon.opndatto" v-model="model.infcon.opndatto"
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="6"> <c-col :span="8">
<el-form-item <el-form-item
label="Party Reference" label="Party Reference"
prop="infcon.searef" prop="infcon.searef"
...@@ -296,13 +296,13 @@ ...@@ -296,13 +296,13 @@
</c-list-search> </c-list-search>
<c-col :span="24" style="margin-top: 10px"> <c-col :span="24" style="margin-top: 10px">
<c-button type="primary" size="small" @click="toDitopn">信用证开立</c-button> <c-button size="medium" type="primary" @click="toDitopn">信用证开立</c-button>
</c-col> </c-col>
<!-- <el-row> --> <!-- <el-row> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left" <c-col :span="11" style="text-align: left"
><span>操作</span></c-col ><span>操作</span></c-col
...@@ -322,15 +322,14 @@ ...@@ -322,15 +322,14 @@
:list="trnData.data" :list="trnData.data"
:columns="trnData.columns" :columns="trnData.columns"
> >
<el-table-column prop="op" label="操作" width="110"> <el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope"> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary"
@click="display(scope.$index, scope.row)" @click="display(scope.$index, scope.row)"
> >
查看详情 详情
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -591,14 +590,12 @@ export default { ...@@ -591,14 +590,12 @@ export default {
dialogTableVisible: false, dialogTableVisible: false,
trnData: { trnData: {
columns: [ columns: [
'1 1 "编号" 0', '1 1 "编号" 200',
'2 2 "交易名称" 0', '2 2 "交易名称" 100',
'3 3 "日期" 0', '3 3 "日期" 200',
'4 4 "状态" 0', '4 4 "状态" 50',
'5 5 "币种" 0', '5 5 "币种" 80',
'6 6 "金额" 0', '6 6 "金额" 80',
'7 7 "Relres" 0',
'0 8 "Inr" 0',
], ],
data: [], data: [],
}, },
......
<template> <template>
<div class="eContainer"> <div class="eContainer">
<div style="padding:0 5px"> <div style="padding:0 15px">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="110px" label-position="right" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" label-width="110px" label-position="right" size="small" :validate-on-rule-change="false">
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data) that.model = Utils.copyValueFromVO(that.model, res.data)
// that.$refs.Menu.stmData.columns = res.data.sptstm.rows; // that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
this.$refs.Menu.handleSearch() this.$refs.Menu.handleSearch();
}) })
} }
} }
......
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="small" size="small"
@click="handleSearch" @click="trnfndhandleSearch"
>查询</el-button >查询</el-button
> >
</c-col> </c-col>
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......
...@@ -20,9 +20,7 @@ ...@@ -20,9 +20,7 @@
v-if="isAffix(tag) && tag.meta.icon" v-if="isAffix(tag) && tag.meta.icon"
:class="tag.meta.icon" :class="tag.meta.icon"
></span> ></span>
{{ {{ typeof tag.title === "function" ? tag.title(tag) : tag.title }}
typeof tag.title === "function" ? tag.title(tag) : tag.title
}}
<span <span
v-if="!isAffix(tag)" v-if="!isAffix(tag)"
class="el-icon-close" class="el-icon-close"
...@@ -74,9 +72,9 @@ export default { ...@@ -74,9 +72,9 @@ export default {
watch: { watch: {
$route() { $route() {
if (this.$route.path.startsWith("/review")) { if (this.$route.path.startsWith("/review")) {
this.$store.commit("setMode", "display") this.$store.commit("setMode", "display");
} else { } else {
this.$store.commit("setMode", "normal") this.$store.commit("setMode", "normal");
} }
this.addTags(); this.addTags();
this.moveToCurrentTag(); this.moveToCurrentTag();
...@@ -163,19 +161,27 @@ export default { ...@@ -163,19 +161,27 @@ export default {
}); });
}, },
closeSelectedTag(view) { closeSelectedTag(view) {
const title = typeof view.title === "function" ? view.title(view) : view.title
if (title.indexOf("详情") > - 1 || title.indexOf("info") > -1 || title.indexOf("查询") > -1) {
this.closeTagView(view);
return
}
this.$confirm("您有未保存的数据,确定退出吗, 是否继续?", "提示", { this.$confirm("您有未保存的数据,确定退出吗, 是否继续?", "提示", {
showCancelButton: true, showCancelButton: true,
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.$store this.closeTagView(view);
.dispatch("TagsView/delView", view)
.then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view);
}
});
}); });
}, },
closeTagView(view) {
this.$store
.dispatch("TagsView/delView", view)
.then(({ visitedViews }) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view);
}
});
},
closeOthersTags() { closeOthersTags() {
this.$router.push(this.selectedTag); this.$router.push(this.selectedTag);
this.$store this.$store
...@@ -259,7 +265,7 @@ export default { ...@@ -259,7 +265,7 @@ export default {
font-size: 12px; font-size: 12px;
/* margin-left: 4px; */ /* margin-left: 4px; */
/* margin-top: 4px; */ /* margin-top: 4px; */
margin:0 4px 0 0; margin: 0 4px 0 0;
} }
.tags-view-container .tags-view-wrapper .tags-view-item:first-of-type { .tags-view-container .tags-view-wrapper .tags-view-item:first-of-type {
margin-left: 10px; margin-left: 10px;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</el-option> </el-option>
</c-select> </c-select>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="16">
<c-input <c-input
:readonly="true" :readonly="true"
v-model="model.liaall.liaccv.newamt" v-model="model.liaall.liaccv.newamt"
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="保证金应收比例" prop="liaall.liaccv.cshpct"> <el-form-item label="保证金应收比例" prop="liaall.liaccv.cshpct">
<c-row> <c-row>
<c-col :span="8"> <c-col :span="20">
<c-input v-model="model.liaall.liaccv.cshpct"></c-input> <c-input v-model="model.liaall.liaccv.cshpct"></c-input>
</c-col> </c-col>
<c-col :span="12" style="margin-left: 20px"> <c-col :span="2" style="margin-left: 20px">
<span>%</span> <span>%</span>
</c-col> </c-col>
</c-row> </c-row>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</el-option> </el-option>
</c-select> </c-select>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="16">
<c-input <c-input
:readonly="true" :readonly="true"
v-model="model.liaall.liaccv.newresamt" v-model="model.liaall.liaccv.newresamt"
...@@ -111,13 +111,13 @@ ...@@ -111,13 +111,13 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="保证金实收比例" prop="liaall.liaccv.relcshpct"> <el-form-item label="保证金实收比例" prop="liaall.liaccv.relcshpct">
<c-row> <c-row>
<c-col :span="8"> <c-col :span="20">
<c-input <c-input
:readonly="true" :readonly="true"
v-model="model.liaall.liaccv.relcshpct" v-model="model.liaall.liaccv.relcshpct"
></c-input> ></c-input>
</c-col> </c-col>
<c-col :span="12" style="margin-left: 20px"> <c-col :span="2" style="margin-left: 20px">
<span>%</span> <span>%</span>
</c-col> </c-col>
</c-row> </c-row>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
</el-option> </el-option>
</c-select> </c-select>
</c-col> </c-col>
<c-col :span="14"> <c-col :span="16">
<c-input <c-input
:readonly="true" :readonly="true"
v-model="model.liaall.liaccv.pctresamt" v-model="model.liaall.liaccv.pctresamt"
...@@ -280,19 +280,17 @@ ...@@ -280,19 +280,17 @@
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="24" style="margin-top:15px"> <c-col :span="12" style="margin-top:15px">
<el-form-item label="金额总和"> <el-form-item label="金额总和">
<c-col :span="8"> <!-- <c-col :span="8"> -->
<c-input <c-input
style="width: 50%" style="width: 100%"
v-model="model.liaall.liaccv.totcovamt" v-model="model.liaall.liaccv.totcovamt"
placeholder="请输入金额总和" placeholder="请输入金额总和"
></c-input> ></c-input>
</c-col> <!-- </c-col> -->
</el-form-item> </el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Additional Information "> <el-form-item label="Additional Information ">
<c-input <c-input
type="textarea" type="textarea"
...@@ -304,6 +302,19 @@ ...@@ -304,6 +302,19 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="12">
<el-form-item label="Additional Information ">
<c-input
type="textarea"
:rows="5"
v-model="model.liaall.liaccv.addinf"
maxlength="200"
show-word-limit
placeholder="请输入Additional Information "
></c-input>
</el-form-item>
</c-col> -->
</div> </div>
</template> </template>
<script> <script>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
v-model="model.mtabut.coninf.oitinf.oit.inflev" v-model="model.mtabut.coninf.oitinf.oit.inflev"
:disabled="model.mtabut.coninf.oitinf.oit.inftxt ? false : true" :disabled="model.mtabut.coninf.oitinf.oit.inftxt ? false : true"
placeholder="请选择Infotext Level" placeholder="请选择Infotext Level"
style="width: 100%"
:code="inflev" :code="inflev"
> >
</c-select> </c-select>
...@@ -58,23 +59,25 @@ ...@@ -58,23 +59,25 @@
v-model="model.mtabut.coninf.oitset.oit.inflev" v-model="model.mtabut.coninf.oitset.oit.inflev"
:disabled="model.mtabut.coninf.oitset.oit.inftxt ? false : true" :disabled="model.mtabut.coninf.oitset.oit.inftxt ? false : true"
placeholder="请选择Infotext Level" placeholder="请选择Infotext Level"
style="width: 100%"
:code="inflev" :code="inflev"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="24">
<c-col :span="15">
<el-form-item label="执行日期" prop="mtabut.coninf.conexedat"> <el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.mtabut.coninf.conexedat" v-model="model.mtabut.coninf.conexedat"
style="width: 50%" style="width: 100%"
placeholder="请选择执行日期" placeholder="请选择执行日期"
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="7" :offset="5"> <c-col :span="7" :offset="1">
<el-form-item label="Send for Release to" prop="mtabut.coninf.usr.extkey"> <el-form-item label="Send for Release to" prop="mtabut.coninf.usr.extkey">
<c-input <c-input
v-model="model.mtabut.coninf.usr.extkey" v-model="model.mtabut.coninf.usr.extkey"
...@@ -84,6 +87,7 @@ ...@@ -84,6 +87,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
</c-row> </c-row>
</template> </template>
<script> <script>
......
...@@ -414,8 +414,8 @@ export default { ...@@ -414,8 +414,8 @@ export default {
stmData: { stmData: {
columns: [ columns: [
//注释的已改成静态 //注释的已改成静态
"role 收报人", "role 收报人 80px",
"pandsc 描述", "pandsc 描述 260px",
//"cortyp 类型", //"cortyp 类型",
//"docsnf 报文格式", //"docsnf 报文格式",
//"docuil 语言", //"docuil 语言",
......
...@@ -133,36 +133,36 @@ ...@@ -133,36 +133,36 @@
<!-- ========================右边======================= --> <!-- ========================右边======================= -->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="20"> <c-col :span="24">
<el-form-item label="业务编号" prop="liaall.limmod.ownref"> <el-form-item label="业务编号" prop="liaall.limmod.ownref">
<c-input <c-input
v-model="model.liaall.limmod.ownref" v-model="model.liaall.limmod.ownref"
maxlength="16" maxlength="16"
placeholder="请输入国结业务编号" placeholder="请输入国结业务编号"
:disabled="true" :disabled="true"
style="width: 95%" style="width: 100%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="20"> <c-col :span="24">
<el-form-item label="业务余额" prop="liaall.limmod.comamt"> <el-form-item label="业务余额" prop="liaall.limmod.comamt">
<c-input <c-input
v-model="model.liaall.limmod.comamt" v-model="model.liaall.limmod.comamt"
placeholder="请输入业务余额" placeholder="请输入业务余额"
:disabled="true" :disabled="true"
style="width: 95%" style="width: 100%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="20"> <c-col :span="24">
<el-form-item label="保证金余额" prop="liaall.limmod.ccvamt"> <el-form-item label="保证金余额" prop="liaall.limmod.ccvamt">
<c-input <c-input
v-model="model.liaall.limmod.ccvamt" v-model="model.liaall.limmod.ccvamt"
placeholder="请输入保证金余额" placeholder="请输入保证金余额"
:disabled="true" :disabled="true"
style="width: 95%" style="width: 100%"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -3,27 +3,33 @@ ...@@ -3,27 +3,33 @@
<c-tabs :value="tabVal" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="待经办列表" name="sptsel"> <el-tab-pane label="待经办列表" name="sptsel">
<!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> --> <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
<c-content :height="160">
<span slot="label"> <span slot="label">
待经办列表 待经办列表
<el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
</span> </span>
<c-content :height="160">
<t-sptsel /> <t-sptsel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel"> <el-tab-pane label="待复核列表" name="trnrel">
<c-content :height="160">
<span slot="label"> <span slot="label">
待复核列表 待复核列表
<el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/>
</span> </span>
<c-content :height="160">
<t-trnrel /> <t-trnrel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成列表" name="trnfnd"> <el-tab-pane label="已完成列表" name="trnfnd">
<span slot="label">
已完成列表
<el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
</span>
<c-content :height="160">
<t-trnfnd /> <t-trnfnd />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待申报列表" name="bopsel"> <el-tab-pane label="待申报列表" name="bopsel">
<t-bopsel /> <t-bopsel />
...@@ -36,6 +42,10 @@ ...@@ -36,6 +42,10 @@
<t-sptbrk /> <t-sptbrk />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="diasel"> <el-tab-pane label="到期提示" name="diasel">
<span slot="label">
到期提示
<el-badge v-if="$store.state.Status.taskList.diasel>0" :value="$store.state.Status.taskList.diasel" :max="99"/>
</span>
<c-content :height="160"> <c-content :height="160">
<t-diasel/> <t-diasel/>
</c-content> </c-content>
......
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