8a70c6ec by 任超

style:待办箱

1 parent 3a5d3667
...@@ -12,7 +12,5 @@ const getters = { ...@@ -12,7 +12,5 @@ const getters = {
12 addDict: state => state.dict.addDict, 12 addDict: state => state.dict.addDict,
13 dictData: state => state.dict.dictData, 13 dictData: state => state.dict.dictData,
14 djbxx: state => state.djbxx.djbxx, 14 djbxx: state => state.djbxx.djbxx,
15 // 流程图转件
16 transfer: state => state.workflow.transfer
17 } 15 }
18 export default getters 16 export default getters
......
...@@ -3,7 +3,7 @@ import Cookies from 'js-cookie' ...@@ -3,7 +3,7 @@ import Cookies from 'js-cookie'
3 const state = { 3 const state = {
4 size: 'small', 4 size: 'small',
5 theme: '#409EFF', 5 theme: '#409EFF',
6 splitScreen: false 6 splitScreen: false,
7 } 7 }
8 8
9 const mutations = { 9 const mutations = {
...@@ -16,7 +16,7 @@ const mutations = { ...@@ -16,7 +16,7 @@ const mutations = {
16 }, 16 },
17 SET_SCREEN (state, val) { 17 SET_SCREEN (state, val) {
18 state.splitScreen = val; 18 state.splitScreen = val;
19 } 19 },
20 } 20 }
21 21
22 const actions = { 22 const actions = {
...@@ -28,7 +28,7 @@ const actions = { ...@@ -28,7 +28,7 @@ const actions = {
28 }, 28 },
29 settScreen ({ commit }, val) { 29 settScreen ({ commit }, val) {
30 commit('SET_SCREEN', val) 30 commit('SET_SCREEN', val)
31 } 31 },
32 } 32 }
33 33
34 export default { 34 export default {
......
1 import { getForm } from "../flowform"; 1 import { getForm } from "../flowform";
2 import { getHomeNoticeList } from "@/api/home.js"
2 export default { 3 export default {
4 data () {
5 return {
6 noticeList: [],
7 }
8 },
9 created () {
10 getHomeNoticeList().then(res => {
11 if (res.result) {
12 this.noticeList = res.result.noticeList
13 }
14 })
15 },
3 methods: { 16 methods: {
4 //右侧表单选项卡事件 17 //右侧表单选项卡事件
5 beforeLeave (activeName, oldActiveName) { 18 beforeLeave (activeName, oldActiveName) {
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
72 @import "./workFrame.scss"; 72 @import "./workFrame.scss";
73 </style> 73 </style>
74 <script> 74 <script>
75 import { mapGetters } from "vuex"
75 import WorkFlow from "./mixin/index" 76 import WorkFlow from "./mixin/index"
76 import publicFlow from "./mixin/public.js" 77 import publicFlow from "./mixin/public.js"
77 import { getStepFormInfo } from "@/api/fqsq.js"; 78 import { getStepFormInfo } from "@/api/fqsq.js";
...@@ -89,7 +90,6 @@ export default { ...@@ -89,7 +90,6 @@ export default {
89 mixins: [WorkFlow, publicFlow], 90 mixins: [WorkFlow, publicFlow],
90 data () { 91 data () {
91 return { 92 return {
92 noticeList: [],
93 isDialog: false, 93 isDialog: false,
94 // 流程图 94 // 流程图
95 // 折叠 95 // 折叠
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
16 <span class="iconName">{{ item.name }}</span> 16 <span class="iconName">{{ item.name }}</span>
17 </li> 17 </li>
18 </ul> 18 </ul>
19 <NoticeBar class="NoticeBar" :noticeList="noticeList" />
19 </div> 20 </div>
20 <!-- 内容框架 --> 21 <!-- 内容框架 -->
21 <div class="containerFrame"> 22 <div class="containerFrame">
...@@ -60,7 +61,6 @@ ...@@ -60,7 +61,6 @@
60 </div> 61 </div>
61 </div> 62 </div>
62 </template> 63 </template>
63
64 <style scoped lang='scss'> 64 <style scoped lang='scss'>
65 @import "~@/styles/mixin.scss"; 65 @import "~@/styles/mixin.scss";
66 @import "./workFrame.scss"; 66 @import "./workFrame.scss";
...@@ -72,9 +72,13 @@ import { ...@@ -72,9 +72,13 @@ import {
72 getStepFormInfo 72 getStepFormInfo
73 } from "@/api/fqsq.js" 73 } from "@/api/fqsq.js"
74 import publicFlow from "./mixin/public.js" 74 import publicFlow from "./mixin/public.js"
75 import NoticeBar from '@/components/NoticeBar/index'
75 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js" 76 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"
76 export default { 77 export default {
77 mixins: [publicFlow], 78 mixins: [publicFlow],
79 components: {
80 NoticeBar
81 },
78 data () { 82 data () {
79 return { 83 return {
80 // 流程图 84 // 流程图
......
...@@ -172,8 +172,8 @@ export default { ...@@ -172,8 +172,8 @@ export default {
172 }) 172 })
173 }, 173 },
174 ywhClick (item) { 174 ywhClick (item) {
175 const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); 175 // const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
176 // const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); 176 const { href } = this.$router.resolve('/workFramecs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
177 window.open(href, '_blank'); 177 window.open(href, '_blank');
178 //从待办箱进入的调取任务领取接口 178 //从待办箱进入的调取任务领取接口
179 claimTask(item.bsmSlsq, item.bestepid) 179 claimTask(item.bsmSlsq, item.bestepid)
......
...@@ -135,8 +135,8 @@ export default { ...@@ -135,8 +135,8 @@ export default {
135 this.queryClick() 135 this.queryClick()
136 }, 136 },
137 ywhClick (item) { 137 ywhClick (item) {
138 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); 138 // const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');
139 // const { href } = this.$router.resolve('/workFrameViewcs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1'); 139 const { href } = this.$router.resolve('/workFrameViewcs?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1');
140 window.open(href, '_blank'); 140 window.open(href, '_blank');
141 } 141 }
142 } 142 }
......