diff --git a/src/api/modules/process.js b/src/api/modules/process.js new file mode 100644 index 0000000..1abc4eb --- /dev/null +++ b/src/api/modules/process.js @@ -0,0 +1,9 @@ +import { instance as request } from '@/utils/request' + +export function getUserOrgDept (data) { + return request({ + url: '/api/sys/role/getUserAndOrg', + method: 'get', + params: data + }) +} diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss index 4c07afa..a109f3b 100644 --- a/src/assets/css/process.scss +++ b/src/assets/css/process.scss @@ -28,6 +28,7 @@ border-bottom: 3px solid #409eff; margin-bottom: 20px; } + // 表单的样式 .label-input-form{ padding-right: 80px; @@ -36,9 +37,21 @@ font-size: 15px; color:#555 !important; } - .el-form-item.el-input__inner{ + .el-form-item.el-input__inner,.el-form-item { height: 40px; line-height: 40px; } + .el-select{ + width: 100%; + } + .add-form-item{ + .el-input{ + width: 100%; + } + .el-input__inner{ + height: 40px; + line-height: 40px; + } + } } diff --git a/src/components/ProcessApprovalHistory.vue b/src/components/ProcessApprovalHistory.vue new file mode 100644 index 0000000..6c1f0c3 --- /dev/null +++ b/src/components/ProcessApprovalHistory.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/components/ProcessChooseTree.vue b/src/components/ProcessChooseTree.vue new file mode 100644 index 0000000..9acbeac --- /dev/null +++ b/src/components/ProcessChooseTree.vue @@ -0,0 +1,790 @@ + + + + + + diff --git a/src/components/ProcessFooter.vue b/src/components/ProcessFooter.vue new file mode 100644 index 0000000..4c2301d --- /dev/null +++ b/src/components/ProcessFooter.vue @@ -0,0 +1,420 @@ + + + + + + diff --git a/src/main.js b/src/main.js index fd883a5..225d93e 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,7 @@ import VXETable from 'vxe-table' import 'vxe-table/lib/style.css' // ElementUI import ElementUI from 'element-ui' + import './assets/css/element-variables.scss' // ECharts import 'echarts' diff --git a/src/router/modules/permission.js b/src/router/modules/permission.js index 24a09ae..e3560a3 100644 --- a/src/router/modules/permission.js +++ b/src/router/modules/permission.js @@ -15,7 +15,7 @@ const routes = [ { path: 'step2', name: 'urlIndex', - component: () => import('../../views/permissionApplication/launch'), + component: () => import('../../views/permissionApplication/examine'), meta: { crumb: ['权限申请'] } @@ -23,7 +23,7 @@ const routes = [ { path: 'step3', name: 'urlIndex', - component: () => import('../../views/permissionApplication/launch'), + component: () => import('../../views/permissionApplication/examine'), meta: { crumb: ['权限申请'] } diff --git a/src/utils/Enum/enum.js b/src/utils/Enum/enum.js new file mode 100644 index 0000000..dbea55c --- /dev/null +++ b/src/utils/Enum/enum.js @@ -0,0 +1,8 @@ +// 定义枚举 +import Esenum from './index.js' +// 权限申请 +export const PERMISSION = new Esenum([ + { label: '预览', value: 0 }, + { label: '下载', value: 1 }, + { label: '预览+下载', value: 2 } +]) diff --git a/src/utils/Enum/index.js b/src/utils/Enum/index.js new file mode 100644 index 0000000..e58e16b --- /dev/null +++ b/src/utils/Enum/index.js @@ -0,0 +1,103 @@ +export default class EsEunm { + constructor (obj) { + if (!obj) { + return + } + Object.keys(obj).forEach(key => { + const item = obj[key] + this.addAll(key, item) + }) + return this + } + + /** + * 添加枚举 + * @param key + * @param item + */ + addAll (key, item) { + this[key] = item + } + + /** + * 获取到所有的枚举值列表 + * @return {Array} list集合 + */ + getItemList () { + const optionList = [] + for (const key in this) { + const item = this[key] + const option = {} + Object.assign(option, item) + option.key = key + optionList.push(option) + } + optionList.sort((a, b) => { + const value1 = a.index + const value2 = b.index + return value1 - value2 + }) + return optionList + } + + /** + * 过滤掉不需要的值 + * @params {Array,String} val 需要过滤掉的枚举对象的name值 + * @return {Array} list集合 + */ + getFilterItemList (val = []) { + let filterList = [] + let valueArr = [] // 接受参数的整理 + if (Array.isArray(val)) { + valueArr = val + } else { + valueArr.push(val) + } + const optionList = this.getItemList() // 得到的是list + filterList = optionList.filter(item => { + if (valueArr.includes(item.name)) { + return false + } + return true + }) + return filterList + } + + /** + * 根据name获取到index + * @params {String} name 枚举的name值 + * @return {Number} name对应的index值 + */ + nameOfIndex (uname) { + if (!uname) { + return null + } + let index = '' + const optionList = this.getItemList() + optionList.forEach(item => { + if (uname.toString() === item.name.toString()) { + index = +item.index + } + }) + return index + } + + /** + * 根据index获取到name + * @params {Number} index 枚举的index值 + * @return {String} index对应的name值 + */ + indexOfName (index) { + if (index == undefined) { + return null + } + let uname = '' + const optionList = this.getItemList() + optionList.forEach(item => { + if (item.index !== undefined && item.index !== null && item.index == index) { + uname = item.name + } + }) + return uname + } +} diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index eaf98bc..b7cfe27 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -87,9 +87,14 @@ + + 权限申请 +
- - + + + @@ -208,10 +213,29 @@ export default { } }, dialogPreview: false, // 预览 - content: '' + content: '', + checkIds: [] } }, methods: { + selectAllEvent ({ checked }) { + const records = this.$refs.xTable.getCheckboxRecords() + this.checkIds = records.map(item => { + return item.id + }) + }, + selectChangeEvent ({ checked }) { + const records = this.$refs.xTable.getCheckboxRecords() + this.checkIds = records.map(item => { + return item.id + }) + }, + permissionApp () { + this.$router.push({ + path: '/permission/step1', + query: { id: 'AEHJB8YNJ3', ids: this.checkIds.toString() } + }) + }, init () { this.labelList() this.reportDateList() @@ -354,7 +378,9 @@ export default { color: #262626; } } - + .tag-btn{ + padding: 10px 13px; + } .tag-search { padding-top: 9px; diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue index 017e80a..8035697 100644 --- a/src/views/Report/ReportManager.vue +++ b/src/views/Report/ReportManager.vue @@ -50,8 +50,7 @@
- {{tagsForm}} - + diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 331dadf..1b9695c 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -6,22 +6,23 @@
基础信息 - + + class="label-input-form" size="medium" :rules="applicationFormRule" + :disabled="formControl"> - + - - + + @@ -33,62 +34,124 @@
+
+ 审批历史 + +
指派信息 + :rules="assignFormRules" class="label-input-form" size="medium"> - - + + - - - + + + + + + + + + + + + + -
+