Skip to content

V
vue-gjjs
Commit 7d38ccfa by lsk
Options

Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs 

# Conflicts:
#	src/views/Business/Sptsel/Menu.vue
#	src/views/TaskList/index.vue
parents 70200c7b da11dabd
Showing with 173 additions and 79 deletions
src/components/DatePicker.vue
...@@ -14,7 +14,7 @@ export default { ...@@ -14,7 +14,7 @@ export default {
}, },
valueFormat: { valueFormat: {
type: String, type: String,
default: 'yyyyMMdd' default: 'yyyy-MM-dd'
}, },
format: { format: {
type: String, type: String,
......
src/model/Letopn/Pattern.js
...@@ -19,6 +19,11 @@ export default { ...@@ -19,6 +19,11 @@ export default {
{ max: 40, message: "长度不能超过40" } { max: 40, message: "长度不能超过40" }
], ],
"ledgrp.rec.lcrtyp": [
{ type: "string", required: false, message: "必输项" },
{ max: 40, message: "长度不能超过40" }
],
"ledgrp.ben.pts.ref": [ "ledgrp.ben.pts.ref": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
...@@ -51,14 +56,18 @@ export default { ...@@ -51,14 +56,18 @@ export default {
{ max: 140, message: "长度不能超过140" } { max: 140, message: "长度不能超过140" }
], ],
"ledgrp.cbs.nom1.cur": [
{ required: true, message: "必输项" },
],
"ledgrp.cbs.nom1.amt": [ "ledgrp.cbs.nom1.amt": [
{ required: false, message: "必输项" }, { required: true, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" }, { max: 18, message: "整数位不能超过14位" },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"ledgrp.ben.pts.adrblk": [ "ledgrp.ben.pts.adrblk": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: true, message: "必输项" },
{ max: 140, message: "长度不能超过140" } { max: 140, message: "长度不能超过140" }
], ],
"ledgrp.ben.dbfadrblkcn": [ "ledgrp.ben.dbfadrblkcn": [
...@@ -80,8 +89,6 @@ export default { ...@@ -80,8 +89,6 @@ export default {
], ],
"ledgrp.cbs.max.amt": [ "ledgrp.cbs.max.amt": [
{ required: false, message: "必输项" }, { required: false, message: "必输项" },
{ max: 18, message: "整数位不能超过14位" }, { max: 18, message: "整数位不能超过14位" },
...@@ -96,10 +103,10 @@ export default { ...@@ -96,10 +103,10 @@ export default {
{ max: 16, message: "长度不能超过16" } { max: 16, message: "长度不能超过16" }
], ],
"ledgrp.rec.opndat": [ "ledgrp.rec.opndat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.rec.preadvdt": [ "ledgrp.rec.preadvdt": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.iss.pts.extkey": [ "ledgrp.iss.pts.extkey": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
...@@ -115,10 +122,11 @@ export default { ...@@ -115,10 +122,11 @@ export default {
{ max: 140, message: "长度不能超过140" } { max: 140, message: "长度不能超过140" }
], ],
"ledgrp.rec.shpdat": [ "ledgrp.rec.shpdat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.rec.advdat": [ "ledgrp.rec.advdat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.iss.pts.adrblk": [ "ledgrp.iss.pts.adrblk": [
{ type: "string", required: true, message: "必输项" }, { type: "string", required: true, message: "必输项" },
...@@ -129,7 +137,7 @@ export default { ...@@ -129,7 +137,7 @@ export default {
{ max: 140, message: "长度不能超过140" } { max: 140, message: "长度不能超过140" }
], ],
"ledgrp.rec.expdat": [ "ledgrp.rec.expdat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.iss.adrelc": [ "ledgrp.iss.adrelc": [
{ type: "string", required: true, message: "必输项" }, { type: "string", required: true, message: "必输项" },
...@@ -467,7 +475,7 @@ export default { ...@@ -467,7 +475,7 @@ export default {
], ],
"mtabut.coninf.conexedat": [ "mtabut.coninf.conexedat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"mtabut.coninf.usr.extkey": [ "mtabut.coninf.usr.extkey": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
...@@ -553,7 +561,7 @@ export default { ...@@ -553,7 +561,7 @@ export default {
{ max: 2, message: "长度不能超过2" } { max: 2, message: "长度不能超过2" }
], ],
"ledgrp.rec.revdat": [ "ledgrp.rec.revdat": [
{ type: "date", required: false, message: "输入正确的日期" } { required: false, message: "输入正确的日期" }
], ],
"ledgrp.cbs.max2.amt": [ "ledgrp.cbs.max2.amt": [
......
src/views/Business/Letopn/Ovwp.vue
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择币种" placeholder="请选择币种"
:code="codes.cur" :code="codes.cur"
disabled
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -164,6 +165,7 @@ ...@@ -164,6 +165,7 @@
<c-input-currency <c-input-currency
v-model="model.ledgrp.cbs.max.amt" v-model="model.ledgrp.cbs.max.amt"
placeholder="请输入最大金额" placeholder="请输入最大金额"
disabled
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Letsel/Sel.vue
...@@ -267,8 +267,8 @@ export default { ...@@ -267,8 +267,8 @@ export default {
{ title: "Confirmation an Export L/C", url: "#", disabled: true }, { title: "Confirmation an Export L/C", url: "#", disabled: true },
{ {
title: "Amending Issuing Bank", title: "Amending Issuing Bank",
url: "#", url: "#/business/letame",
disabled: true, disabled: false,
}, },
{ {
title: "Changing Issuing Bank", title: "Changing Issuing Bank",
......
src/views/Business/Letsel/index.vue
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Utils from "~/utils/index";
import Letsel from "~/model/Letsel"; import Letsel from "~/model/Letsel";
import CommonProcess from "~/mixin/CommonProcess"; import CommonProcess from "~/mixin/CommonProcess";
import CommonFuncs from "~/mixin/CommonFuncs"; import CommonFuncs from "~/mixin/CommonFuncs";
......
src/views/Business/Sptsel/Menu.vue
...@@ -277,13 +277,13 @@ ...@@ -277,13 +277,13 @@
</c-col> --> </c-col> -->
<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="140px"> <el-table-column fixed="right" prop="op" label="OP" width="140px">
<template> <template slot-scope="scope">
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="onTake" @click="continueEdit(scope.row)"
> >
处理 处理
</c-button> </c-button>
...@@ -354,17 +354,7 @@ export default { ...@@ -354,17 +354,7 @@ export default {
data() { data() {
return { return {
//sourceModel: [], //sourceModel: [],
sourceData: [ sourceData: [],
{ label: "Incoming", value: "chkinc" },
{ label: "E-Trade", value: "chkdzt" },
// { label: "Break", value: "chkpen" },
{ label: "Correction", value: "chkcor" },
{ label: "Automatic", value: "chkaut" },
{ label: "Reject", value: "chkdel" },
{ label: "网银", value: "chktco" },
{ label: "归档", value: "chkcan" },
{ label: "云平台", value: "chkypt" },
],
initdialog: false, initdialog: false,
transactionStatus: { transactionStatus: {
busiNo: "", busiNo: "",
...@@ -402,6 +392,24 @@ export default { ...@@ -402,6 +392,24 @@ export default {
}, },
}; };
}, },
mounted() {
if(this.root.tag == 'tohandle'){
this.sourceData = [
{ label: "Incoming", value: "chkinc" },
{ label: "E-Trade", value: "chkdzt" },
// { label: "Break", value: "chkpen" },
{ label: "Correction", value: "chkcor" },
{ label: "Automatic", value: "chkaut" },
{ label: "Reject", value: "chkdel" },
{ label: "网银", value: "chktco" },
{ label: "归档", value: "chkcan" },
{ label: "云平台", value: "chkypt" },
]
}else if(this.root.tag == 'draft'){
this.sourceData = [{ label: "Break", value: "chkpen" }]
}
},
computed: { computed: {
chkinc: { chkinc: {
get() { get() {
......
src/views/Business/Sptsel/index.vue
...@@ -32,6 +32,7 @@ export default { ...@@ -32,6 +32,7 @@ export default {
root: this root: this
} }
}, },
props: ["tag"],
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
computed: { computed: {
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
:list="stmData.data" :list="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
> >
<el-table-column fixed="right" prop="display" label="操作" width="220px"> <el-table-column fixed="right" prop="display" label="操作" width="300px">
<template > <template >
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>--> <!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
<!-- <a href="javascript:void(0)" @click="display(scope.$index, scope.row)" <!-- <a href="javascript:void(0)" @click="display(scope.$index, scope.row)"
...@@ -383,6 +383,7 @@ ...@@ -383,6 +383,7 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'tocheck'"
> >
复核 复核
</c-button> </c-button>
...@@ -390,6 +391,7 @@ ...@@ -390,6 +391,7 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'tocheck'"
> >
退回修改 退回修改
</c-button> </c-button>
...@@ -397,9 +399,34 @@ ...@@ -397,9 +399,34 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'tocheck'"
> >
详情 详情
</c-button> </c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'finish'"
>
信息显示
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'finish'"
>
交易快照
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'finish'"
>
冲正
</c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
...@@ -521,6 +548,10 @@ export default { ...@@ -521,6 +548,10 @@ export default {
...Event, ...Event,
}, },
created: function () {}, created: function () {},
mounted() {
console.log(this.root.tag);
},
computed: {}, computed: {},
}; };
</script> </script>
......
src/views/Business/Trnrel/index.vue
<template> <template>
<div class="eContainer"> <div class="eContainer">
<el-form
<el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" :validate-on-rule-change="false" label-width="150px" size="small" > :model="model"
:rules="rules"
ref="modelForm"
tokenKey="modelForm"
:validate-on-rule-change="false"
label-width="150px"
size="small"
>
<!-- <el-tabs ref="elment" type="card" @tab-click="tabClick"> <!-- <el-tabs ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询"> --> <el-tab-pane label="复核夹查询"> -->
<c-content> <c-content>
...@@ -9,79 +16,115 @@ ...@@ -9,79 +16,115 @@
</c-content> </c-content>
<!-- </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";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable";
import Trnrel from "~/Model/Trnrel" import Trnrel from "~/Model/Trnrel";
import CommonProcess from "~/mixin/CommonProcess" import CommonProcess from "~/mixin/CommonProcess";
import Pattern from "~/Model/Trnrel/Pattern" import Pattern from "~/Model/Trnrel/Pattern";
import Default from "~/model/Trnrel/Default"; import Default from "~/model/Trnrel/Default";
import Check from "~/model/Trnrel/Check"; import Check from "~/model/Trnrel/Check";
import Inftrnps from "./Inftrnps" import Inftrnps from "./Inftrnps";
import Trnp0 from "./Trnp0" import Trnp0 from "./Trnp0";
import Trnpwfm from "./Trnpwfm" import Trnpwfm from "./Trnpwfm";
import Trnpevt from "./Trnpevt" import Trnpevt from "./Trnpevt";
import Trnpack from "./Trnpack" import Trnpack from "./Trnpack";
import Trnptro from "./Trnptro" import Trnptro from "./Trnptro";
import Prtgle from "./Prtgle" import Prtgle from "./Prtgle";
import Prtpan from "./Prtpan" import Prtpan from "./Prtpan";
import Prtswtp from "./Prtswtp" 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 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";
import Event from "~/model/Trnrel/Event"; import Event from "~/model/Trnrel/Event";
export default { export default {
name: 'Trnrel', name: "Trnrel",
components:{ components: {
"m-inftrnps" : Inftrnps, "m-inftrnps": Inftrnps,
}, },
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
computed: { computed: {},
},
provide() { provide() {
return { return {
root: this root: this,
} };
}, },
data(){ props: ["tag"],
data() {
return { return {
trnName:"trnrel", trnName: "trnrel",
model: new Trnrel().data, model: new Trnrel().data,
checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { codes: {
relflg:CodeTable.relflg, relflg: [
dflg:CodeTable.dflg, { label: "Correct", value: "C" },
bchtyp:CodeTable.bchtyp, { label: "Entered", value: "E" },
usrsort:CodeTable.usrsort, { label: "External", value: "X" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" },
],
dflg: CodeTable.dflg,
bchtyp: CodeTable.bchtyp,
usrsort: CodeTable.usrsort,
}, },
} };
},
methods:{
}, },
mounted:async function(){ methods: {},
mounted: async function () {
if (this.tag == "tocheck") {
this.codes.relflg = [
{ label: "Correct", value: "C" },
{ label: "Entered", value: "E" },
{ label: "External", value: "X" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" },
];
} else if (this.tag == "finish") {
this.codes.relflg = [
{ label: "Closed", value: "M" },
{ label: "Final", value: "F" },
{ label: "Released", value: "R" },
];
}
console.log("进入trnrel交易"); console.log("进入trnrel交易");
const that = this; const that = this;
that.init(that.model).then(res => { that.init(that.model).then((res) => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data) that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows // that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
}) });
} },
} };
</script> </script>
<style> <style>
</style> </style>
src/views/TaskList/index.vue
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<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> -->
<t-sptsel :isDraftBox="false"/> <t-sptsel tag="tohandle"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel"> <el-tab-pane label="待复核列表" name="trnrel">
<t-trnrel /> <t-trnrel tag="tocheck" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成列表" name="finishedList"> <el-tab-pane label="已完成列表" name="finishedList">
<t-trnrel /> <t-trnrel tag="finish" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待申报列表" name="bopsel"> <el-tab-pane label="待申报列表" name="bopsel">
<t-bopsel /> <t-bopsel />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="草稿箱" name="draftBox"> <el-tab-pane label="草稿箱" name="draftBox">
<t-sptsel :isDraftBox="true"/> <t-sptsel tag="draft"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="expirePrompt"> <el-tab-pane label="到期提示" name="expirePrompt">
<t-diasel/> <t-diasel/>
......
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