Commit 2206a642 by wangna

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 4215eec3 9bf27d18
......@@ -2,6 +2,9 @@ import Api from "~/service/Api"
import Utils from "~/utils"
export default {
onSeainf() {
},
async handleSearch() {
let colflg = this.model.cldgrp.rec.colflg;
if (!colflg || colflg == '') {
......@@ -16,6 +19,7 @@ export default {
let rtnmsg = await this.executeRule("butsea")
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
console.log(rtnmsg.data.ccdbatg)
//TODO 处理数据逻辑
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
}
......@@ -23,6 +27,13 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleSearchAll() {
let rtnmsg = await this.executeRule("search")
if (rtnmsg.respCode == SUCCESS) {
//TODO 列表显示数据
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
}
},
async onCltpButgetref() {
let rtnmsg = await this.executeRule("cltp.butgetref")
if (rtnmsg.respCode == SUCCESS) {
......
......@@ -13,10 +13,10 @@ export default {
{max: 1,message:"长度不能超过1"}
],
"cldgrp.rec.valdat":[
{type: "date", required: true, message: "必输项"}
{type: "string", required: true, message: "必输项"}
],
"cldgrp.rec.credat":[
{type: "date", required: true, message: "必输项"}
{type: "string", required: true, message: "必输项"}
],
"rowcntr":[
{type: "number", required: false, message: "必输项"},
......@@ -87,14 +87,6 @@ export default {
{max: 1,message:"长度不能超过1"}
],
"trnmod.trndoc.condocstm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="内容" name="sel">
<m-sel :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="关联账号" name="account">
<m-account :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import Sel from "./Sel";
import Account from "./Account";
import commonProcess from "~/mixin/commonProcess";
import Events from "~/model/Cltdav/Event";
export default {
components: {
"m-sel": Sel,
"m-account": Account,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["sel"],
}
},
methods: {
...Events,
handleChange(val) {
console.log(val);
},
}
}
</script>
\ No newline at end of file
<template>
<div class="eContainer">
<c-page title="打包托收开立">
<div class="eContainer">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<el-button size="small">保存模板</el-button>
<el-button size="small">使用模板</el-button>
<el-button size="small">制裁信息</el-button>
<el-button size="small">拆分报文</el-button>
<el-button size="small">提示</el-button>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="left"
size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000002 -->
<el-tab-pane label="内容" name="sel">
<c-content>
<m-sel :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!-- <el-tab-pane label="内容" name="sel">-->
<!-- <c-content>-->
<!-- <m-sel :model="model" :codes="codes" />-->
<!-- </c-content>-->
<!-- </el-tab-pane>-->
<!--PD000000 -->
<el-tab-pane label="提示信息" name="coninfp">
<c-content>
<m-coninfp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="报文和面函" name="docpan">
......@@ -36,23 +47,12 @@
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="提示信息" name="coninfp">
<c-content>
<m-coninfp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000057 -->
<el-tab-pane label="关联账号" name="account">
<m-account :model="model" :codes="codes" />
</el-tab-pane>
<!-- <el-tab-pane label="关联账号" name="account">-->
<!-- <c-content>-->
<!-- <m-account :model="model" :codes="codes" />-->
<!-- </c-content>-->
<!-- </el-tab-pane>-->
</c-tabs>
</el-form>
......@@ -60,8 +60,20 @@
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData" @select-ety="selectMsg">
</c-grid-ety-prompt-dialog>
</div>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<!-- <el-button size="small">备忘录</el-button>-->
<!-- <el-button size="small">影像信息</el-button>-->
<!-- <el-button size="small">保存模板</el-button>-->
<!-- <el-button size="small">使用模板</el-button>-->
<!-- <el-button size="small">制裁信息</el-button>-->
<!-- <el-button size="small">拆分报文</el-button>-->
<!-- <el-button size="small">提示</el-button>-->
</c-function-btn>
</c-page>
</div>
</template>
<script>
......@@ -75,8 +87,9 @@ import Check from "~/model/Cltdav/Check";
import Default from "~/model/Cltdav/Default";
import Pattern from "~/model/Cltdav/Pattern";
import Sel from "./Sel";
import Account from "./Account";
// import Sel from "./Sel";
// import Account from "./Account";
import Ovwp from "./Ovwp";
import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan";
......@@ -89,8 +102,8 @@ import Doctre from "~/views/Public/Doctre";
export default {
name: "Cltdav",
components: {
"m-sel": Sel,
"m-account": Account,
// "m-sel": Sel,
// "m-account": Account,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
......@@ -98,6 +111,7 @@ export default {
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
"m-ovwp": Ovwp,
},
provide() {
......@@ -108,7 +122,7 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "sel",
tabVal: "ovwp",
trnName: "cltdav",
model: new Cltdav().data,
checkRules: Check,
......
......@@ -64,7 +64,7 @@
<c-col :span="10">
<el-form-item label="" label-width="10px" prop="lidgrp.cbs.nom1.amt">
<c-input disabled v-model="model.lidgrp.cbs.nom1.amt" placeholder="请输入金额"></c-input>
<c-input-currency disabled v-model="model.lidgrp.cbs.nom1.amt" placeholder="请输入金额"></c-input-currency>
</el-form-item>
</c-col>
......
......@@ -169,7 +169,7 @@ export default {
.then((res) => {
if (res) {
this.$message.success("修改柜员权限信息成功!");
// this.model.ubrList = res.ubrList;
//TODO model.uclList回填
this.handleClose();
}
})
......@@ -200,7 +200,8 @@ export default {
.then((res) => {
if (res) {
this.$message.success("保存柜员权限信息成功!");
this.model.ubrList = res.ubrList;
//TODO model.uclList回填
// this.model.ubrList = res.ubrList;
this.handleClose();
}
})
......
......@@ -164,6 +164,7 @@ export default {
.then((res) => {
if (res.usr) {
this.$message.success("修改柜员组信息成功!");
//TODO model.uclList回填
this.handleClose();
}
})
......@@ -193,6 +194,7 @@ export default {
.then((res) => {
if (res) {
this.$message.success("保存柜员组信息成功!");
//TODO model.uclList回填
this.handleClose();
}
})
......
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