master
xy 2 years ago
parent 252f2b2fc1
commit a2f30f670f

@ -1,92 +1,92 @@
import router from './router' import router from './router'
import store from './store' import store from './store'
import { import {
Message Message
} from 'element-ui' } from 'element-ui'
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
import { import {
getToken getToken
} from '@/utils/auth' // get token from cookie } from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title' import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ NProgress.configure({
showSpinner: false showSpinner: false
}) // NProgress Configuration }) // NProgress Configuration
const whiteList = ['/login'] // no redirect whitelist const whiteList = ['/login'] // no redirect whitelist
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
// start progress bar // start progress bar
NProgress.start() NProgress.start()
// set page title // set page title
document.title = getPageTitle(to.meta.title) document.title = getPageTitle(to.meta.title)
// determine whether the user has logged in // determine whether the user has logged in
const hasToken = getToken() const hasToken = getToken()
if (hasToken) { if (hasToken) {
if (to.path === '/login') { if (to.path === '/login') {
// if is logged in, redirect to the home page // if is logged in, redirect to the home page
console.log(to.fullPath) console.log(to.fullPath)
await store.dispatch('user/resetToken') await store.dispatch('user/resetToken')
next(to.fullPath) next(to.fullPath)
// next({ // next({
// path: '/' // path: '/'
// }) // })
NProgress.done() NProgress.done()
} else { } else {
// determine whether the user has obtained his permission roles through getInfo // determine whether the user has obtained his permission roles through getInfo
const hasRoles = store.getters.roles && store.getters.roles.length > 0 const hasRoles = store.getters.roles && store.getters.roles.length > 0
if (hasRoles) { if (hasRoles) {
next() next()
} else { } else {
try { try {
// get user info // get user info
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
const { const {
roles roles
} = await store.dispatch('user/getInfo') } = await store.dispatch('user/getInfo')
// generate accessible routes map based on roles // generate accessible routes map based on roles
const accessRoutes = await store.dispatch('permission/generateRoutes', roles) const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
// dynamically add accessible routes // dynamically add accessible routes
router.addRoutes(accessRoutes) router.addRoutes(accessRoutes)
// hack method to ensure that addRoutes is complete // hack method to ensure that addRoutes is complete
// set the replace: true, so the navigation will not leave a history record // set the replace: true, so the navigation will not leave a history record
next({ next({
...to, ...to,
replace: true replace: true
}) })
} catch (error) { } catch (error) {
console.log(error) console.log(error)
// remove token and go to login page to re-login // remove token and go to login page to re-login
await store.dispatch('user/resetToken') await store.dispatch('user/resetToken')
Message.error(error || 'Has Error') Message.error(error || 'Has Error')
next(`/login?redirect=${to.path}`) next(`/login?redirect=${to.path}`)
NProgress.done() NProgress.done()
} }
} }
} }
} else { } else {
/* has no token*/ /* has no token*/
if (whiteList.indexOf(to.path) !== -1) { if (whiteList.indexOf(to.path) !== -1) {
// in the free login whitelist, go directly // in the free login whitelist, go directly
next() next()
} else { } else {
// other pages that do not have permission to access are redirected to the login page. // other pages that do not have permission to access are redirected to the login page.
next(`/login?redirect=${to.path}`) next(`/login?redirect=${to.path}`)
NProgress.done() NProgress.done()
} }
} }
}) })
router.afterEach(() => { router.afterEach(() => {
// finish progress bar // finish progress bar
NProgress.done() NProgress.done()
}) })

@ -14,6 +14,18 @@
</div> </div>
</div> </div>
</template> </template>
<template #contract_carry_department>
<div class="xy-table-item">
<div class="xy-table-item-label">
执行科室
</div>
<div class="xy-table-item-content">
<el-select multiple v-model="detail.contract_carry_department" placeholder="请选择责任科室" style="width: 300px;">
<el-option v-for="item in departments" :value="item.id" :label="item.name"></el-option>
</el-select>
</div>
</div>
</template>
<template v-slot:is_simple> <template v-slot:is_simple>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -257,7 +269,8 @@
props: { props: {
purchaseType: Array, purchaseType: Array,
moneyWay: Array, moneyWay: Array,
purchaseWay: Array purchaseWay: Array,
departments: Array
}, },
data() { data() {
var planPass = (rule, value, callback) => { var planPass = (rule, value, callback) => {
@ -590,7 +603,8 @@
} }
}), }),
gov_plane_id: res.gov_plane_id, gov_plane_id: res.gov_plane_id,
gov_plane: res.gov_plane gov_plane: res.gov_plane,
contract_carry_department: res.contract_carry_department.map(i => i.carry_department_id)
} }
this.$refs['govPlane'].selected = res.gov_plane this.$refs['govPlane'].selected = res.gov_plane
this.plan = this.detail.plan this.plan = this.detail.plan
@ -619,7 +633,8 @@
contract_plan_links: this.detail.plan.map(item => { contract_plan_links: this.detail.plan.map(item => {
return item.value return item.value
}), }),
gov_plane_id: this.detail.gov_plane_id gov_plane_id: this.detail.gov_plane_id,
contract_carry_department: this.detail.contract_carry_department.map(i => ({carry_department_id: i}))
}).then(res => { }).then(res => {
this.isShowEditor = false this.isShowEditor = false
Message({ Message({

@ -256,6 +256,18 @@
</div> </div>
</div> </div>
</template> </template>
<template #contract_carry_department>
<div class="xy-table-item">
<div class="xy-table-item-label">
执行科室
</div>
<div class="xy-table-item-content">
<el-select multiple v-model="form.contract_carry_department" placeholder="请选择责任科室" style="width: 300px;">
<el-option v-for="item in departments" :value="item.id" :label="item.name"></el-option>
</el-select>
</div>
</div>
</template>
<template v-slot:is_simple> <template v-slot:is_simple>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -467,7 +479,7 @@
</xy-dialog> </xy-dialog>
<!-- 编辑--> <!-- 编辑-->
<editor ref="editor" :is-show-editor.sync="isShowEditor" :money-way="moneyWay" :purchase-type="purchaseType" <editor ref="editor" :departments="departments" :is-show-editor.sync="isShowEditor" :money-way="moneyWay" :purchase-type="purchaseType"
:purchase-way="purchaseWay" @success="getContracts"></editor> :purchase-way="purchaseWay" @success="getContracts"></editor>
<!-- 查看--> <!-- 查看-->
@ -985,6 +997,20 @@ export default {
formatter: (cell, data, value) => { formatter: (cell, data, value) => {
return parseTime(new Date(value), "{y}-{m}-{d}") return parseTime(new Date(value), "{y}-{m}-{d}")
} }
},
{
label: "执行科室",
minWidth: 200,
prop: "contract_carry_department",
customFn: row => {
return (
<div>
{ row.contract_carry_department.map(i => {
return (<Tag color="primary">{i.carry_department.name}</Tag>)
}) }
</div>
)
}
} }
], ],
// //
@ -1109,6 +1135,7 @@ export default {
plan: [], plan: [],
is_substitute: 0, is_substitute: 0,
gov_plane_id: '', gov_plane_id: '',
contract_carry_department: [],
}, },
plan: [], plan: [],
rules: { rules: {
@ -1724,7 +1751,8 @@ export default {
supply:this.form.supply, supply:this.form.supply,
money:this.form?.money, money:this.form?.money,
status:this.form?.is_simple ? 2 : 1, status:this.form?.is_simple ? 2 : 1,
gov_plane_id: this.form.gov_plane_id gov_plane_id: this.form.gov_plane_id,
contract_carry_department: this.form.contract_carry_department.map(i => ({carry_department_id: i}))
}).then(res => { }).then(res => {
this.isShowAdd = false this.isShowAdd = false
Message({ Message({

@ -158,7 +158,7 @@
customFn: (row) => { customFn: (row) => {
return (<div> return (<div>
<el-progress percentage = { <el-progress percentage = {
(Number(row.update_money) && Number(row.money)) ? Number((Number(row.calculation_result || 0)*100).toFixed(2)) : 100 Number((Number(row.calculation_result || 0)*100).toFixed(2))
} > </el-progress> </div> } > </el-progress> </div>
) )
} }

Loading…
Cancel
Save