master
xy 2 years ago
parent 252f2b2fc1
commit a2f30f670f

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

@ -14,6 +14,18 @@
</div>
</div>
</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>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -257,7 +269,8 @@
props: {
purchaseType: Array,
moneyWay: Array,
purchaseWay: Array
purchaseWay: Array,
departments: Array
},
data() {
var planPass = (rule, value, callback) => {
@ -590,7 +603,8 @@
}
}),
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.plan = this.detail.plan
@ -619,7 +633,8 @@
contract_plan_links: this.detail.plan.map(item => {
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 => {
this.isShowEditor = false
Message({

@ -256,6 +256,18 @@
</div>
</div>
</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>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -467,7 +479,7 @@
</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>
<!-- 查看-->
@ -985,6 +997,20 @@ export default {
formatter: (cell, data, value) => {
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: [],
is_substitute: 0,
gov_plane_id: '',
contract_carry_department: [],
},
plan: [],
rules: {
@ -1724,7 +1751,8 @@ export default {
supply:this.form.supply,
money:this.form?.money,
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 => {
this.isShowAdd = false
Message({

@ -158,7 +158,7 @@
customFn: (row) => {
return (<div>
<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>
)
}

Loading…
Cancel
Save