Skip to content

V
vue-gjjs
Commit ec0a74ca by 潘际乾
Options

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

parents 39bf3bf6 e6087afc
Showing with 97 additions and 60 deletions
src/components/IntellectIcon.vue
......@@ -49,10 +49,12 @@
</el-card>
</el-col>
<el-col :span="2" :offset="1">
<el-card :body-style="{ padding: '5px' }">
<!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> -->
<!-- <span style="text-align:center;font-size:5px">添加</span> -->
<el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button>
<el-card :body-style="{ padding: '0px' }" style="height:100%">
<div style="padding: 5px;">
<!-- <img :src="require('~/assets/add.png')" class="image" @click="AddIcon"> -->
<!-- <span style="text-align:center;font-size:5px">添加</span> -->
<el-button type="text" class="button" icon="el-icon-plus" @click="AddIcon"></el-button>
</div>
</el-card>
</el-col>
</el-row>
......@@ -159,4 +161,9 @@ export default {
</script>
<style>
.icon_card{
display: flex;
justify-content: center;
align-items: center;
}
</style>
\ No newline at end of file
src/views/Business/Bftsnd/Rgfp.vue
......@@ -460,7 +460,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onBFDSeainf"
......
src/views/Business/Cptadv/CptAdvChangePanel.vue
......@@ -36,7 +36,7 @@
<!-- <c-col :span="12"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -110,7 +110,7 @@
<c-col :span="6" style="text-align: right"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -164,7 +164,7 @@
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -313,7 +313,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -365,7 +365,7 @@
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -432,7 +432,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -480,7 +480,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -556,7 +556,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
src/views/Business/Cptadv/Opnp1.vue
......@@ -20,7 +20,7 @@
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
@click="onSeainf">
......
src/views/Business/Cptopn/CptOpnp1Common.vue
......@@ -34,7 +34,7 @@
<!-- <c-col :span="12"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -108,7 +108,7 @@
<c-col :span="6" style="text-align: right"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -213,7 +213,7 @@
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -362,7 +362,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -414,7 +414,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -484,7 +484,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -531,7 +531,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -610,7 +610,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
src/views/Business/Cptopn/Opnp1.vue
......@@ -25,7 +25,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Cptopn/Payment103.vue
......@@ -16,7 +16,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......@@ -68,7 +68,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......@@ -120,7 +120,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......@@ -181,7 +181,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......@@ -249,7 +249,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......@@ -321,7 +321,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Ditdck/Docpre.vue
......@@ -149,8 +149,9 @@
{{scope.row.cmail1}}
</div>
<div v-else>
<div v-for="(item, idx) in scope.row.list" :key="idx" >
<c-col :span="6" :offset="1" >
<c-col :span="20">
<div v-for="(item, idx) in scope.row.list" :key="idx" >
<c-col :span="6" :offset="2" >
<div style="border:1px solid #eaeaea;padding:8px 8px 8px 15px;margin:5px;background:#f5ffff;height:75px">
<div style="height:20px">
<span>{{item.discribe}}</span>
......@@ -164,11 +165,12 @@
</div>
</c-col>
</div>
<c-col :span="6" :offset="1" >
<c-col :span="6" :offset="2" >
<div class="addCss" style="border:1px dashed;padding:8px;margin:5px;height:75px;display: flex;justify-content: center;align-items: center;">
<el-button type="text" class="button" icon="el-icon-plus" @click="InsertErrorDialog(scope.$index)" style="text-align:center"></el-button><br>
</div>
</c-col>
</c-col>
</div>
</template>
</el-table-column>
......@@ -529,6 +531,28 @@ export default {
.addCss {
}
/* 如果要增加竖线上方加上.el-table td */
/* 鼠标滑过td上作用的样式，ie6不支持:hover伪类属性，如果是ie6要写成tr.over样式 */
/* 如果td没有颜色，可以去掉，这里加上保险 */
/* .el-table{
background-color: transparent;
color:white;
}
.el-table th, .el-table tr{
border: 0;
background-color: transparent;
}
.el-table tbody tr:hover>td {
background-color:transparent!important;
}
.el-table__body tr.hover-row>td {
background-color: transparent;
} */
/* .el-table tbody tr:hover>td {
background-color:#ffffff!important
} */
.file-add {
margin-top: 16px;
text-align: center;
......
src/views/Business/Ditopn/Ovwp.vue
......@@ -18,7 +18,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0px 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Ditopn/Tk.vue
......@@ -116,7 +116,7 @@ export default {
IconList:[
"invoice","receipt",
],
spanVal:5,
spanVal:6,
}
},
methods:{
......
src/views/Business/Infcpd/Infconp.vue
......@@ -33,7 +33,7 @@
size="small"
type="primary"
icon="el-icon-search"
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
></c-button>
<c-button
size="small"
......@@ -419,7 +419,7 @@
<c-input v-model="model.cpdgrp.orc.pts.extkey"></c-input>
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Infdid/Ovwp.vue
......@@ -18,7 +18,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0px 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Infdid/Ptap.vue
......@@ -31,7 +31,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
src/views/Business/Infpty/Ptyp0.vue
......@@ -33,7 +33,7 @@
<template slot="footer">
<c-button
style="margin: 0px 10px 0 10; padding: 0 12px"
style="margin: 0px 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
......
src/views/Business/Mgrtsk/Tskmgr.vue
......@@ -175,7 +175,7 @@
<c-button
size="small"
type="primary"
style="margin-left: 0"
style="margin-left: 10px"
:disabled="buttonFlag"
@click="Update"
>Update</c-button
......@@ -183,7 +183,7 @@
<c-button
size="small"
type="primary"
style="margin-left: 0"
style="margin-left: 10px"
:disabled="buttonFlag"
@click="Start"
>Start</c-button
......@@ -191,7 +191,7 @@
<c-button
size="small"
type="primary"
style="margin-left: 0"
style="margin-left: 10px"
:disabled="!buttonFlag"
@click="Stop"
>Stop</c-button
......@@ -361,13 +361,13 @@ export default {
},
methods: {
...Event,
Entry(idx, row) {
async Entry(idx, row) {
const selIds = [idx + 1];
const selDst = "wfetsk.wfestm"; //列表对应后台模型中的stream
let params = { selDst, selIds };
this.executeRule("wfetsk.tsklist.butexe", params).then((res) => {
await this.executeRule("wfetsk.tsklist.butexe", params).then((res) => {
if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data);
this.Update();
} else {
const h = this.$createElement;
const msg = res.respMsg || "请求执行失败!";
......@@ -382,34 +382,39 @@ export default {
}
});
},
Update() {
let rtnmsg = this.executeRule("wfetsk.tsklist.butupd");
async Update() {
let rtnmsg = await this.executeRule("wfetsk.tsklist.butupd");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
// Utils.copyValueFromVO(this.model, rtnmsg.data);
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
}
},
Start() {
async Start() {
this.buttonFlag = true;
let rtnmsg = this.executeRule("wfetsk.tsklist.butstr");
let rtnmsg = await this.executeRule("wfetsk.tsklist.butstr");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
}
//定时任务
var timeVal = this.model.wfetsk.tsklist.redotime * 1000;
var that = this;
this.timer = setInterval(function () {
let rtnmsg = that.executeRule("wfetsk.tsklist.butstr");
this.timer = setInterval(async function () {
let rtnmsg = await that.executeRule("wfetsk.tsklist.butstr");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
that.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
}
}, timeVal);
},
Stop() {
async Stop() {
this.buttonFlag = false;
clearInterval(this.timer);
let rtnmsg = this.executeRule("wfetsk.tsklist.butstp");
let rtnmsg = await this.executeRule("wfetsk.tsklist.butstp");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.stmData.data = rtnmsg.data.wfetsk_wfestm.rows;
}
},
},
......
src/views/Public/CptOpnp1Common.vue
......@@ -34,7 +34,7 @@
<!-- <c-col :span="12"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -108,7 +108,7 @@
<c-col :span="6" style="text-align: right"> -->
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -166,7 +166,7 @@
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -315,7 +315,7 @@
</el-form-item>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
src/views/Public/Limitbody.vue
......@@ -50,7 +50,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0 5px 0 10;padding: 0 12px;"
style="margin:0 5px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
src/views/Public/Ptap.vue
......@@ -29,7 +29,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......@@ -66,7 +66,7 @@
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10;padding: 0 12px;"
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
......
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