Skip to content

V
vue-gjjs
Commit 19b1cd77 by 潘际乾
Options

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

parents 5edb945f 3f0e0c5d
Showing with 303 additions and 16 deletions
src/assets/css/common.css
......@@ -212,6 +212,13 @@
.el-checkbox__label {
font-size: 12px;
}
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #1561E0;
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #1561E0;
border-color: #1561E0;
}
.c-title {
/* color: rgba(0, 0, 0, 0.65); */
/* font-weight: 600; */
......
src/model/Ditdck/Pattern.js
......@@ -17,7 +17,7 @@ export default {
],
"didgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项", trigger: 'blur'},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -30,7 +30,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"didgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项", trigger: 'blur'},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -95,7 +95,7 @@ export default {
"bddgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项", trigger: 'blur'},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -174,12 +174,6 @@ export default {
],
"bddgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bddgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
......
src/model/Sptsel/Event.js
......@@ -145,6 +145,30 @@ export default {
type: 'success'
});
}
}
},
async onSptpButord(){
let rtnmsg = await this.executeRule("sptp.butord")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onSptpButcls(){
let rtnmsg = await this.executeRule("sptp.butcls")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
}
\ No newline at end of file
src/model/Sptsel/Pattern.js
......@@ -47,6 +47,66 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"spt.objnam":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"spt.inr":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"spt.txt":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"spt.frm":[
{type: "string", required: false, message: "必输项"},
{max: 6,message:"长度不能超过6"}
],
"spt.ownusr":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"spt.inftxt":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"spt.usr":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"spt.dattim":[
{type: "string", required: false, message: "必输项"},
{max: 15,message:"长度不能超过15"}
],
"spt.cretrn":[
{type: "string", required: false, message: "必输项"},
{max: 6,message:"长度不能超过6"}
],
"spt.tardattim":[
{type: "string", required: false, message: "必输项"},
{max: 15,message:"长度不能超过15"}
],
"sptp.smh.msgtyp":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"sptp.smh.sndkey":[
{type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"sptp.smh.relcur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"sptp.smh.relamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/model/Sptsel/index.js
......@@ -35,6 +35,31 @@ export default class Sptsel {
chktco: "", // 网银 .chktco
chkcan: "", // 归档 .chkcan
chkdzt: "", // E-Trade .chkdzt
pageId: "", // ctx的key
spt:{
sta:"", // Type .spt.sta
hldflg:"", // Hold Flag .spt.hldflg
objnam:"", // Reference .spt.objnam
inr:"", // Internal Unique ID of Pending Transaction .spt.inr
txt:"", // Name .spt.txt
frm:"", // Transaction .spt.frm
ownusr:"", // Responsible User .spt.ownusr
ownusg:"", // Responsible Group .spt.ownusg
inftxt:"", // Infotext .spt.inftxt
infdsp:"", // Infotext .spt.infdsp
usr:"", // Entered by .spt.usr
dattim:"", // Time of Creation .spt.dattim
cretrn:"", // Creating Transaction ID .spt.cretrn
tardattim:"", // Target for Completion .spt.tardattim
},
sptp:{
smh:{
msgtyp:"", // Message Type .sptp.smh.msgtyp
sndkey:"", // Receiver Key .sptp.smh.sndkey
relcur:"", // Relevant Amount .sptp.smh.relcur
relamt:"", // Relevant Amount Optional .sptp.smh.relamt
},
},
pageId: "" // ctx的key
}
}
......
src/model/Trnrel/Event.js
......@@ -99,6 +99,11 @@ export default {
this.$router.push({ path: viewurl, query: { routeParams: { process: "1", commitFlag: "1" }, trn: row['INR'], idx: idx, operateId: operateId } });
},
async onDetail(idx, row) {
this.Trnp0Visible = true;
},
async onRelrow(idx) {
this.$confirm('您确定复核该笔交易?', '提示', {
confirmButtonText: '确定',
......
src/views/Business/Ditdck/Litdckp.vue
......@@ -735,7 +735,7 @@ export default {
});
},
isShowDocpre(val){
this.$emit("changeShowDocpre", val)
this.$emit("changeShowDocpre", val);
},
},
created: function () {},
......
src/views/Business/Ditdck/index.vue
<template>
<c-page title="到单">
<div class="eContainer">
<c-bus-button :$pntvm="this"></c-bus-button>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
<el-form
:model="model"
:rules="rules"
......@@ -114,7 +120,7 @@ export default {
root: this,
};
},
mixins: [CommonProcess,CommonFuncs], // 里面包含了Default、Check等的公共处理
mixins: [CommonProcess, CommonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
isShowDocpre:false,
......@@ -147,6 +153,9 @@ export default {
this.restoreDisplay()
}
}
if(this.model.bddgrp.rec.dscinsflg == "X"){
this.isShowDocpre = true;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
......
src/views/Business/Sptsel/Menu.vue
......@@ -297,7 +297,7 @@
:list="stmData.data"
:columns="saveColumnFlg ? stmData.columns : saveColumns"
>
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<el-table-column fixed="right" prop="op" label="操作" width="200px">
<template slot="header">
<c-col :span="11" style="text-align: left"
><span>操作</span></c-col
......@@ -318,8 +318,11 @@
size="small"
type="primary"
@click="continueEdit(scope.row)"
>处理
>TAKE
</c-button>
<a href="javascript:void(0)" style="color:#1561E0;text-decoration:none;"
>>>></a
>
</template>
</el-table-column>
</c-istream-table>
......@@ -327,9 +330,10 @@
</el-row>
<el-dialog
class="showColumnDialog"
:visible.sync="setColumnFlg"
:title="'自定义列属性'"
append-to-body
appenD-to-body
>
<el-form-item label-width="0">
<el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
......@@ -513,4 +517,10 @@ export default {
font-size: 13px;
padding-left: 5px;
}
.showColumnDialog >>> .el-dialog__body{
padding-bottom: 10px;
}
.showColumnDialog >>> .el-dialog__footer{
padding: 0 20px 10px 20px;
}
</style>
src/views/Business/Sptsel/Sptpopup.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-col :span="12">
<el-form-item label="Type" prop="spt.sta">
<c-select v-model="model.spt.sta" style="width:100%" placeholder="请选择Type">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Hold Flag" prop="spt.hldflg">
<c-select v-model="model.spt.hldflg" style="width:100%" placeholder="请选择Hold Flag">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Reference" prop="spt.objnam">
<c-input v-model="model.spt.objnam" maxlength="40" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Internal Unique ID of Pending Transaction" prop="spt.inr">
<c-input v-model="model.spt.inr" maxlength="8" placeholder="请输入Internal Unique ID of Pending Transaction"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Name" prop="spt.txt">
<c-input v-model="model.spt.txt" maxlength="40" placeholder="请输入Name"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Transaction " prop="spt.frm">
<c-input v-model="model.spt.frm" maxlength="6" placeholder="请输入Transaction "></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Responsible User " prop="spt.ownusr">
<c-input v-model="model.spt.ownusr" maxlength="8" placeholder="请输入Responsible User "></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Responsible Group" prop="spt.ownusg">
<c-select v-model="model.spt.ownusg" style="width:100%" placeholder="请选择Responsible Group">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Infotext" prop="spt.inftxt">
<c-input type="textarea" v-model="model.spt.inftxt" maxlength="65" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Infotext" prop="spt.infdsp">
<c-select v-model="model.spt.infdsp" style="width:100%" placeholder="请选择Infotext">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Entered by" prop="spt.usr">
<c-input v-model="model.spt.usr" maxlength="8" placeholder="请输入Entered by"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Time of Creation" prop="spt.dattim">
<c-input v-model="model.spt.dattim" placeholder="请输入Time of Creation"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Creating Transaction ID" prop="spt.cretrn">
<c-input v-model="model.spt.cretrn" maxlength="6" placeholder="请输入Creating Transaction ID"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onSptpButord">
Order
</c-button>
</c-col>
<c-col :span="12">
<el-form-item label="Target for Completion" prop="spt.tardattim">
<c-input v-model="model.spt.tardattim" placeholder="请输入Target for Completion"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Message Type " prop="sptp.smh.msgtyp">
<c-input v-model="model.sptp.smh.msgtyp" maxlength="20" placeholder="请输入Message Type "></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Receiver Key " prop="sptp.smh.sndkey">
<c-input v-model="model.sptp.smh.sndkey" maxlength="50" placeholder="请输入Receiver Key "></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Relevant Amount" prop="sptp.smh.relcur">
<c-input v-model="model.sptp.smh.relcur" maxlength="3" placeholder="请输入Relevant Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Relevant Amount Optional" prop="sptp.smh.relamt">
<c-input v-model="model.sptp.smh.relamt" placeholder="请输入Relevant Amount Optional"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onSptpButcls">
&Close
</c-button>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Sptsel/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [CommonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
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