Skip to content

V
vue-gjjs
Commit 3957b8bf by hulei
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 54f1e674 557cc6c6
Showing with 172 additions and 100 deletions
src/components/IStreamTable.vue
......@@ -327,6 +327,22 @@ export default {
return value
}
return em.label
},
timeFormat(item,scope){
let value = scope.row[item.prop];
if(!value){
return ""
}
let idx = value.indexOf(".");
return value.substring(0,idx);
},
dateFormat(item,scope){
let value = scope.row[item.prop];
if(!value){
return ""
}
let idx = value.indexOf(" ");
return value.substring(0,idx);
}
}
};
......
src/mixin/commonFuncs.js
......@@ -89,6 +89,6 @@ export default {
},
async handlePass(data) {
this.$store.state.Transaction.operateFuns[data.operateId]["pass"]()
},
},
},
};
src/model/Bdtset/Pattern.js
......@@ -295,11 +295,11 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"skr":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"skzh":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"bddgrp.rec.skhmc":[
......
src/model/Ditdck/index.js
......@@ -288,6 +288,7 @@ export default class Ditdck{
ccvamt:"", // 保证金余额 .liaall.limmod.ccvamt
ecifno:"", // ECIFNO .liaall.limmod.ecifno
},
liaallg:[],
},
setmod: new Pub().data.Setmod,
infcon:{
......
src/model/Ditopn/Event.js
......@@ -195,38 +195,6 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async onLiaccvAdd() {
let rtnmsg = await this.executeRule("liaall.liaccv.add")
//const that = this.root;
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
debugger;
this.stmData.data = rtnmsg.data.vals.rows;
this.dialogTableVisible = true;
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async onLiaccvDel(index,row) {
let ids = [index+1];
let params = {selDst:"liaall.liaccv.liaccvg",selIds:ids};
let rtnmsg = await this.executeRule("liaall.liaccv.del",params)
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
debugger;
this.$message({
type: 'success',
message: '删除成功！'
});
//this.model.liaall.liaccv.liaccvg = [];
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async onSeaParty(path) {
let rtnmsg = await this.executeRule(path)
if (rtnmsg.respCode == SUCCESS) {
......@@ -263,14 +231,6 @@ export default {
async onExtkey(e) {
},
async pickDepItem(idx,row) {
var params = {selDst:"",selIds:[idx+1]}
let rtnmsg = await this.executeRule("liaall.liaccv.add", params)
if (rtnmsg.respCode == SUCCESS) {
this.dialogTableVisible = false;
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
// didgrp.iss.pts.extkey
async changeExtkey() {
let rtnmsg = await this.executeRule("didgrp.iss.pts.extkey")
......
src/model/Public/Setmod/index.js
......@@ -22,7 +22,9 @@ export default class Setmod {
},
glemod: {
gleshwstm: {}
}
},
setamt:"", // 扣费后付款金额 .setmod.setamt
redamt:"", // 扣减金额 .setmod.redamt
}
}
}
\ No newline at end of file
src/routers/index.js
......@@ -5,6 +5,7 @@ import Display from "../views/Display";
import Login from "../views/Login";
import Layout from "../views/Layout";
import BusRouter from "../views/Business/BusRouter";
import ReviewRouter from "../views/Review/ReviewRouter";
import DocRouter from "../views/Docpan/DocRouter";
Vue.use(VueRouter);
......@@ -15,12 +16,6 @@ const DisplayRouter = BusRouter.map(route => {
return newRoute;
})
const ReviewRouter = BusRouter.map(route => {
const newRoute = Object.assign({}, route)
newRoute.name = newRoute.name + 'Review'
return newRoute;
})
/**
* Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
*
......
src/views/Business/BusRouter.js
......@@ -145,7 +145,7 @@ const BusRouter = [
{ path: 'ditame', component: Ditame, name: 'Ditame', meta: { title: '信用证修改' } },
{ path: 'ditcan', component: Ditcan, name: 'Ditcan', meta: { title: '信用证注销' } },
{ path: 'ditsel', component: Ditsel, name: 'Ditsel', meta: { title: '信用证查询' } },
{ path: 'ditopn', component: Ditopn, name: 'Ditopn', meta: { title: (tag) => { return tag.path.startsWith("/review") ? "复核" : '买方信用证开立' } } },
{ path: 'ditopn', component: Ditopn, name: 'Ditopn', meta: { title: '买方信用证开立' } },
{ path: 'infdid', component: Infdid, name: 'Infdid', meta: { title: '信用证交易查询' } },
{ path: 'ditdck', component: Ditdck, name: 'Ditdck', meta: { title: '信用证到单' } },
// 例
......
src/views/Business/Diasel/Diaselp.vue
......@@ -460,13 +460,14 @@ export default {
},
stmData: {
columns: [
'1 1 "提示日期" 160',
// '1 1 "提示日期" 160',
{index:1,position:1,width:90,pattern:'dateFormat',label:'提示日期'},
'2 2 "提示原因" 100',
'3 3 "业务编号" 150',
'4 4 "提示信息" 270',
'4 4 "提示信息" 300',
'5 5 "待操作交易代码" 120',
'6 6 "经办柜员" 100',
'7 7 "所属工作组" 0',
'7 7 "所属工作组" auto',
// '8 8 "客户号" 1',
// '9 9 "客户名称" 1',
// '10 10 "币种" 1',
......
src/views/Business/Sptsel/Menu.vue
......@@ -435,7 +435,8 @@ export default {
{index:1,position:4,width:110,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110',
'7 7 "创建时间" 160 20 DateTime 1',
// '7 7 "创建时间" 160 20 DateTime 1',
{index:7,position:7,width:140,pattern:'timeFormat',label:'创建时间'},
'19 8 "币种" 50',
'20 9 "金额" 69 2 8 1 16',
......
src/views/Business/Sptsel/Sptbrk/Menu.vue
......@@ -387,7 +387,8 @@ export default {
{index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"Pending",value:"PEN"}]},
'17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110',
'7 7 "创建时间" 160 20 DateTime 1',
// '7 7 "创建时间" 160 20 DateTime 1',
{index:7,position:7,width:140,pattern:'timeFormat',label:'创建时间'},
'19 8 "币种" 50',
'20 9 "金额" 69 2 8 1 16',
......
src/views/Business/Trnrel/Inftrnps.vue
......@@ -549,7 +549,8 @@ export default {
'17 3 "摘要信息" 300',
'12 4 "币种" 50',
'13 5 "金额" 100',
'14 6 "创建时间" 170',
// '14 6 "创建时间" 170',
{index:14,position:6,width:140,pattern:'timeFormat',label:'创建时间'},
'9 7 "签名要求" 70',
'2 8 "签名状态" 70',
'16 9 "经办柜员" 70',
......
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
......@@ -496,7 +496,8 @@ export default {
'17 3 "摘要信息" 300',
'12 4 "币种" 70',
'13 5 "金额" 100',
'14 6 "创建时间" 170',
// '14 6 "创建时间" 170',
{index:14,position:6,width:140,pattern:'timeFormat',label:'创建时间'},
'9 7 "签名要求" 80',
'2 8 "签名状态" 80',
'16 9 "经办柜员" 80',
......
src/views/Layout/index.vue
......@@ -14,11 +14,7 @@
<el-main class="m-app-main">
<tagViews></tagViews>
<div style="height: 2px"></div>
<keep-alive>
<component v-bind:is="activeComponentName"></component>
</keep-alive>
<!-- <business v-if="activeComponentName === 'Business'"></business>
<review v-if="activeComponentName === 'Review'"></review> -->
<business></business>
<toolbars></toolbars>
</el-main>
</el-container>
......@@ -30,17 +26,11 @@ import headerCom from "./Header";
import sideMenu from "./SideMenu";
import tagViews from "./components/TagsView";
import business from "../Business";
import review from "../Review";
import toolbars from "~/components/Toolbars";
export default {
name: "Layout",
components: { headerCom, sideMenu, tagViews, business, review, toolbars },
computed: {
activeComponentName() {
return this.$route.path.startsWith("/review") ? "review" : "business"
}
}
components: { headerCom, sideMenu, tagViews, business, toolbars },
};
</script>
......
src/views/Public/Ccvpan.vue
......@@ -191,21 +191,7 @@
Add
</c-button>
<!-- </c-col> -->
<el-dialog
:visible.sync="dialogTableVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column prop="op" label="OP" width="100">
<template slot-scope="scope">
<a href="javascript:void(0)" @click="pickDepItem(scope.$index,scope.row)"
>选择</a
>
</template>
</el-table-column>
</c-istream-table>
</el-dialog>
<!-- <c-col :span="2">
<c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
......@@ -215,7 +201,31 @@
<!-- </c-row> -->
</c-col>
<!-- <c-col :span="24"><div style="height: 10px"></div></c-col> -->
<template>
<el-dialog
:visible.sync="dialogTableVisible"
width="60%"
center
>
<c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false">
<el-table-column prop="op" label="OP" width="80" fixed="right">
<template slot-scope="scope">
<!-- <a href="javascript:void(0)" type="primary" @click="pickDepItem(scope.$index,scope.row)"
>选择</a
> -->
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="pickDepItem(scope.$index,scope.row)"
>
选择
</c-button>
</template>
</el-table-column>
</c-istream-table>
</el-dialog>
</template>
<c-col :span="23" style="margin-left: 9px;">
<c-table
:border="true"
......@@ -321,7 +331,7 @@
import Api from "~/service/Api";
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Ditopn/Event";
import Utils from "~/utils/index"
export default {
inject: ["root"],
......@@ -332,15 +342,15 @@ export default {
dialogTableVisible: false,
stmData: {
columns: [
'1 1:1 "Ref" 120',
'1 1:1 "Ref" 150',
'2 2:1 "User" 80',
'3 3:1 "Applicant" 196',
'4 4:1 "Account" 120',
'5 5:1 "Cur" 50',
'6 6:1 "Amt" 80 2 0 1 18.3',
'3 3:1 "Applicant" 100',
'4 4:1 "Account" 200',
'5 5:1 "Cur" 200',
'6 6:1 "Amt" 100 2 0 1 18.3',
'7 7:1 "Open date" 80 4 7',
'8 8:1 "flg" 40',
'9 9:1 "Remarks" 180',
'8 8:1 "flg" 150',
'9 9:1 "Remarks" 250',
"P COLORED TRUE",
"P VERTLINES TRUE",
"P HORZLINES TRUE",
......@@ -352,7 +362,50 @@ export default {
relrowDisabled: true,
};
},
methods: { ...Event },
methods: {
async onLiaccvAdd() {
let rtnmsg = await this.executeRule("liaall.liaccv.add")
//const that = this.root;
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
if(typeof(rtnmsg.data.vals) != "undefined"){
this.stmData.data = rtnmsg.data.vals.rows;
}else{
this.stmData.data = [];
}
this.dialogTableVisible = true;
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
async pickDepItem(idx,row) {
var params = {selDst:"",selIds:[idx+1]}
let rtnmsg = await this.executeRule("liaall.liaccv.add", params)
if (rtnmsg.respCode == SUCCESS) {
this.dialogTableVisible = false;
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async onLiaccvDel(index,row) {
let ids = [index+1];
let params = {selDst:"liaall.liaccv.liaccvg",selIds:ids};
let rtnmsg = await this.executeRule("liaall.liaccv.del",params)
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.$message({
type: 'success',
message: '删除成功！'
});
//this.model.liaall.liaccv.liaccvg = [];
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
},
created: function () {},
};
</script>
......
src/views/Review/index.vue → src/views/Review/Business/ReviewBdtset.vue
<template>
<ReviewWrapper>
<businessContainer ref="business"></businessContainer>
<Bdtset></Bdtset>
</ReviewWrapper>
</template>
<script>
import businessContainer from "../Business";
import { ReviewWrapper } from "../../components/gj-common.min.js";
import Bdtset from "~/views/Business/Bdtset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "Review",
components: { ReviewWrapper, businessContainer },
name: "ReviewBdtset",
components: { ReviewWrapper, Bdtset },
created() {},
mounted() {},
};
......
src/views/Review/Business/ReviewDitdck.vue 0 → 100644
<template>
<ReviewWrapper>
<Ditdck></Ditdck>
</ReviewWrapper>
</template>
<script>
import Ditdck from "~/views/Business/Ditdck";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewDitdck",
components: { ReviewWrapper, Ditdck },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/Business/ReviewDitopn.vue 0 → 100644
<template>
<ReviewWrapper>
<Ditopn></Ditopn>
</ReviewWrapper>
</template>
<script>
import Ditopn from "~/views/Business/Ditopn";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewDitopn",
components: { ReviewWrapper, Ditopn },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js 0 → 100644
import ReviewDitopn from "./Business/ReviewDitopn.vue";
import ReviewDitdck from "./Business/ReviewDitdck.vue";
import ReviewBdtset from "./Business/ReviewBdtset.vue";
const ReviewRouter = [
{ path: "ditopn", component: ReviewDitopn, name: "ReviewDitopn", meta: { title: "复核-买方信用证开立" } },
{ path: "ditdck", component: ReviewDitdck, name: "ReviewDitdck", meta: { title: "复核-买方信用证到单" } },
{ path: "bdtset", component: ReviewBdtset, name: "ReviewBdtset", meta: { title: "复核-买方信用证付款" } },
];
export default ReviewRouter;
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