Commit a5d7560e by liushikai

调整

parent 19b1cd77
...@@ -54,6 +54,7 @@ export default { ...@@ -54,6 +54,7 @@ export default {
} }
}, },
async onDetails() { async onDetails() {
this.detailDialog=true;
let rtnmsg = await this.executeRule("details") let rtnmsg = await this.executeRule("details")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
......
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
:list="stmData.data" :list="stmData.data"
:columns="saveColumnFlg ? stmData.columns : saveColumns" :columns="saveColumnFlg ? stmData.columns : saveColumns"
> >
<el-table-column fixed="right" prop="op" label="操作" width="200px"> <el-table-column fixed="right" prop="op" label="操作" width="165px">
<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
...@@ -314,15 +314,19 @@ ...@@ -314,15 +314,19 @@
>详情 >详情
</c-button> </c-button>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0;padding:0 12px"
size="small" size="small"
type="primary" type="primary"
@click="continueEdit(scope.row)" @click="continueEdit(scope.row)"
>TAKE >TAKE
</c-button> </c-button>
<a href="javascript:void(0)" style="color:#1561E0;text-decoration:none;" <el-popover placement="left" width="100" trigger="click">
>>>></a <c-button type="primary" size="small">指派</c-button>
> <c-button type="primary" size="small">删除</c-button>
<!-- <el-button slot="reference" type="text">>>></el-button> -->
<a slot="reference" href="javascript:void(0)" style="text-decoration: none; color: #1561e0;font-family: '宋体';font-weight: bold;font-size: 14px;">>>></a
>
</el-popover>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
...@@ -330,23 +334,27 @@ ...@@ -330,23 +334,27 @@
</el-row> </el-row>
<el-dialog <el-dialog
class="showColumnDialog" class="showColumnDialog"
:visible.sync="setColumnFlg" :visible.sync="setColumnFlg"
:title="'自定义列属性'" :title="'自定义列属性'"
appenD-to-body appenD-to-body
> >
<el-form-item label-width="0"> <el-form-item label-width="0">
<el-checkbox-group v-model="columnGroup" @change="handleColumnChange"> <el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
<el-checkbox <el-checkbox
v-for="item in setColumn" v-for="item in setColumn"
:key="item.label" :key="item.label"
:label="item.index" :label="item.index"
>{{ item.label }}</el-checkbox >{{ item.label }}</el-checkbox
> >
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<span slot="footer"> <span slot="footer">
<el-checkbox class="cbClass" :indeterminate="isIndeterminate" v-model="selectAll" @change="setAll" <el-checkbox
class="cbClass"
:indeterminate="isIndeterminate"
v-model="selectAll"
@change="setAll"
>全选</el-checkbox >全选</el-checkbox
> >
<el-button type="primary" @click="saveColumnEvent">保存</el-button> <el-button type="primary" @click="saveColumnEvent">保存</el-button>
...@@ -392,6 +400,22 @@ ...@@ -392,6 +400,22 @@
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"></div> <div class="m-list-btns"></div>
</el-dialog> </el-dialog>
<el-dialog
class="detailDialogClass"
:visible.sync="detailDialog"
:title="'详情面板'"
appenD-to-body
show-close
>
<m-sptpopup :model="model" :codes="codes"></m-sptpopup>
<span slot="footer">
<c-col :span="23" style="margin-top: 5px">
<el-button type="primary" @click="detailDialog = false"
>关闭</el-button
>
</c-col>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -399,10 +423,14 @@ import Api from "~/service/Api"; ...@@ -399,10 +423,14 @@ import Api from "~/service/Api";
import CommonProcess from "~/mixin/CommonProcess"; import CommonProcess from "~/mixin/CommonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Sptsel/Event"; import Event from "~/model/Sptsel/Event";
import Sptpopup from "./Sptpopup.vue";
export default { export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
components: {
"m-sptpopup": Sptpopup,
},
mixins: [CommonProcess], mixins: [CommonProcess],
data() { data() {
...@@ -411,6 +439,7 @@ export default { ...@@ -411,6 +439,7 @@ export default {
sourceModel: [], sourceModel: [],
sourceData: [], sourceData: [],
initdialog: false, initdialog: false,
detailDialog: false,
setColumnFlg: false, setColumnFlg: false,
saveColumnFlg: true, saveColumnFlg: true,
selectAll: true, selectAll: true,
...@@ -484,26 +513,36 @@ export default { ...@@ -484,26 +513,36 @@ export default {
saveColumnEvent() { saveColumnEvent() {
this.setColumnFlg = false; this.setColumnFlg = false;
this.saveColumnFlg = false; this.saveColumnFlg = false;
this.saveColumns = this.setColumn.filter(item=>item.value).map(item=>this.stmData.columns[item.index]); this.saveColumns = this.setColumn
.filter((item) => item.value)
.map((item) => this.stmData.columns[item.index]);
}, },
setAll(val) { setAll(val) {
this.columnGroup = val ? this.setColumn.map((item)=>{return item.index}) : []; this.columnGroup = val
? this.setColumn.map((item) => {
return item.index;
})
: [];
this.isIndeterminate = false; this.isIndeterminate = false;
}, },
handleColumnChange() { handleColumnChange() {
this.selectAll = this.setColumn.length===this.columnGroup.length; this.selectAll = this.setColumn.length === this.columnGroup.length;
this.isIndeterminate = this.columnGroup.length>0 && this.columnGroup.length<this.setColumn.length; this.isIndeterminate =
this.columnGroup.length > 0 &&
this.columnGroup.length < this.setColumn.length;
}, },
...Event, ...Event,
}, },
created: function () { created: function () {
this.setColumn = this.stmData.columns.map((item,index)=>{ this.setColumn = this.stmData.columns.map((item, index) => {
let begIdx = item.indexOf('"') let begIdx = item.indexOf('"');
let endIdx = item.indexOf('"',begIdx+1) let endIdx = item.indexOf('"', begIdx + 1);
let label = item.substring(begIdx+1,endIdx) let label = item.substring(begIdx + 1, endIdx);
return {label,value:true,index} return { label, value: true, index };
}) });
this.columnGroup = this.setColumn.map((item)=>{return item.index}) this.columnGroup = this.setColumn.map((item) => {
return item.index;
});
}, },
}; };
</script> </script>
...@@ -517,10 +556,13 @@ export default { ...@@ -517,10 +556,13 @@ export default {
font-size: 13px; font-size: 13px;
padding-left: 5px; padding-left: 5px;
} }
.showColumnDialog >>> .el-dialog__body{ .showColumnDialog >>> .el-dialog__body {
padding-bottom: 10px; padding-bottom: 10px;
} }
.showColumnDialog >>> .el-dialog__footer{ .showColumnDialog >>> .el-dialog__footer {
padding: 0 20px 10px 20px; padding: 0 20px 10px 20px;
} }
.detailDialogClass >>> .el-dialog {
height: 400px;
}
</style> </style>
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Type" prop="spt.sta"> <el-form-item label="Type" prop="spt.sta" style="width:100%">
<c-select v-model="model.spt.sta" style="width:100%" placeholder="请选择Type"> <c-select v-model="model.spt.sta" style="width:100%" placeholder="请选择Type">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="10">
<el-form-item label="Hold Flag" prop="spt.hldflg"> <el-form-item label="Status" prop="spt.hldflg" style="width:100%">
<c-select v-model="model.spt.hldflg" style="width:100%" placeholder="请选择Hold Flag"> <c-select v-model="model.spt.hldflg" style="width:100%" placeholder="请选择Hold Flag">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Reference" prop="spt.objnam"> <el-form-item label="Reference" prop="spt.objnam" style="width:100%">
<c-input v-model="model.spt.objnam" maxlength="40" placeholder="请输入Reference"></c-input> <c-input v-model="model.spt.objnam" maxlength="40" style="width:100%" placeholder="请输入Reference"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="10">
<el-form-item label="Internal Unique ID of Pending Transaction" prop="spt.inr"> <el-form-item label="Ident No" prop="spt.inr" style="width:100%">
<c-input v-model="model.spt.inr" maxlength="8" placeholder="请输入Internal Unique ID of Pending Transaction"></c-input> <c-input v-model="model.spt.inr" maxlength="8" style="width:100%" placeholder="请输入Internal Unique ID of Pending Transaction"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="23">
<el-form-item label="Name" prop="spt.txt"> <el-form-item label="Name" prop="spt.txt" style="width:100%">
<c-input v-model="model.spt.txt" maxlength="40" placeholder="请输入Name"></c-input> <c-input v-model="model.spt.txt" maxlength="40" style="width:100%" placeholder="请输入Name"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="23">
<el-form-item label="Transaction " prop="spt.frm"> <el-form-item label="Transaction " prop="spt.frm">
<c-input v-model="model.spt.frm" maxlength="6" placeholder="请输入Transaction "></c-input> <c-col :span="8">
<c-input v-model="model.spt.frm" maxlength="6" style="width:95%" placeholder="请输入Transaction "></c-input>
</c-col>
<c-col :span="16">
<c-input v-model="model.spt.frm" maxlength="16" placeholder="请输入Transaction "></c-input>
</c-col>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Responsible User " prop="spt.ownusr"> <el-form-item label="Responsible User " prop="spt.ownusr">
<c-input v-model="model.spt.ownusr" maxlength="8" placeholder="请输入Responsible User "></c-input> <c-input v-model="model.spt.ownusr" maxlength="8" placeholder="请输入Responsible User "></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="10">
<el-form-item label="Responsible Group" prop="spt.ownusg"> <el-form-item label="Responsible Group" prop="spt.ownusg">
<c-select v-model="model.spt.ownusg" style="width:100%" placeholder="请选择Responsible Group"> <c-select v-model="model.spt.ownusg" style="width:100%" placeholder="请选择Responsible Group">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="17">
<el-form-item label="Infotext" prop="spt.inftxt"> <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> <c-input type="textarea" v-model="model.spt.inftxt" maxlength="65" style="width:100%" show-word-limit placeholder="请输入Infotext" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="6">
<el-form-item label="Infotext" prop="spt.infdsp"> <el-form-item label="" prop="spt.infdsp" label-width="20px">
<c-select v-model="model.spt.infdsp" style="width:100%" placeholder="请选择Infotext"> <c-select v-model="model.spt.infdsp" style="width:100%;padding-left:0px" placeholder="请选择Infotext">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="10">
<el-form-item label="Entered by" prop="spt.usr"> <el-form-item label="Entered by" prop="spt.usr">
<c-input v-model="model.spt.usr" maxlength="8" placeholder="请输入Entered by"></c-input> <c-input v-model="model.spt.usr" maxlength="8" placeholder="请输入Entered by"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="7">
<el-form-item label="Time of Creation" prop="spt.dattim"> <el-form-item label="at" prop="spt.dattim" label-width="50px">
<c-input v-model="model.spt.dattim" placeholder="请输入Time of Creation"></c-input> <c-input v-model="model.spt.dattim" placeholder="请输入Time of Creation"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="6">
<el-form-item label="Creating Transaction ID" prop="spt.cretrn"> <el-form-item label="in TRN" prop="spt.cretrn" label-width="70px">
<c-input v-model="model.spt.cretrn" maxlength="6" placeholder="请输入Creating Transaction ID"></c-input> <c-input v-model="model.spt.cretrn" maxlength="6" placeholder="请输入Creating Transaction ID"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onSptpButord"> <c-button size="small" type="primary" @click="onSptpButord">
Order Order
</c-button> </c-button>
</c-col> </c-col> -->
<c-col :span="12"> <!-- <c-col :span="13">
<el-form-item label="Target for Completion" prop="spt.tardattim"> <el-form-item label="Target for Completion" prop="spt.tardattim">
<c-input v-model="model.spt.tardattim" placeholder="请输入Target for Completion"></c-input> <c-input v-model="model.spt.tardattim" placeholder="请输入Target for Completion"></c-input>
</el-form-item> </el-form-item>
...@@ -123,7 +128,7 @@ ...@@ -123,7 +128,7 @@
<c-button size="small" type="primary" @click="onSptpButcls"> <c-button size="small" type="primary" @click="onSptpButcls">
&Close &Close
</c-button> </c-button>
</c-col> </c-col> -->
</div> </div>
</template> </template>
<script> <script>
......
<template> <template>
<div class="eContainer"> <div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="140px" size="small" :validate-on-rule-change="false">
<!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> --> <!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
<!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> --> <!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
<!-- <c-content> --> <!-- <c-content> -->
......
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