Skip to content

V
vue-gjjs
Commit 1d4cfd4a by 潘际乾
Options

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

parents 2eccd764 83caacbf
Showing with 272 additions and 262 deletions
src/assets/css/common.css
...@@ -289,4 +289,9 @@ ...@@ -289,4 +289,9 @@
} }
.el-table--border td.lastColumn{ .el-table--border td.lastColumn{
border-right: 0!important; border-right: 0!important;
}
.el-table__fixed,
.el-table__fixed-right {
height: 100% !important;
bottom:17px;
} }
\ No newline at end of file
src/model/Diasel/Event.js
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
this.executeDefault("dspstm").then(res => { this.executeDefault("dspstm").then(res => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.dspstm.rows; this.stmData.data = res.data.dspstm.rows;
this.$store.commit("setTaskList", {key: "diasel", val: this.stmData.data.length});
}) })
}, },
......
src/model/Sptsel/Event.js
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -150,6 +151,7 @@ export default { ...@@ -150,6 +151,7 @@ export default {
// }) // })
const res = await this.executeDefault("sptstm") const res = await this.executeDefault("sptstm")
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
this.$store.commit("setTaskList", {key: "sptbrk", val: this.stmData.data.length});
// if(res.data.sptstm.rows.length == 0){ // if(res.data.sptstm.rows.length == 0){
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
......
src/model/Trnrel/Event.js
...@@ -391,6 +391,7 @@ export default { ...@@ -391,6 +391,7 @@ export default {
const res = await this.executeRule("searow") const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows; that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm; this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
// if (res.data.trncorco_trnstm.rows.length == 0) { // if (res.data.trncorco_trnstm.rows.length == 0) {
// this.$notify({ // this.$notify({
// title: '成功', // title: '成功',
...@@ -401,6 +402,16 @@ export default { ...@@ -401,6 +402,16 @@ export default {
this.$refs.paramsForm.clearValidate(); this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields) Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
}, },
async trnfndhandleSearch() {
const that = this.root;
const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
},
async handleReset() { async handleReset() {
this.model.bchcon = ""; this.model.bchcon = "";
......
src/store/Status.js
...@@ -26,6 +26,7 @@ const Status = { ...@@ -26,6 +26,7 @@ const Status = {
taskList: { taskList: {
sptsel: 0, sptsel: 0,
trnrel: 0, trnrel: 0,
trnfnd: 0,
bopsel: 0, bopsel: 0,
sptbrk: 0, sptbrk: 0,
diasel: 0, diasel: 0,
......
src/views/Business/Diasel/index.vue
...@@ -18,6 +18,7 @@ import Api from "~/service/Api" ...@@ -18,6 +18,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Diasel from "~/model/Diasel" import Diasel from "~/model/Diasel"
import CommonProcess from "~/mixin/CommonProcess" import CommonProcess from "~/mixin/CommonProcess"
import Utils from "~/utils/index"
import Check from "~/model/Diasel/Check" import Check from "~/model/Diasel/Check"
import Default from "~/model/Diasel/Default" import Default from "~/model/Diasel/Default"
import Pattern from "~/model/Diasel/Pattern" import Pattern from "~/model/Diasel/Pattern"
...@@ -70,7 +71,7 @@ export default { ...@@ -70,7 +71,7 @@ export default {
} }
}); });
let rtnmsg = await this.init({}) /* let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
...@@ -80,7 +81,13 @@ export default { ...@@ -80,7 +81,13 @@ export default {
else else
{ {
this.$notify.error({title: '错误',message: '服务请求失败！'}); this.$notify.error({title: '错误',message: '服务请求失败！'});
} } */
const that = this;
that.init(that.model).then(res => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data)
this.$refs.diaselp.handleSearch();
})
} }
} }
</script> </script>
......
src/views/Business/Infdid/Infsea.vue
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<!-- <el-row> --> <!-- <el-row> -->
<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="200px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left" <c-col :span="11" style="text-align: left"
><span>操作</span></c-col ><span>操作</span></c-col
......
src/views/Business/Sptsel/index.vue
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data) that.model = Utils.copyValueFromVO(that.model, res.data)
// that.$refs.Menu.stmData.columns = res.data.sptstm.rows; // that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
this.$refs.Menu.handleSearch() this.$refs.Menu.handleSearch();
}) })
} }
} }
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<c-page title=""> <c-page title="">
<div class="eContainer"> <div class="eContainer">
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="23"> <!-- <c-col :span="23">
<div style="float:right;margin-bottom:10px"> <div style="float:right;margin-bottom:10px">
<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" @click="exit">退出</el-button> <el-button size="small" @click="exit">返回</el-button>
</div> </div>
</c-col> </c-col> -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender"> <el-form-item label="Drag Drop Sender">
...@@ -26,19 +26,33 @@ ...@@ -26,19 +26,33 @@
style="margin-left:15px" style="margin-left:15px"
> >
<c-content> <c-content>
<c-col :span="13" style="height:24px">
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right">
<el-button size="small">交易快照</el-button>
<el-button size="small">智能提示</el-button>
<c-button size="small" @click="exit">返回</c-button>
</c-col>
<c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------基础信息------------------- --> <!-- -------------------基础信息------------------- -->
<!-- ========================= Left ========================= --> <!-- ========================= Left ========================= -->
<c-col :span="10"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<el-form-item label="Reference"> <el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input> <c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="2" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -53,9 +67,9 @@ ...@@ -53,9 +67,9 @@
<c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input> <c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="2" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -120,18 +134,34 @@ ...@@ -120,18 +134,34 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 10px;"
size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
</c-col> </c-col>
<!-- ========================= Right ========================= --> <!-- ========================= Right ========================= -->
<c-col :span="13"> <c-col :span="12">
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Ident No."> <el-form-item label-width="30%" label="Ident No.">
<c-col :span="22"> <c-col :span="21">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input> <c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="3" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -142,7 +172,7 @@ ...@@ -142,7 +172,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Transaction ID"> <el-form-item label-width="30%" label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled> <el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option <el-option
v-for="item in codes.atptxt" v-for="item in codes.atptxt"
...@@ -156,20 +186,20 @@ ...@@ -156,20 +186,20 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Drop Receiver"> <el-form-item label-width="30%" label="Drop Receiver">
<c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input> <c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Release Status of Transaction"> <el-form-item label-width="30%" label="Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction"> <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Signatures Required/Obtained"> <el-form-item label-width="30%" label="Signatures Required/Obtained">
<c-row> <c-row>
<c-col :span="11"> <c-col :span="11">
<c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input> <c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input>
...@@ -185,27 +215,50 @@ ...@@ -185,27 +215,50 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Completion text"> <el-form-item label-width="30%" label="Completion text">
<c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input> <c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Infoflag">
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<!-- -------------------分割线------------------- --> <!-- -------------------分割线------------------- -->
<c-col :span="23"> <!-- <c-col :span="23">
<div style="border-bottom: 10px solid rgb(232, 232, 232);"> <div style="border-bottom: 10px solid rgb(232, 232, 232);">
</div> </div>
</c-col> </c-col> -->
<!-- <c-col :span="23" style="margin-left:9px;height:25px"> <!-- <c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider> <el-divider></el-divider>
</c-col> --> </c-col> -->
<!-- -------------------document------------------- --> <!-- -------------------document------------------- -->
<c-col :span="23" style="height:14px;margin-top:5px"> <c-col :span="24" style="height:24px">
<el-form-item class="formItemLabel" label="Documents:"> <el-form-item label="面函" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="23" style="height: 10px">
<el-divider></el-divider>
</c-col>
<c-col :span="23"> <c-col :span="23">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> --> <!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-col :span="24"> <c-col :span="24">
...@@ -214,7 +267,7 @@ ...@@ -214,7 +267,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="200px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -239,52 +292,7 @@ ...@@ -239,52 +292,7 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col>
<!-- -------------------Infotext------------------- -->
<c-col :span="23" style="margin-top:10px">
<c-col :span="17">
<c-col :span="22">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button
style="margin:0 10px 0 10px;padding: 0 10px;"
size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
<c-col :span="7">
<c-col :span="24">
<el-form-item label-width="40%">
<!-- <c-input v-model="model.trn.infdsp" style="width:100%" placeholder="请选择Infoflag">
</c-input> -->
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="User ID"> <el-form-item label="User ID">
<c-input v-model="model.recpan.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input> <c-input v-model="model.recpan.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input>
...@@ -297,10 +305,13 @@ ...@@ -297,10 +305,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<c-col :span="23" style="height:14px;"> <c-col :span="24" style="height:24px;margin-top:10px">
<el-form-item class="formItemLabel" label="Signatures:"> <el-form-item label="Signatures" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="23" style="height:10px;">
<el-divider></el-divider>
</c-col>
<c-col :span="23"> <c-col :span="23">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> --> <!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="24"> <c-col :span="24">
...@@ -322,58 +333,24 @@ ...@@ -322,58 +333,24 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="200px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template> </template>
<!-- <template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
>
详情
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onHandle(scope.$index,scope.row)"
>
处理
</c-button>
</template> -->
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23" style="margin-left:9px;height:25px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------workflow------------------- --> <!-- -------------------workflow------------------- -->
<c-col :span="24" style="height:24px;margin-top:10px">
<c-col :span="23"> <el-form-item label="Workflow" class="messageLabel">
<c-col :span="12"> </el-form-item>
<el-form-item label="Object"> </c-col>
<c-col :span="10"> <c-col :span="23" style="height:10px;">
<c-input v-model="model.wfmmod.wfs.objtyp" disabled style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input> <el-divider></el-divider>
</c-col>
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objinr" disabled maxlength="8" placeholder="请输入Object"></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Object Name">
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="23"> <c-col :span="23">
<c-col :span="24"> <c-col :span="24">
...@@ -434,18 +411,18 @@ export default { ...@@ -434,18 +411,18 @@ export default {
model: new Trnrel().data, model: new Trnrel().data,
documentsData: { documentsData: {
columns: [ columns: [
"1 1 \"Type\" 60 1 0:0 1 CORTYP", "1 1 \"Type\" 100 1 0:0 1 CORTYP",
"2 2 \"External Key\" 210", "2 2 \"External Key\" 300",
"3 3 \"Document\" 240", "3 3 \"Document\" 300",
"4 4 \"Show\" 80 5 6:1 0 A", "4 4 \"Show\" 150 5 6:1 0 A",
"5 5 \"GenPDF\" 80 5 6:1 0 B" "5 5 \"GenPDF\" 150 5 6:1 0 B"
], ],
data: [], data: [],
}, },
SignaturesData: { SignaturesData: {
columns: [ columns: [
'1 2:1 "User" 200', '1 2:1 "User" 200',
'2 3:1 "Date / Time" 200', '2 3:1 "Date / Time" 300',
// '3 5:1 "Action" 400', // '3 5:1 "Action" 400',
'4 1:1 "Type" 200' '4 1:1 "Type" 200'
], ],
...@@ -453,14 +430,14 @@ export default { ...@@ -453,14 +430,14 @@ export default {
}, },
stmData: { stmData: {
columns: [ columns: [
'1 1 "ID" 50', '1 1 "ID" 100',
'2 2 "Service" 125 1 0:0 1 SRVTXT', '2 2 "Service" 125',
'3 3 "Status" 80 1 0:0 1 WFE:STA', '3 3 "Status" 100',
'4 4 "Last Update" 102', '4 4 "Last Update" 125',
'5 5 "Retries" 100 1 0:1', '5 5 "Retries" 100',
'6 6 "Text" 500', '6 6 "Text" 300',
'7 7 "Contrary Text" 500', '7 7 "Contrary Text" 300',
'8 8 "Target Time" 200' '8 8 "Target Time" 200'
], ],
data: [], data: [],
}, },
...@@ -504,4 +481,12 @@ export default { ...@@ -504,4 +481,12 @@ export default {
text-align: left; text-align: left;
font-weight:bold; font-weight:bold;
} }
.el-col >>> .el-divider--horizontal {
margin-top: 5px;
}
.messageLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
font-size: 12px;
}
</style> </style>
\ No newline at end of file
src/views/Business/Trnrel/Trnfnd/Inftrnps.vue
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="small" size="small"
@click="handleSearch" @click="trnfndhandleSearch"
>查询</el-button >查询</el-button
> >
</c-col> </c-col>
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="150px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<c-page title=""> <c-page title="">
<div class="eContainer"> <div class="eContainer">
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="23"> <!-- <c-col :span="23">
<div style="float:right;margin-bottom:10px"> <div style="float:right;margin-bottom:10px">
<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" @click="exit">退出</el-button> <el-button size="small" @click="exit">返回</el-button>
</div> </div>
</c-col> </c-col> -->
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender"> <el-form-item label="Drag Drop Sender">
...@@ -26,19 +26,33 @@ ...@@ -26,19 +26,33 @@
style="margin-left:15px" style="margin-left:15px"
> >
<c-content> <c-content>
<c-col :span="13" style="height:24px">
<el-form-item label="基本信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right">
<el-button size="small">交易快照</el-button>
<el-button size="small">智能提示</el-button>
<c-button size="small" @click="exit">返回</c-button>
</c-col>
<c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------基础信息------------------- --> <!-- -------------------基础信息------------------- -->
<!-- ========================= Left ========================= --> <!-- ========================= Left ========================= -->
<c-col :span="10"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<c-col :span="22"> <c-col :span="22">
<el-form-item label="Reference"> <el-form-item label="Reference">
<c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input> <c-input v-model="model.trn.ownref" maxlength="16" disabled placeholder="请输入Reference"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="2" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -53,9 +67,9 @@ ...@@ -53,9 +67,9 @@
<c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input> <c-input v-model="model.recpan.atp.cod" maxlength="6" disabled placeholder="请输入Transaction ID"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="2" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -120,18 +134,34 @@ ...@@ -120,18 +134,34 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 10px;"
size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
</c-col> </c-col>
<!-- ========================= Right ========================= --> <!-- ========================= Right ========================= -->
<c-col :span="13"> <c-col :span="12">
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Ident No."> <el-form-item label-width="30%" label="Ident No.">
<c-col :span="22"> <c-col :span="21">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input> <c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
</c-col> </c-col>
<c-col :span="2"> <c-col :span="3" style="text-align: right">
<c-button <c-button
style="margin:0 10px 0 10px;padding: 0 12px;" style="margin:0 0 0 10px;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
> >
...@@ -142,7 +172,7 @@ ...@@ -142,7 +172,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Transaction ID"> <el-form-item label-width="30%" label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled> <el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option <el-option
v-for="item in codes.atptxt" v-for="item in codes.atptxt"
...@@ -156,20 +186,20 @@ ...@@ -156,20 +186,20 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Drop Receiver"> <el-form-item label-width="30%" label="Drop Receiver">
<c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input> <c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Release Status of Transaction"> <el-form-item label-width="30%" label="Release Status of Transaction">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction"> <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Signatures Required/Obtained"> <el-form-item label-width="30%" label="Signatures Required/Obtained">
<c-row> <c-row>
<c-col :span="11"> <c-col :span="11">
<c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input> <c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input>
...@@ -185,27 +215,50 @@ ...@@ -185,27 +215,50 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label-width="40%" label="Completion text"> <el-form-item label-width="30%" label="Completion text">
<c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input> <c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Infoflag">
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<!-- -------------------分割线------------------- --> <!-- -------------------分割线------------------- -->
<c-col :span="23"> <!-- <c-col :span="23">
<div style="border-bottom: 10px solid rgb(232, 232, 232);"> <div style="border-bottom: 10px solid rgb(232, 232, 232);">
</div> </div>
</c-col> </c-col> -->
<!-- <c-col :span="23" style="margin-left:9px;height:25px"> <!-- <c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider> <el-divider></el-divider>
</c-col> --> </c-col> -->
<!-- -------------------document------------------- --> <!-- -------------------document------------------- -->
<c-col :span="23" style="height:14px;margin-top:5px"> <c-col :span="24" style="height:24px">
<el-form-item class="formItemLabel" label="Documents:"> <el-form-item label="面函" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="23" style="height: 10px">
<el-divider></el-divider>
</c-col>
<c-col :span="23"> <c-col :span="23">
<!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> --> <!-- <c-input v-model="model.recpan.smhstm" placeholder="请输入Documents"></c-input> -->
<c-col :span="24"> <c-col :span="24">
...@@ -214,7 +267,7 @@ ...@@ -214,7 +267,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="200px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
...@@ -239,52 +292,7 @@ ...@@ -239,52 +292,7 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23" style="margin-left:9px;height:25px">
<el-divider></el-divider>
</c-col>
<!-- -------------------Infotext------------------- -->
<c-col :span="23" style="margin-top:10px">
<c-col :span="17">
<c-col :span="22">
<el-form-item label="Infotext">
<c-input type="textarea" v-model="model.trn.inftxt" maxlength="65" :rows="3" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button
style="margin:0 10px 0 10px;padding: 0 10px;"
size="small"
icon="el-icon-search"
type="primary"
></c-button>
</c-col>
</c-col>
<c-col :span="7">
<c-col :span="24">
<el-form-item label-width="40%">
<!-- <c-input v-model="model.trn.infdsp" style="width:100%" placeholder="请选择Infoflag">
</c-input> -->
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="40%" label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="User ID"> <el-form-item label="User ID">
<c-input v-model="model.recpan.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input> <c-input v-model="model.recpan.usr.extkey" maxlength="8" placeholder="请输入User ID"></c-input>
...@@ -297,10 +305,13 @@ ...@@ -297,10 +305,13 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<c-col :span="23" style="height:14px;"> <c-col :span="24" style="height:24px;margin-top:10px">
<el-form-item class="formItemLabel" label="Signatures:"> <el-form-item label="Signatures" class="messageLabel">
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="23" style="height:10px;">
<el-divider></el-divider>
</c-col>
<c-col :span="23"> <c-col :span="23">
<!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> --> <!-- <c-input v-model="model.recpan.trsstm" placeholder="请输入Signatures"></c-input> -->
<c-col :span="24"> <c-col :span="24">
...@@ -322,58 +333,24 @@ ...@@ -322,58 +333,24 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="auto" width="200px"
> >
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align:left"><span>操作</span></c-col> <c-col :span="11" style="text-align:left"><span>操作</span></c-col>
<c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col>
</template> </template>
<!-- <template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onDetail(scope.$index,scope.row)"
>
详情
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="onHandle(scope.$index,scope.row)"
>
处理
</c-button>
</template> -->
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23" style="margin-left:9px;height:25px;margin-bottom:10px">
<el-divider></el-divider>
</c-col>
<!-- -------------------workflow------------------- --> <!-- -------------------workflow------------------- -->
<c-col :span="24" style="height:24px;margin-top:10px">
<c-col :span="23"> <el-form-item label="Workflow" class="messageLabel">
<c-col :span="12"> </el-form-item>
<el-form-item label="Object"> </c-col>
<c-col :span="10"> <c-col :span="23" style="height:10px;">
<c-input v-model="model.wfmmod.wfs.objtyp" disabled style="width:100%" placeholder="请选择Table Used to Store Associated Object"></c-input> <el-divider></el-divider>
</c-col>
<c-col :span="10">
<c-input v-model="model.wfmmod.wfs.objinr" disabled maxlength="8" placeholder="请输入Object"></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Object Name">
<c-input v-model="model.wfmmod.wfs.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="23"> <c-col :span="23">
<c-col :span="24"> <c-col :span="24">
...@@ -434,18 +411,18 @@ export default { ...@@ -434,18 +411,18 @@ export default {
model: new Trnrel().data, model: new Trnrel().data,
documentsData: { documentsData: {
columns: [ columns: [
"1 1 \"Type\" 60 1 0:0 1 CORTYP", "1 1 \"Type\" 100 1 0:0 1 CORTYP",
"2 2 \"External Key\" 210", "2 2 \"External Key\" 300",
"3 3 \"Document\" 240", "3 3 \"Document\" 300",
"4 4 \"Show\" 80 5 6:1 0 A", "4 4 \"Show\" 150 5 6:1 0 A",
"5 5 \"GenPDF\" 80 5 6:1 0 B" "5 5 \"GenPDF\" 150 5 6:1 0 B"
], ],
data: [], data: [],
}, },
SignaturesData: { SignaturesData: {
columns: [ columns: [
'1 2:1 "User" 200', '1 2:1 "User" 200',
'2 3:1 "Date / Time" 200', '2 3:1 "Date / Time" 300',
// '3 5:1 "Action" 400', // '3 5:1 "Action" 400',
'4 1:1 "Type" 200' '4 1:1 "Type" 200'
], ],
...@@ -453,14 +430,14 @@ export default { ...@@ -453,14 +430,14 @@ export default {
}, },
stmData: { stmData: {
columns: [ columns: [
'1 1 "ID" 50', '1 1 "ID" 100',
'2 2 "Service" 125 1 0:0 1 SRVTXT', '2 2 "Service" 125',
'3 3 "Status" 80 1 0:0 1 WFE:STA', '3 3 "Status" 100',
'4 4 "Last Update" 102', '4 4 "Last Update" 125',
'5 5 "Retries" 100 1 0:1', '5 5 "Retries" 100',
'6 6 "Text" 500', '6 6 "Text" 300',
'7 7 "Contrary Text" 500', '7 7 "Contrary Text" 300',
'8 8 "Target Time" 200' '8 8 "Target Time" 200'
], ],
data: [], data: [],
}, },
...@@ -504,4 +481,12 @@ export default { ...@@ -504,4 +481,12 @@ export default {
text-align: left; text-align: left;
font-weight:bold; font-weight:bold;
} }
.el-col >>> .el-divider--horizontal {
margin-top: 5px;
}
.messageLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
font-size: 12px;
}
</style> </style>
\ No newline at end of file
src/views/TaskList/index.vue
...@@ -3,27 +3,33 @@ ...@@ -3,27 +3,33 @@
<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> -->
<c-content :height="160">
<span slot="label"> <span slot="label">
待经办列表 待经办列表
<el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
</span> </span>
<c-content :height="120">
<t-sptsel /> <t-sptsel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel"> <el-tab-pane label="待复核列表" name="trnrel">
<c-content :height="160">
<span slot="label"> <span slot="label">
待复核列表 待复核列表
<el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/> <el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/>
</span> </span>
<c-content :height="120">
<t-trnrel /> <t-trnrel />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成列表" name="trnfnd"> <el-tab-pane label="已完成列表" name="trnfnd">
<span slot="label">
已完成列表
<el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
</span>
<c-content :height="120">
<t-trnfnd /> <t-trnfnd />
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待申报列表" name="bopsel"> <el-tab-pane label="待申报列表" name="bopsel">
<t-bopsel /> <t-bopsel />
...@@ -36,7 +42,11 @@ ...@@ -36,7 +42,11 @@
<t-sptbrk /> <t-sptbrk />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="diasel"> <el-tab-pane label="到期提示" name="diasel">
<c-content :height="160"> <span slot="label">
到期提示
<el-badge v-if="$store.state.Status.taskList.diasel>0" :value="$store.state.Status.taskList.diasel" :max="99"/>
</span>
<c-content :height="120">
<t-diasel/> <t-diasel/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
......
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