Skip to content

V
vue-gjjs
Commit b944a7d9 by wangyanjiao
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents e824e24c 200d77d4
Showing with 53 additions and 29 deletions
src/config/CodeTable/index.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/model/Detopn/Pattern.js
......@@ -150,7 +150,7 @@ export default {
{type:"number", max:9999, message: "大小不超过9999" }
],
"dedgrp.blk.defdet":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"dedgrp.apl.adrelc":[
......
src/model/Public/Mtabut/index.js
......@@ -5,18 +5,14 @@ export default class Mtabut {
oitinf: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit: {
inftxt: {
rows: []
}, // Infotext .mtabut.coninf.oitinf.oit.inftxt
inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
},
},
oitset: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit: {
inftxt: {
rows:[]
}, // Infotext .mtabut.coninf.oitset.oit.inftxt
inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev
},
},
......
src/views/Business/Detopn/Ovwp.vue
......@@ -468,6 +468,7 @@
</el-form-item>
</c-col>
<div v-if="model.dedgrp.rec.avbby != 'D'">
<c-col :span="24">
<el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
<c-input
......@@ -476,9 +477,24 @@
maxlength="35"
show-word-limit
placeholder="请输入远期付款指示"
:disabled="!model.dedgrp.rec.avbby"
></c-input>
</el-form-item>
</c-col>
</div>
<div v-else>
<c-col :span="24">
<el-form-item label="远期付款指示" prop="dedgrp.blk.defdet">
<c-input
type="textarea"
v-model="model.dedgrp.blk.defdet"
maxlength="35"
show-word-limit
placeholder="请输入远期付款指示"
></c-input>
</el-form-item>
</c-col>
</div>
</c-col>
<!-- ========================右边======================= -->
......@@ -585,7 +601,10 @@
-->
<c-col :span="24">
<el-form-item label="受益人开户行联行行号" prop="dedgrp.beb.pts.bankno">
<el-form-item
label="受益人开户行联行行号"
prop="dedgrp.beb.pts.bankno"
>
<c-input
v-model="model.dedgrp.beb.pts.bankno"
maxlength="20"
......
src/views/Business/Infbdd/Infsea.vue
......@@ -305,12 +305,8 @@
</c-col>
</el-row>
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
</div>
</el-dialog>
</div>
</template>
<script>
import Api from "~/service/Api";
......@@ -330,7 +326,6 @@ export default {
return {
ditselModel: new DitselModel().data,
ownref:"",
initdialog:false,
trnData: {
columns: [
'1 1 "编号" 200',
......@@ -370,22 +365,19 @@ export default {
methods: {
...Event,
async getButtons(ownref){
this.initdialog = true
this.ownref = ownref
this.$refs.childs.initdialog = true
console.log("ownref:" +ownref);
setTimeout(()=>{
this.$refs.childs.$emit("childmethods")
},10)
},
async onChoose(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.initdialog = false
this.$refs.childs.initdialog = false
} ,
async getDitSelInfo(code){
//跳转交易
this.$router.history.push("/business/" + code)
this.initdialog = false
this.$refs.childs.initdialog = false
},
closeTrn(refId){
this.$refs[refId].doClose();
......
src/views/Public/BusNavbar.vue
<template>
<el-dialog
:visible.sync="initdialog"
:title="'交易列表'"
append-to-body
:before-close="beforeClose"
@opened="opened"
>
<div class="m-list-btns">
<div class="busnavbar">
<div class="busnavbar-items">
<c-button
......@@ -15,6 +23,8 @@
>
</div>
</div>
</div>
</el-dialog>
</template>
<script>
import Api from "~/service/Api";
......@@ -22,28 +32,29 @@ import commonProcess from "~/mixin/commonProcess";
export default {
props: {
"ownref": {
ownref: {
required: true,
},
"trnCode": {
trnCode: {
required: true,
},
"model": {
model: {
required: true,
},
"ownrefPath": {
ownrefPath: {
required: false,
default: "didgrp"
default: "didgrp",
},
"tabIndex": {
tabIndex: {
required: false,
default: 1
default: 1,
},
},
components: {},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data() {
return {
initdialog: false,
navcode: [
// {code:"",label:"",isDis:"",title:""},
],
......@@ -70,12 +81,18 @@ export default {
}
return 0;
},
opened() {
this.$emit("childmethods");
},
beforeClose() {
this.navcode = [];
this.initdialog = false;
},
},
mounted() {
this.trnName = this.trnCode
this.trnName = this.trnCode;
this.$nextTick(function () {
this.$on("childmethods", async function () {
let res = await this.executeRule(`cfgfil.hotreg${this.tabIndex}`);
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
......@@ -89,7 +106,7 @@ export default {
this.navcode = [];
//请求按钮数据
this.model[this.ownrefPath].rec.ownref = this.ownref;
let rtnmsg = await this.executeRule(this.ownrefPath+".rec.ownref"); //didgrp_rec_ownref
let rtnmsg = await this.executeRule(this.ownrefPath + ".rec.ownref"); //didgrp_rec_ownref
if (rtnmsg.respCode == SUCCESS) {
//重置数组
this.navcode = [];
......
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