Skip to content

C
confucius
Commit 3de1c799 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 06642b2a 134a296d
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 28 deletions
src/App.vue
View file @ 3de1c799
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_ykxxzo63hxp.css');
@import url('//at.alicdn.com/t/font_2077629_o5nw16ax85q.css');
html,
body,
......
src/components/system/process-form.vue
View file @ 3de1c799
......@@ -119,11 +119,17 @@
.process_InnerLine {
width: 5px;
height: 75px;
height: 11px;
position: absolute;
background-color: #E9EFFF;
}
.process_InnerLineTwo{
width: 5px;
top:65px;
height: 12px;
position: absolute;
background-color: #E9EFFF;
}
.processAddzhai {
height: 50px;
border: 1px dashed #2961FE !important;
......@@ -135,7 +141,13 @@
margin: 0 20px;
border-radius: 5px !important;
}
.ProcessShanchu{
position: absolute;
right:10px;
top:10px;
color:red;
cursor: pointer;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeProcess">
......@@ -177,6 +189,8 @@
只能由一个人开启，一旦开启其他关闭
</div>
</div>
<i class="iconfont icon-shanchu ProcessShanchu" v-if="saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex>0"
@click="DelAduitInfo(aIndex)"></i>
</div>
<div class="process_LineTwo"
v-if="saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0"
......@@ -188,9 +202,10 @@
:dense="false" emit-value map-options>
</q-select>
</div>
<div class="process_InnerLineTwo"></div>
</div>
<a v-if="saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex>0"
@click="DelAduitInfo(index)">删除</a>
<!-- <a v-if="saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex>0"
@click="DelAduitInfo(aIndex)">删除</a> -->
</div>
<div class="processAddzhai" @click="AddAduitInfo">新增审核人</div>
<div class="process_Btn_List">
......@@ -296,7 +311,7 @@
},
//新增审核人
AddAduitInfo() {
this.saveObj.FlowNodeList[NodeIndex].FlowAduitList.push({
this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList.push({
CheckId: 0,
FlowId: 0,
AuditWay: 2,
......@@ -310,7 +325,7 @@
},
//删除审核人
DelAduitInfo(index) {
this.saveObj.FlowNodeList[NodeIndex].FlowAduitList.splice(index, 1);
this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList.splice(index, 1);
},
//关闭流程设置
closeProcess() {
......
src/pages/system/processSet.vue
View file @ 3de1c799
......@@ -3,12 +3,12 @@
width: 350px;
}
.processList {
.processSet .processList {
width: 100%;
height: auto;
}
.processTop {
.processSet .processTop {
width: 100%;
height: 54px;
background-color: #F1F1F1;
......@@ -17,9 +17,10 @@
line-height: 54px;
border-radius: 2px;
cursor: pointer;
position: relative;
}
.processLine {
.processSet .processLine {
width: 100%;
height: 54px;
background-color: #fff;
......@@ -28,18 +29,18 @@
line-height: 54px;
}
.processLine i {
.processSet .processLine i {
font-size: 25px;
font-weight: bold;
}
.otherList {
.processSet .otherList {
background-color: #2961FE !important;
color: #fff;
font-weight: bold;
}
.process_TwoList {
.processSet .process_TwoList {
display: flex;
background-color: #2961FE !important;
color: #fff;
......@@ -48,7 +49,7 @@
justify-content: center;
}
.process_He {
.processSet .process_He {
width: 36px;
height: 36px;
background-color: #3FC4FF;
......@@ -58,13 +59,13 @@
border-radius: 50%;
}
.process_Left {
.processSet .process_Left {
width: 40%;
height: 100%;
text-align: right;
}
.process_center {
.processSet .process_center {
width: 20%;
height: 100%;
display: flex;
......@@ -72,17 +73,17 @@
justify-content: center;
}
.process_Right {
.processSet .process_Right {
width: 40%;
height: 100%;
text-align: left;
}
.process_OR {
.processSet .process_OR {
background-color: #F28C1D;
}
.addProcessBtn {
.processSet .addProcessBtn {
width: 100%;
height: 45px;
text-align: center;
......@@ -93,14 +94,14 @@
cursor: pointer;
}
.process_BtnList {
.processSet .process_BtnList {
margin-top: 30px;
width: 100%;
display: flex;
justify-content: center;
}
.process_BtnOne {
.processSet .process_BtnOne {
width: 90px;
height: 38px;
text-align: center;
......@@ -111,7 +112,38 @@
cursor: pointer;
margin-right: 50px;
}
.processSet .SetShouSun{
display: inline-block;
border-radius: 2px;
background-color: #8175FB;
color:#fff;
position: absolute;
right:10px;
width:60px;
height:27px;
left:0;
top:0;
line-height: 27px;
font-size:13px;
}
.processSet .operationDiv{
position: absolute;
right:0;
top:0;
height:30px;
line-height: 30px;
padding-right:10px;
vertical-align: top;
}
.processSet .operationDiv i:first-child{
font-size:13px;
}
.processSet .operationDiv i:hover{
color:red;
}
.processSet .justTwoClass{
margin-left:8px;
}
</style>
<template>
<div class="page-body">
......@@ -128,12 +160,19 @@
</div>
<template v-for="(item,index) in flowObj.FlowNodeList">
<div class="processList" @click="getItem(index)">
<a @click="DeleteNode(index)">删除</a>
<template v-if="item.FlowAduitList&&item.FlowAduitList.length>0 && item.FlowAduitList[0].IsSpecNode==1">
<span>设定收损</span>
</template>
<!-- <a @click="DeleteNode(index)">删除</a> -->
<template v-if="item.FlowAduitList&&item.FlowAduitList.length==1">
<div class="processTop otherList">{{item.FlowAduitList[0].AduitName}}</div>
<div class="processTop otherList">
{{item.FlowAduitList[0].AduitName}}
<template v-if="item.FlowAduitList&&item.FlowAduitList.length>0 && item.FlowAduitList[0].IsSpecNode==1">
<span class="SetShouSun">设定收损</span>
</template>
<div class="operationDiv">
<i class="iconfont icon-shanchu" style="position:relative;top:-2px;" @click.stop="DeleteNode(index)"></i>
<i style="margin:0 8px;" class="iconfont icon-shangyi2" v-if="index!=0" @click.stop="moveDown(index,0)"></i>
<i class="iconfont icon-xiayi" :class="{'justTwoClass':index==0}" @click.stop="moveDown(index,1)" v-if="index!=flowObj.FlowNodeList.length-1"></i>
</div>
</div>
<div class="processLine" v-if="index!=flowObj.FlowNodeList.length-1">
<i class="iconfont icon-down"></i>
</div>
......@@ -154,6 +193,14 @@
{{subItem.AduitName}}
</template>
</div>
<template v-if="item.FlowAduitList&&item.FlowAduitList.length>0 && item.FlowAduitList[0].IsSpecNode==1">
<span class="SetShouSun">设定收损</span>
</template>
<div class="operationDiv">
<i class="iconfont icon-shanchu" style="position:relative;top:-2px;" @click.stop="DeleteNode(index)"></i>
<i style="margin:0 8px;" class="iconfont icon-shangyi2" v-if="index!=0" @click.stop="moveDown(index,0)"></i>
<i class="iconfont icon-xiayi" :class="{'justTwoClass':index==0}" @click.stop="moveDown(index,1)" v-if="index!=flowObj.FlowNodeList.length-1"></i>
</div>
</div>
<div class="processLine" v-if="index!=flowObj.FlowNodeList.length-1">
<i class="iconfont icon-down"></i>
......@@ -265,6 +312,23 @@
this.refreshPage();
}
})
},
//下移下移
moveDown(index,IsUp){
var currentItem = this.flowObj.FlowNodeList[index];
if (IsUp == 0) {
if (index > 0) {
var upItem = this.flowObj.FlowNodeList[index - 1];
this.$set(this.flowObj.FlowNodeList, index - 1, currentItem);
this.$set(this.flowObj.FlowNodeList, index, upItem);
}
} else {
if (index != this.flowObj.FlowNodeList.length - 1) {
var downItem = this.flowObj.FlowNodeList[index + 1];
this.$set(this.flowObj.FlowNodeList, index + 1, currentItem);
this.$set(this.flowObj.FlowNodeList, index, downItem);
}
}
}
}
}
......
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