From 61e01291fd77ab7c89108e2d3c0c3b97bd4bcd05 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 17 Apr 2023 10:31:08 +0800 Subject: [PATCH 01/49] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/processCenter.js | 36 +- src/assets/css/process.scss | 44 + src/components/OrgTable.vue | 1123 +++++++++++++++ src/components/ProcessHeader.vue | 62 + src/main.js | 3 + src/router/modules/permission.js | 35 + src/views/Report/ReportManager.vue | 1220 ++++++++--------- .../components/Assign.vue | 211 +++ .../components/AuditOperation.vue | 448 ++++++ .../components/reportTable.vue | 184 +++ src/views/permissionApplication/launch.vue | 97 ++ vue.config.js | 5 +- 12 files changed, 2838 insertions(+), 630 deletions(-) create mode 100644 src/assets/css/process.scss create mode 100644 src/components/OrgTable.vue create mode 100644 src/components/ProcessHeader.vue create mode 100644 src/router/modules/permission.js create mode 100644 src/views/permissionApplication/components/Assign.vue create mode 100644 src/views/permissionApplication/components/AuditOperation.vue create mode 100644 src/views/permissionApplication/components/reportTable.vue create mode 100644 src/views/permissionApplication/launch.vue diff --git a/src/api/modules/processCenter.js b/src/api/modules/processCenter.js index 156c7ec..d002cb5 100644 --- a/src/api/modules/processCenter.js +++ b/src/api/modules/processCenter.js @@ -1,19 +1,19 @@ import { instance as request } from '@/utils/request' -export default{ - //查询 - search(data){ - return request({ - url: '', - method: 'POST', - data - }) - }, - //重置 - reset(data){ - return request({ - url: '', - method: 'POST', - data - }) - } -} \ No newline at end of file +export default { + // 查询 + search (data) { + return request({ + url: '', + method: 'POST', + data + }) + }, + // 重置 + reset (data) { + return request({ + url: '', + method: 'POST', + data + }) + } +} diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss new file mode 100644 index 0000000..4c07afa --- /dev/null +++ b/src/assets/css/process.scss @@ -0,0 +1,44 @@ +//流程样式 +.process{ + background-color: #fff; + width:100%; + height: 100%; + padding: 10px 20px; + overflow: auto; +} +.process_box{ + padding: 10px 30px; + border: 1px solid #e8f6fe; +} +.procedure{ + +} +.content{ + margin-top: 25px; + width:100%; + padding: 10px 30px; + border: 1px dotted #ccc; +} +.base_title{ + display: inline-block; + font-size: 18px; + font-weight: 700; + color: #555; + line-height: 40px; + border-bottom: 3px solid #409eff; + margin-bottom: 20px; +} +// 表单的样式 +.label-input-form{ + padding-right: 80px; + .el-form-item.el-form-item__label{ + line-height: 40px; + font-size: 15px; + color:#555 !important; + } + .el-form-item.el-input__inner{ + height: 40px; + line-height: 40px; + } +} + diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue new file mode 100644 index 0000000..10ba2c0 --- /dev/null +++ b/src/components/OrgTable.vue @@ -0,0 +1,1123 @@ + + + + + + diff --git a/src/components/ProcessHeader.vue b/src/components/ProcessHeader.vue new file mode 100644 index 0000000..19e32ee --- /dev/null +++ b/src/components/ProcessHeader.vue @@ -0,0 +1,62 @@ + + + + + + diff --git a/src/main.js b/src/main.js index e116a79..fd883a5 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,8 @@ import Vue from 'vue' import App from './App.vue' import router from './router' import store from './store' +// 流程公共样式 +import './assets/css/process.scss' import config from '@/utils/config' // VXETable @@ -27,6 +29,7 @@ import '@/utils/waterMark' import JSEncrypt from '../src/assets/js/jsencrypt.min.js' // 富文本引用 import VueQuillEditor from 'vue-quill-editor' + // require styles 引入样式 import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' diff --git a/src/router/modules/permission.js b/src/router/modules/permission.js new file mode 100644 index 0000000..24a09ae --- /dev/null +++ b/src/router/modules/permission.js @@ -0,0 +1,35 @@ +const routes = [ + { + path: '/permission', + name: '', + component: () => import('../../views/Layout.vue'), + children: [ + { + path: 'step1', + name: 'urlIndex', + component: () => import('../../views/permissionApplication/launch'), + meta: { + crumb: ['权限申请'] + } + }, + { + path: 'step2', + name: 'urlIndex', + component: () => import('../../views/permissionApplication/launch'), + meta: { + crumb: ['权限申请'] + } + }, + { + path: 'step3', + name: 'urlIndex', + component: () => import('../../views/permissionApplication/launch'), + meta: { + crumb: ['权限申请'] + } + } + ] + } +] + +export default routes diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue index a76e567..017e80a 100644 --- a/src/views/Report/ReportManager.vue +++ b/src/views/Report/ReportManager.vue @@ -50,6 +50,7 @@
+ {{tagsForm}} diff --git a/src/views/permissionApplication/components/Assign.vue b/src/views/permissionApplication/components/Assign.vue new file mode 100644 index 0000000..f146c28 --- /dev/null +++ b/src/views/permissionApplication/components/Assign.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/permissionApplication/components/AuditOperation.vue b/src/views/permissionApplication/components/AuditOperation.vue new file mode 100644 index 0000000..83120cb --- /dev/null +++ b/src/views/permissionApplication/components/AuditOperation.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue new file mode 100644 index 0000000..d7d55dd --- /dev/null +++ b/src/views/permissionApplication/components/reportTable.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue new file mode 100644 index 0000000..331dadf --- /dev/null +++ b/src/views/permissionApplication/launch.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index b3dabd8..41d24d5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,6 @@ const webpack = require('webpack') module.exports = { + lintOnSave: false, // publicPath: '/mi', outputDir: 'dist', // 运行时生成的生产环境构建文件的目录(默认''dist''，构建之前会被清除) assetsDir: 'static', // 放置生成的静态资源(s、css、img、fonts)的(相对于 outputDir 的)目录(默认'') @@ -12,12 +13,12 @@ module.exports = { proxy: { // 配置跨域 '/api': { - target: 'http://10.94.1.164:7060', // 服务器 + target: 'http://localhost:7060', // 服务器 changeOrigin: true }, // 请求静态图片配置项 '/api/home/pic': { - target: 'http://10.94.1.164:7061', // 图片请求的nginx网址 + target: 'http://localhost:7061', // 图片请求的nginx网址 changeOrigin: true } From 9a67e73ee579aaf3c69723367c15c8fc4904bc98 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 11:52:32 +0800 Subject: [PATCH 02/49] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/modules/userCenter.js | 8 +- .../processCenter/monitorProcesses.vue | 7 +- .../monitorProcesses/monitorModal.vue | 98 +++++++++++++++++++ .../monitorProcesses/monitorViews.vue | 84 ++++++++++++++++ 4 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue create mode 100644 src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue diff --git a/src/router/modules/userCenter.js b/src/router/modules/userCenter.js index f169ad5..8228bc0 100644 --- a/src/router/modules/userCenter.js +++ b/src/router/modules/userCenter.js @@ -12,8 +12,14 @@ const routes = [ component: () => import('../../views/userCenter/processCenter.vue'), meta: { crumb: ['流程中心'] - } + }, + }, + { + path:'monitorViews', + name:'monitorViews', + component: () => import('../../views/userCenter/processCenter/monitorProcesses/monitorViews.vue') + } ] } ] diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue index b0ee0b6..25a3c21 100644 --- a/src/views/userCenter/processCenter/monitorProcesses.vue +++ b/src/views/userCenter/processCenter/monitorProcesses.vue @@ -69,7 +69,12 @@ export default { }, methods: { view() { - alert(111) + this.$router.push({ + path: 'monitorViews', + query:{ + id: this.$route.query.id + } + }) } } } diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue new file mode 100644 index 0000000..9cfa601 --- /dev/null +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue new file mode 100644 index 0000000..32a1b5b --- /dev/null +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorViews.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file From b93624ad30db9f9e227478227840939d4b7366ac Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 12:26:30 +0800 Subject: [PATCH 03/49] =?UTF-8?q?=E8=A7=A3=E5=86=B3tab=E9=A1=B5=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E9=97=AA=E5=B1=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/tabs.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/userCenter/processCenter/tabs.vue b/src/views/userCenter/processCenter/tabs.vue index 3fc4d23..31310fd 100644 --- a/src/views/userCenter/processCenter/tabs.vue +++ b/src/views/userCenter/processCenter/tabs.vue @@ -2,16 +2,16 @@
- + - + - + - +
From 6723cf0ab9051417864cc8872128e65dd59179ff Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 13:34:44 +0800 Subject: [PATCH 04/49] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8Fbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/monitorProcesses/monitorModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 9cfa601..ddc7449 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -3,7 +3,7 @@
- + @@ -86,7 +86,7 @@ export default { line-height: 40px; } -:v-deep .el-form-item--mini .el-form-item__label { +::v-deep .el-form-item--mini .el-form-item__label { line-height: 40px !important; } From bf594d4b892be7d9365d2e77f0be8d9fcb0d04b4 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Mon, 17 Apr 2023 13:42:20 +0800 Subject: [PATCH 05/49] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=97=B6=EF=BC=8C=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/sentProcess.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 46fd344..1db9b09 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -29,7 +29,8 @@ - 强制撤回 + 强制撤回 + @@ -42,6 +43,8 @@ export default { name: "sentProcess", data() { return { + color:'rgb(236, 128, 141)', + icolor:'rgb(119,136,153)', tableData: [ { processId: "2016-05-1", From c8db1229dc3c4326137f5aad77324b170971462d Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 17 Apr 2023 15:50:28 +0800 Subject: [PATCH 06/49] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8C=85=E6=8B=AC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/process.js | 9 + src/assets/css/process.scss | 15 +- src/components/ProcessApprovalHistory.vue | 230 +++++ src/components/ProcessChooseTree.vue | 790 ++++++++++++++++++ src/components/ProcessFooter.vue | 420 ++++++++++ src/main.js | 1 + src/router/modules/permission.js | 4 +- src/utils/Enum/enum.js | 8 + src/utils/Enum/index.js | 103 +++ src/views/Report/ReportList.vue | 34 +- src/views/Report/ReportManager.vue | 15 +- .../components/Assign.vue | 211 ----- .../components/AuditOperation.vue | 442 ++-------- src/views/permissionApplication/examine.vue | 139 +++ src/views/permissionApplication/launch.vue | 99 ++- 15 files changed, 1901 insertions(+), 619 deletions(-) create mode 100644 src/api/modules/process.js create mode 100644 src/components/ProcessApprovalHistory.vue create mode 100644 src/components/ProcessChooseTree.vue create mode 100644 src/components/ProcessFooter.vue create mode 100644 src/utils/Enum/enum.js create mode 100644 src/utils/Enum/index.js delete mode 100644 src/views/permissionApplication/components/Assign.vue create mode 100644 src/views/permissionApplication/examine.vue 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"> - - + + - - - + + + + + + + + + + + + + -
+
From f87f00b2e7c2b92145a4bb722fbc745037ea784b Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 17 Apr 2023 17:03:58 +0800 Subject: [PATCH 07/49] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/process.js | 23 +- src/assets/css/process.scss | 1 + src/components/OrgTable.vue | 411 +++++++----------- src/components/ProcessApprovalHistory.vue | 42 +- src/components/ProcessChooseTree.vue | 88 ++-- src/components/ProcessHeader.vue | 2 +- .../components/AuditOperation.vue | 10 +- .../components/reportTable.vue | 10 +- src/views/permissionApplication/examine.vue | 47 +- src/views/permissionApplication/launch.vue | 4 +- 10 files changed, 270 insertions(+), 368 deletions(-) diff --git a/src/api/modules/process.js b/src/api/modules/process.js index 1abc4eb..5fb0a04 100644 --- a/src/api/modules/process.js +++ b/src/api/modules/process.js @@ -1,9 +1,20 @@ import { instance as request } from '@/utils/request' -export function getUserOrgDept (data) { - return request({ - url: '/api/sys/role/getUserAndOrg', - method: 'get', - params: data - }) +export default { + getRoleAndUserByOrgIdPage (data) { + return request({ + url: '/api/sys/user/list', + method: 'get', + params: data + }) + }, + + // 获取审批历史 + getHistory (data) { + return request({ + url: '/api/lawss/activiti/get_list_by_instance', + method: 'get', + params: data + }) + } } diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss index a109f3b..fe852b7 100644 --- a/src/assets/css/process.scss +++ b/src/assets/css/process.scss @@ -40,6 +40,7 @@ .el-form-item.el-input__inner,.el-form-item { height: 40px; line-height: 40px; + font-size: 15px; } .el-select{ width: 100%; diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue index 10ba2c0..128eab7 100644 --- a/src/components/OrgTable.vue +++ b/src/components/OrgTable.vue @@ -9,15 +9,7 @@ :close-on-click-modal="false" class="org-table" @close="handleClose"> - - - - - - - - - - + title="流程编号"> + + + + + + diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index dce3d5f..cb56b3f 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -9,10 +9,21 @@ + title="流程编号"> + + + + + + Date: Mon, 24 Apr 2023 15:54:41 +0800 Subject: [PATCH 39/49] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9vuex=E7=9A=84USID=E4=B8=BAusid=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/permissionProcess.js | 12 +++ src/api/modules/process.js | 9 ++ src/components/OrgTable.vue | 3 + src/components/ProcessMixin.vue | 10 ++- src/utils/Enum/enum.js | 2 +- src/views/Report/ReportList.vue | 2 +- .../components/reportDialog.vue | 90 ++++++++++--------- .../components/reportTable.vue | 22 +---- .../monitorProcesses/monitorModal.vue | 2 +- 9 files changed, 86 insertions(+), 66 deletions(-) create mode 100644 src/api/modules/permissionProcess.js diff --git a/src/api/modules/permissionProcess.js b/src/api/modules/permissionProcess.js new file mode 100644 index 0000000..d7a7641 --- /dev/null +++ b/src/api/modules/permissionProcess.js @@ -0,0 +1,12 @@ + +import { instance as request } from '@/utils/request' + +export default { + getReportLisy (data) { + return request({ + url: '/api/report/addReportPage', + method: 'post', + data: data + }) + }, +} diff --git a/src/api/modules/process.js b/src/api/modules/process.js index ca0a8f7..0742ca0 100644 --- a/src/api/modules/process.js +++ b/src/api/modules/process.js @@ -99,5 +99,14 @@ export default { }) }, + // 停用流程发起 + startProcess(data) { + return request({ + url: '/api/startProcess', + method: 'post', + data: data + + }) + } } diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue index 8191732..6e597e2 100644 --- a/src/components/OrgTable.vue +++ b/src/components/OrgTable.vue @@ -835,6 +835,9 @@ export default { From a855fa8b2caa21daa747b92f3c87aba1666da9bd Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 25 Apr 2023 18:12:37 +0800 Subject: [PATCH 44/49] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E=E4=BF=AE=E6=94=B9=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userCenter/processCenter/sentProcess.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index dd8fbf5..5f155b7 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -45,7 +45,7 @@ 查看 - + 强制撤回 From 2d1b10836aaa7d305d9f41f1eeb5e6f8d19d3b95 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 25 Apr 2023 18:18:14 +0800 Subject: [PATCH 45/49] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7=E7=9A=84=E5=B8=A6=E5=85=A5?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Report/ReportList.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index 886fe5e..fde6b7f 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -330,12 +330,20 @@ export default { }) }, permissionApp () { + if(this.checkList.length <1){ + this.$message.warning("至少选择一条报告进行权限申请") + return + } // 有预览权限的时候是否还让继续申请 let temp=this.checkList.filter(item =>{ - if(item.power == 1 || item.power == 2){ - return item + if(+item.power == 1 || +item.power == 2){ + return item.name } }) + if(temp.length>0) { + this.$message.warning("当前选择的"+temp.toString()+"已经有权限，无须申请！") + return + } this.$router.push({ path: '/permission/launch', From 44394829462494f54672d2c188a5909c498317f1 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 25 Apr 2023 18:59:14 +0800 Subject: [PATCH 46/49] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E6=B2=A1?= =?UTF-8?q?=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/permissionApplication/launch.vue | 5 +- .../monitorProcesses/monitorModal.vue | 52 +++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index c17f415..524da9c 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -63,7 +63,6 @@ placeholder="请选择一级审批人员"> - @@ -340,7 +339,7 @@ export default { //如果不是第一次 if (this.initShow) { let dataJson = JSON.stringify(this.tableData) - let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid}) + let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark}) this.completeProcess({ dataJson, submitJson, @@ -379,7 +378,7 @@ export default { form.userId = this.$store.getters.userInfo.usid //...this.applicationForm,...this.processForm, let dataJson = JSON.stringify(this.tableData) - let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid}) + let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark}) this.$api.process.startProcess(form).then(({data}) => { this.completeProcess({dataJson, submitJson, taskId: data.result, userId: form.userId, prcType: this.prcType}) }) diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index dbbdf40..4eabd3b 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -3,13 +3,18 @@
- - - - + + + + + + + + + +
@@ -18,18 +23,31 @@ 确 定 +