Skip to content

R
rbc-demo
Commit bdaa7e57 by 乔延琦
Options

Merge branch 'develop-zhouyi' into 'develop' 

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!78
parents f052bbe7 93df37c4
Showing with 23 additions and 14 deletions
develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
<div> <div>
<div class="workflow-button" :style="{top: styleTop, right: styleRight}" @click="showDrawer = true"> <div class="workflow-button" :style="{top: styleTop, right: styleRight}" @click="showDrawer = true">
<div class="icon"> <div class="icon">
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<use xlink:href="#icon-a-24_BILLEXPAND_C_RBC_shenpiguiji"></use> <use xlink:href="#icon-a-28_BILLEXPAND_C_RBC_xinshenpiguiji"></use>
</svg> </svg>
</div> </div>
<div class="text">审批轨迹</div>
</div> </div>
<Drawer <Drawer
:transfer="false" :transfer="false"
...@@ -244,17 +243,16 @@ export default { ...@@ -244,17 +243,16 @@ export default {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
z-index: 1000; z-index: 1000;
width: 56px; padding-top: 4px;
height: 64px; width: 42px;
padding-top: 10px; height: 36px;
background: #FFA938; background: #005791;
box-shadow: 0px 1px 6px 0px rgba(255, 169, 56, 0.8); box-shadow: 0 0 4px 0 rgba(109,109,109,0.50);
border-radius: 6px; border-radius: 100px 0 0 100px;
opacity: 0.9;
.icon { .icon {
width: 24px; width: 28px;
height: 24px; height: 28px;
margin: 0 auto; margin-left: 11px;
} }
.text { .text {
margin-top: 2px; margin-top: 2px;
......
develop/@gms/gms-plugin-mainpage-workflowcard/src/views/gms-app.vue
...@@ -47,11 +47,22 @@ export default { ...@@ -47,11 +47,22 @@ export default {
val = val.properties || [] val = val.properties || []
this.reimburseList = this.mapProperties(val) this.reimburseList = this.mapProperties(val)
}) })
this.$root.$on('updated', this.refresh)
}, },
unmounted() { beforeUnmount() {
this.$root.$off('updated', this.refresh)
window.GMS.vbus.$off('widgetPluginPropertiesChange') window.GMS.vbus.$off('widgetPluginPropertiesChange')
}, },
methods: { methods: {
refresh(visible) {
if (visible == 'show') {
const list = [...this.reimburseList]
this.reimburseList = []
this.$nextTick(() => {
this.reimburseList = list
})
}
},
addFunction(l = []) { addFunction(l = []) {
for (let o of l) { for (let o of l) {
if (o.type == 'ROUTE') { if (o.type == 'ROUTE') {
......
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