From 1fe1b13f0a4e78efe95cc8f34480104903615219 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 09:46:15 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProcessMixin.vue | 4 ++++ .../components/reportTable.vue | 4 ++-- src/views/permissionApplication/launch.vue | 4 ++-- .../reportProcess/components/reportForm.vue | 6 +++++ src/views/reportProcess/examine.vue | 6 ++--- src/views/reportProcess/launch.vue | 4 ++-- .../processCenter/finishProcess.vue | 24 +++++++++++++++++-- .../userCenter/processCenter/gencyProcess.vue | 24 +++++++++++++++++-- .../monitorProcesses/monitorModal.vue | 2 +- .../userCenter/processCenter/sentProcess.vue | 4 ++-- 10 files changed, 66 insertions(+), 16 deletions(-) diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue index 796e336..ce98f8c 100644 --- a/src/components/ProcessMixin.vue +++ b/src/components/ProcessMixin.vue @@ -12,6 +12,10 @@ label: '权限申请流程', value: '1' }, + { + label: '报告上传流程', + value: '2' + }, ], formDisableFlag: false, nowOrder: '', diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue index f1cb5d4..7faec31 100644 --- a/src/views/permissionApplication/components/reportTable.vue +++ b/src/views/permissionApplication/components/reportTable.vue @@ -156,7 +156,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ // 有idde console.log(this.value) debugger @@ -217,7 +217,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ if(row.id && row.id !=''){ // this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{ this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.reportId]) diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 2d10ca8..7e1997c 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -236,7 +236,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -376,7 +376,7 @@ export default { }, handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 9a2a3c2..6403ff5 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -244,6 +244,12 @@ export default { fileList:[] } }, + watch:{ + processForm(val){ + debugger + this.form=this.processForm + } + }, methods: { loadMore(){ this.q.pageNo++ diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue index a0240b5..e1ddbf6 100644 --- a/src/views/reportProcess/examine.vue +++ b/src/views/reportProcess/examine.vue @@ -102,7 +102,7 @@ export default { }, PERMISSION, submitjson:{}, - prcType:1 + prcType:2 } }, created () { @@ -110,7 +110,7 @@ export default { this.prcNum=this.$store.getters.handleProcess.prcNum this.prcId=this.$store.getters.handleProcess.prcId this.prcName=this.$store.getters.handleProcess.prcName - this.$set(this.processForm,'prcName',this.prcName) + let params={ prcId: this.prcId, @@ -121,7 +121,7 @@ export default { } this.getProcessDetail(params).then(res=>{ this.processForm = JSON.parse(this.processOld.dataJson) - + this.$set(this.processForm,'prcName',this.prcName) this.disabled=false this.formControl= true if(this.$route.query.type=='yiban'){ diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 284260c..5e5c882 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -188,7 +188,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -231,7 +231,7 @@ export default { methods: { handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index dec8084..321e193 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -118,7 +118,7 @@ export default { this.$store.commit('setHandleProcess',params) switch (row.prcType) { case '1' : - if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -136,7 +136,27 @@ export default { taskDefinitionKey:row.taskDefinitionKey } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, } diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 564a99d..ca3e83e 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -109,7 +109,7 @@ export default { switch (row.prcType) { case '1' : debugger - if (row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -127,7 +127,27 @@ export default { prcName: row.prcName } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, }, diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 1d4109b..38fbeef 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -121,7 +121,7 @@ export default { pId: this.pId } if(this.prcType == '1'){ - if(this.aid=='aid2'){ + if(this.aid=='oneApply'){ params.replaceMap="oneApprove:"+ this.form.assignee+','+"oneApproveName:"+ this.form.assigneeName }else{ params.replaceMap="twoApprove:"+ this.form.assignee+','+"twoApproveName:"+ this.form.assigneeName diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 138690e..f7011bc 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -106,8 +106,8 @@ export default { res.isViewDetails = 1 res.prcType = prcType res.prcNum = row.prcNum - if (res.taskDefinitionKey == 'aid1' || - res.taskDefinitionKey == 'aid4' ) { + if (res.taskDefinitionKey == 'start' || + res.taskDefinitionKey == 'reEdit' ) { this.$router.push({ path: '/permission/launch', query: res, From b087fefcdb301808924dc1aaecc2b8c8d2d81b3e Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 11:08:41 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/dictionary.js | 30 ++++++ src/views/System/dataDictionary.vue | 74 ++++++++++---- src/views/System/dictionaryDetail.vue | 141 ++++++++++++++++++-------- 3 files changed, 181 insertions(+), 64 deletions(-) diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js index e1e94a6..dca2c9d 100644 --- a/src/api/modules/dictionary.js +++ b/src/api/modules/dictionary.js @@ -1,6 +1,7 @@ import { instance as request } from '@/utils/request' export default { + //外层 addDic (data) { return request({ url: '/api/sys/dict/add', @@ -29,4 +30,33 @@ export default { params:data }) }, + //内层 + addItemDic (data) { + return request({ + url: '/api/sys/dictItem/add', + method: 'post', + data + }) + }, + editItemDic (data) { + return request({ + url: '/api/sys/dictItem/edit', + method: 'put', + data + }) + }, + getItemDic (data) { + return request({ + url: '/api/sys/dictItem/page', + method: 'get', + params:data + }) + }, + delItemDic (data) { + return request({ + url: '/api/sys/dictItem/delete', + method: 'delete', + params:data + }) + }, } diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 8e4875f..b1d41cc 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -60,8 +60,8 @@
- - + + @@ -70,12 +70,12 @@ - - + + - - + +
@@ -107,6 +107,23 @@ export default { dicName:'', description:'' }, + formRule:{ + dicCode:[ + { + required:true, + message:'数据字典编码不能为空', + trigger:'change' + } + ], + dicName:[ + { + required:true, + message:'数据字典名称不能为空', + trigger:'change' + } + ], + + }, repassword: '', roleList: [] } @@ -148,6 +165,7 @@ export default { }, // 新增 add () { + this.mode = 'add' this.form = { dicCode:'', @@ -156,6 +174,10 @@ export default { } this.repassword = '' this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.dicRef.clearValidate() + + }) }, // // 启用/禁用 // sysUserIsUse (val, row) { @@ -174,23 +196,30 @@ export default { // }, // 删除 deleteRow (row) { - this.deleteUser([row.id]) + this.deleteUser(row.id) }, // 新增用户 sysUserAddUser () { - if(this.mode=='add'){ - this.$api.dictionary.addDic(this.form).then((res)=>{ - this.$message.success("新增成功") - this.sysUserList() - }) - }else{ - this.$api.dictionary.editDic(this.form).then((res)=>{ - this.$message.success("编辑成功") - this.sysUserList() - }) - } + this.$refs.dicRef.validate(v=>{ + if(v){ + if(this.mode=='add'){ + this.$api.dictionary.addDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.sysUserList() + }) + }else{ + this.$api.dictionary.editDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.sysUserList() + }) + } + + this.dialogUser = false + }else{ + this.$message.warning("请检查表单") + } + }) - this.dialogUser = false }, // 编辑查看用户 openRowData (mode, row) { @@ -200,7 +229,8 @@ export default { path:'/system/dicdeatil', query:{ id:this.$route.query.id, - pId:row.id + pId:row.id, + pName: row.dicName } }) }else if(mode=='add'){ @@ -224,7 +254,7 @@ export default { if (!users.length) { return this.$message.warning('请选择数据后在进行操作') } - const ids = users.map(item => item.id) + const ids = users.map(item => item.id).join(',') this.deleteUser(ids) }, // 删除用户 @@ -347,7 +377,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px; diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue index 1072adf..1c9b4b3 100644 --- a/src/views/System/dictionaryDetail.vue +++ b/src/views/System/dictionaryDetail.vue @@ -5,15 +5,15 @@
- {{dictionaryName}} - ddfdddd
+ {{dicName}} +
- +
@@ -39,9 +39,11 @@ {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} - - - + + + + + @@ -69,21 +71,22 @@
- - - + + + + + + - - - - - + + - - + +
@@ -99,55 +102,105 @@ export default { name: 'standLawsAttrDetails', data(){ + const validateData= (rule, value, callback) =>{ + let test=/^[0-9]*$/ + if (!test.test(value)) { + callback(new Error('请输入数字值')); + }else{ + callback() + } + } return{ form:{ - + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'' }, total:0, q:{ pageNo:1, pageSize:10, - account:'' + itemName:'' }, tableData:[{inde:1}], mode:'', - dialogUser:false + dialogUser:false, + dicId:'', + dicName:'', + formRule:{ + itemName:[{ + required:true, + message:'选项不能为空', + trigger:'change' + }], + itemValue:[{ + required:true, + message:'选项值不能为空', + trigger:'change' + }], + itemOrder:[{ + required:true, + message:'排序不能为空', + trigger:'change' + },{ + validator:validateData, trigger:'change' + }], + } } }, + mounted() { + this.dicName=this.$route.query.pName + this.dicId=this.$route.query.pId + this.loadData() + }, methods:{ // 编辑查看用户 openRowData (mode, row) { this.mode = mode - this.form = { - account: row.ACCOUNT, // 用户名 - cellPhoneNumber: row.CELLPHONE_NUMBER, // 手机号 - department: row.DEPARTMENT, // 部门 - email: row.EMAIL, // 邮箱 - password: '', // 密码 - usid: row.USID, // 用户ID - usname: row.USNAME, // 姓名 - roleIdList: [row.ROLEID] // 角色 - } + this.form=JSON.parse(JSON.stringify(row)) this.dialogUser = true }, sysUserAddUser(){ + this.$refs.addForm.validate(v=>{ + if(v){ + if(this.mode=='add'){ + this.$api.dictionary.addItemDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.loadData() + }) + }else{ + this.$api.dictionary.editItemDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.loadData() + }) + } + + this.dialogUser = false + }else{ + this.$message.warning("请检查表单") + } + }) + + }, // 新增 add () { this.mode = 'add' this.form = { - account: '', // 用户名 - cellPhoneNumber: '', // 手机号 - department: '', // 部门 - email: '', // 邮箱 - password: '', // 密码 - usid: '', - usname: '', // 姓名 - roleIdList: [''] // 角色 + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'', + dicId:this.dicId } this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.addForm.clearValidate() + + }) }, // 批量删除 getSelectUser () { @@ -169,9 +222,9 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.user.sysUserDelete({ ids }).then(_ => { + this.$api.dictionary.delItemDic({ ids }).then(_ => { this.$message.success('操作成功') - this.sysUserList() + this.loadData() }) }) }, @@ -184,7 +237,10 @@ export default { this.loadData() }, loadData(){ - + this.$api.dictionary.getItemDic({...this.q,dicId:this.dicId}).then((res)=>{ + this.tableData = res.data.records + this.total=res.data.total + }) }, search() { this.q.pageNo = 1 @@ -194,7 +250,8 @@ export default { this.q = { pageNo:1, pageSize:10, - account:'' + itemName:'', + dicId: this.dicId } this.loadData() }, @@ -312,7 +369,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px; From 524193cfee812db2c496ec8d69372e1a341a7fa5 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sat, 6 May 2023 11:40:19 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/org.js | 35 +++ src/router/modules/system.js | 9 + src/views/System/Org.vue | 541 +++++++++++++++++++++++++++++++++++ 3 files changed, 585 insertions(+) create mode 100644 src/api/modules/org.js create mode 100644 src/views/System/Org.vue diff --git a/src/api/modules/org.js b/src/api/modules/org.js new file mode 100644 index 0000000..0029fb7 --- /dev/null +++ b/src/api/modules/org.js @@ -0,0 +1,35 @@ +import { instance as request } from '@/utils/request' + +export default { + // 新增|编辑 + sysOrgAddUser (data) { + return request({ + url: '/api/sys/org/saveOrUpdate', + method: 'POST', + data + }) + }, + // // 用户启用或禁用 + // sysUserIsUse (data) { + // return request({ + // url: `/api/sys/user/isUse/${data.USID}/${data.type}`, + // method: 'POST' + // }) + // }, + // 获取所有部门 + sysOrgList (data) { + return request({ + url: '/api/sys/org', + method: 'GET', + params: data + }) + }, + // 删除部门 + sysOrgDelete (data) { + return request({ + url: '/api/sys/org/delete', + method: 'POST', + params: data + }) + } +} diff --git a/src/router/modules/system.js b/src/router/modules/system.js index bbce1ea..ff3cab2 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -32,6 +32,15 @@ const routes = [ crumb: ['角色管理'] } }, + // 组织机构管理 + { + path: 'Org', + name: 'Org', + component: () => import('../../views/System/Org.vue'), + meta: { + crumb: ['组织机构管理'] + } + }, // // 角色管理 // { // path: 'mail', diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue new file mode 100644 index 0000000..79490b5 --- /dev/null +++ b/src/views/System/Org.vue @@ -0,0 +1,541 @@ + + + + + From 182b6a17b6f07da22c845777cf070527b6c78bd0 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 13:53:52 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AD=97=E5=85=B8=E7=9A=84=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/System/dataDictionary.vue | 18 ++++++++++++------ src/views/System/dictionaryDetail.vue | 27 ++++++++++++++++++--------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index b1d41cc..2ce7d25 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -163,6 +163,16 @@ export default { this.q.pageNo = val this.sysUserList() }, + checkUserForm () { + if (!this.form.dicCode) { + return this.$message.warning('请检查数据字典编码') && false + } + if (!this.form.dicName) { + return this.$message.warning('请检查数据字典名称') && false + } + + return true + }, // 新增 add () { @@ -200,8 +210,8 @@ export default { }, // 新增用户 sysUserAddUser () { - this.$refs.dicRef.validate(v=>{ - if(v){ + if(this.checkUserForm()){ + if(this.mode=='add'){ this.$api.dictionary.addDic(this.form).then((res)=>{ this.$message.success("新增成功") @@ -213,12 +223,8 @@ export default { this.sysUserList() }) } - this.dialogUser = false - }else{ - this.$message.warning("请检查表单") } - }) }, // 编辑查看用户 diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue index 1c9b4b3..374ed4b 100644 --- a/src/views/System/dictionaryDetail.vue +++ b/src/views/System/dictionaryDetail.vue @@ -73,19 +73,19 @@
- + - + - + - + @@ -163,8 +163,8 @@ export default { this.dialogUser = true }, sysUserAddUser(){ - this.$refs.addForm.validate(v=>{ - if(v){ + + if( this.checkUserForm()){ if(this.mode=='add'){ this.$api.dictionary.addItemDic(this.form).then((res)=>{ this.$message.success("新增成功") @@ -178,13 +178,22 @@ export default { } this.dialogUser = false - }else{ - this.$message.warning("请检查表单") } - }) + }, + checkUserForm () { + if (!this.form.itemName) { + return this.$message.warning('请检查选项') && false + } + if (!this.form.itemValue) { + return this.$message.warning('请检查选项值') && false + } + if (this.form.itemOrder && !(/^[0-9]*$/.test(this.form.itemOrder))) { + return this.$message.warning('请检查排序') && false + } + return true }, // 新增 add () { From 181a775aa573dff717437cc8a06aae297c774cea Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 14:42:32 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/org.js | 2 +- src/views/System/Org.vue | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/api/modules/org.js b/src/api/modules/org.js index 0029fb7..ece13e3 100644 --- a/src/api/modules/org.js +++ b/src/api/modules/org.js @@ -19,7 +19,7 @@ export default { // 获取所有部门 sysOrgList (data) { return request({ - url: '/api/sys/org', + url: '/api/sys/org/page', method: 'GET', params: data }) diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue index 79490b5..abee3ad 100644 --- a/src/views/System/Org.vue +++ b/src/views/System/Org.vue @@ -176,9 +176,18 @@ export default { this.q.pageNo = 1 this.sysOrgList() }, + // 多选用户 + getSelectUser () { + const users = this.$refs.userTable.getCheckboxRecords() + if (!users.length) { + return this.$message.warning('请选择数据后在进行操作') + } + const ids = users.map(item => item.id).join(',') + this.deleteOrg(ids) + }, // 获取所有用户 sysOrgList () { - this.$api.user.sysOrgList(this.q).then(({ data }) => { + this.$api.org.sysOrgList(this.q).then(({ data }) => { this.tableData = data.records this.total = data.total this.q.pageNo = data.current @@ -245,7 +254,7 @@ export default { // }, // 删除 deleteRow (row) { - this.deleteOrg(row.USID) + this.deleteOrg(row.id) }, // 验证 checkUserForm () { @@ -288,12 +297,10 @@ export default { }, // 新增用户 sysOrgAddOrg () { - if (!this.checkUserForm()) return + // if (!this.checkUserForm()) return const data = JSON.parse(JSON.stringify(this.form)) - data.orgName = this.$JSEncrypt(data.orgName) - // data.password = this.$JSEncrypt(data.password) - const jsonData = JSON.stringify(data) - this.$api.user.sysUserAddUser(Base64.encodeURI(jsonData)).then(_ => { + + this.$api.org.sysOrgAddUser(data).then(_ => { this.$message.success('操作成功') this.dialogUser = false this.reset() @@ -305,6 +312,7 @@ export default { this.form = { orgName: row.orgName, // 部门名称 orgLevel: row.orgLevel, // 部门级别 + orgCode: row.orgCode, // 部门级别 supOrgCode: row.supOrgCode, // 父部门编码 orgShortName: row.orgShortName, // 部门简称 id: row.id, // ID @@ -334,7 +342,7 @@ export default { if (!users.length) { return this.$message.warning('请选择数据后在进行操作') } - const ids = users.map(item => item.USID).join(',') + const ids = users.map(item => item.id).join(',') this.deleteUser(ids) }, // 删除用户 From efcc113a1ce20269232c625469d6a9699f624ff8 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 15:47:12 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E5=85=B8=E6=8C=89=E9=9C=80=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=94=A8dicts=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/dictionary.js | 7 +++ src/components/Header.vue | 1 + src/components/dict.js | 58 +++++++++++++++++++ src/main.js | 3 +- src/store/index.js | 18 +++++- src/utils/request.js | 2 + src/views/System/dictionaryDetail.vue | 6 +- .../reportProcess/components/reportForm.vue | 7 ++- src/views/reportProcess/launch.vue | 1 - 9 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 src/components/dict.js diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js index dca2c9d..8138474 100644 --- a/src/api/modules/dictionary.js +++ b/src/api/modules/dictionary.js @@ -59,4 +59,11 @@ export default { params:data }) }, + // 获取字典值 + getCode(data) { + return request({ + url: '/api/sys/dictItem/'+data, + method: 'get', + }) + } } diff --git a/src/components/Header.vue b/src/components/Header.vue index 501905a..616c108 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -86,6 +86,7 @@ export default { this.$store.commit('saveUserInfo', null) this.$store.commit('setHandleProcess', null) this.$store.commit('savePathUrl', null) + this.$store.commit('removeDicts', null) // var sevice = "http://"+window.location.host+"/"; // var serviceUrl = encodeURIComponent(sevice); // 正式 diff --git a/src/components/dict.js b/src/components/dict.js new file mode 100644 index 0000000..0da9263 --- /dev/null +++ b/src/components/dict.js @@ -0,0 +1,58 @@ +// 混入字典方法 做到按需加载 +import interfaces from "@/api/modules/dictionary"; +import store from "@/store"; +import Vue from "vue"; + +class Dict { + constructor(dict) { + this.dict = dict; + } + + async init(names) { + const ps = []; + names.forEach((name) => { + if (store.getters.dicts[name]) { + Vue.set(this.dict, name, store.getters.dicts[name]); + } else { + Vue.set(this.dict, name, []); + ps.push( + interfaces.getCode(name).then((res) => { + this.dict[name] = Object.freeze(res.data); + store.dispatch('setDicts_a', { + label: name, + value: Object.freeze(res.data), + }) + }) + ); + + } + }); + await Promise.all(ps); + } +} + +const install = function (Vue) { + Vue.mixin({ + data() { + if ( + this.$options.dicts instanceof Array && + this.$options.dicts.length > 0 + ) { + return { dict: {} }; + } else { + return {}; + } + }, + created() { + if ( + this.$options.dicts instanceof Array && + this.$options.dicts.length > 0 + ) { + new Dict(this.dict).init(this.$options.dicts); + } + }, + }); +}; + +export default { install }; + diff --git a/src/main.js b/src/main.js index 26b2d10..e6fffae 100644 --- a/src/main.js +++ b/src/main.js @@ -35,13 +35,14 @@ import VueQuillEditor from 'vue-quill-editor' import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' +import dict from '@/components/dict' VXETable.setup({ table: { resizable: true } }) - +Vue.use(dict); Vue.use(VXETable) Vue.use(VueQuillEditor) Vue.use(ElementUI, { size: 'mini', zIndex: 3000 }) diff --git a/src/store/index.js b/src/store/index.js index 56fb363..c57283a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -14,7 +14,8 @@ export default new Vuex.Store({ menuName: '', activeTab: '', handleProcess: '', - marketpre:'' + marketpre:'', + dicts:{} }, getters: { marketpre: (state) => state.marketpre, @@ -22,9 +23,16 @@ export default new Vuex.Store({ menuName: (state) => state.menuName, userInfo: (state) => state.userInfo, activeTab: (state) =>state.activeTab, - handleProcess: (state) =>state.handleProcess + handleProcess: (state) =>state.handleProcess, + dicts: (state) =>state.dicts }, mutations: { + setDicts(state, obj) { + state.dicts[obj.label] = obj.value; + }, + removeDicts(state, obj) { + state.dicts = {} + }, setMarketpre(state, data){ state.marketpre = data }, @@ -53,7 +61,11 @@ export default new Vuex.Store({ state.menuName = data } }, - actions: {}, + actions: { + setDicts_a({ commit }, obj) { + commit('setDicts', obj) + }, + }, modules: {}, plugins: [createPersistedState()] }) diff --git a/src/utils/request.js b/src/utils/request.js index 2e411ef..fa68921 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -82,6 +82,7 @@ instance.interceptors.response.use(function (response) { if (error.response.data.status == 401) { store.commit('savePathUrl', null) store.commit('setHandleProcess', null) + store.commit('removeDicts', null) router.push('/login') Message.error('登录超时过期') // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); @@ -95,6 +96,7 @@ instance.interceptors.response.use(function (response) { if (error.response.status === 500) { store.commit('savePathUrl', null) store.commit('setHandleProcess', null) + store.commit('removeDicts', null) router.push('/login') Message.error('登录超时过期') // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue index 374ed4b..0c33145 100644 --- a/src/views/System/dictionaryDetail.vue +++ b/src/views/System/dictionaryDetail.vue @@ -73,16 +73,16 @@
- + - + - + diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 6403ff5..10c9a49 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -35,8 +35,8 @@ - + @@ -67,7 +67,7 @@ - + @@ -148,6 +148,7 @@ import newTranslate from "../../../components/newTranslate"; import VueTagsInput from '@johmun/vue-tags-input'; export default { + dicts:['classified_level','privacy_level'], components: { VueTagsInput, newTranslate diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 5e5c882..62c6db8 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -244,7 +244,6 @@ export default { twoApprove: '' } this.$nextTick(() => { - this.$refs.applicationFormRef.clearValidate() this.$refs.assignFormRef.clearValidate() }) From 469c94a0001abf27decda5c2111bce1319042e19 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sat, 6 May 2023 15:53:02 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/org.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/modules/org.js b/src/api/modules/org.js index ece13e3..013c412 100644 --- a/src/api/modules/org.js +++ b/src/api/modules/org.js @@ -20,8 +20,8 @@ export default { sysOrgList (data) { return request({ url: '/api/sys/org/page', - method: 'GET', - params: data + method: 'POST', + data }) }, // 删除部门 From 352ebb8f9a4f0e3860d2e1393d55a265e506d587 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 16:03:10 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/System/Org.vue | 52 +++++++-------------------- src/views/System/dataDictionary.vue | 2 +- src/views/System/dictionaryDetail.vue | 2 +- 3 files changed, 15 insertions(+), 41 deletions(-) diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue index abee3ad..ced6852 100644 --- a/src/views/System/Org.vue +++ b/src/views/System/Org.vue @@ -83,7 +83,7 @@ -
+
@@ -94,17 +94,17 @@ - + - + - + - - + + @@ -258,46 +258,20 @@ export default { }, // 验证 checkUserForm () { - if (this.mode === 'add') { - if (!this.form.account || !(/^[a-zA-Z0-9]*$/.test(this.form.account))) { - return this.$message.warning('用户名只能为纯数字、纯字母或字母数字组合') && false - } - // // 密码 - // if (!(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/.test(this.form.password))) { - // return this.$message.warning('密码至少8个字符，至少1个大写字母，1个小写字母，1个数字') && false; - // } - // if (this.repassword !== this.form.password) { - // return this.$message.warning('请检查密码') && false; - // } + if (!this.form.orgName) { + return this.$message.warning('请检查部门名称') && false } - if (this.mode === 'modify') { - // if (this.form.password || this.repassword) { - // // 密码 - // if (!(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/.test(this.form.password))) { - // return this.$message.warning('密码至少8个字符，至少1个大写字母，1个小写字母，1个数字') && false; - // } - // if (this.repassword !== this.form.password) { - // return this.$message.warning('请检查密码') && false; - // } - // } + if (!this.form.orgCode) { + return this.$message.warning('请检查部门编码') && false } - if (this.form.cellPhoneNumber && !(/^1[3|4|5|7|8|9][0-9]{9}$/.test(this.form.cellPhoneNumber))) { - return this.$message.warning('请检查手机号') && false - } - if (this.form.email && !(/^[\w-.]+@[a-z\d-]+(\.[a-z\d-]+)*\.[a-z\d]{2,6}$/i.test(this.form.email))) { - return this.$message.warning('请检查邮箱') && false - } - if (!this.form.roleIdList[0]) { - return this.$message.warning('请选择角色') && false - } - if (!this.form.usname) { - return this.$message.warning('请输入姓名') && false + if (!this.form.orgLevel || !(/^[a-zA-Z0-9]*$/.test(this.form.orgLevel))) { + return this.$message.warning('部门级别只能为纯数字') && false } return true }, // 新增用户 sysOrgAddOrg () { - // if (!this.checkUserForm()) return + if (!this.checkUserForm()) return const data = JSON.parse(JSON.stringify(this.form)) this.$api.org.sysOrgAddUser(data).then(_ => { diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 2ce7d25..a4ca0f6 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -59,7 +59,7 @@ -
+
diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue index 0c33145..90fe5b3 100644 --- a/src/views/System/dictionaryDetail.vue +++ b/src/views/System/dictionaryDetail.vue @@ -70,7 +70,7 @@
-
+
From d46756c71ec429b996aa588a130e81536669e046 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 16:05:37 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/System/Org.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue index ced6852..ed6ebb6 100644 --- a/src/views/System/Org.vue +++ b/src/views/System/Org.vue @@ -89,22 +89,22 @@ - + - + - + - + - + - + From fdde20bb1c36ba947c796ec534387cfb1da15674 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 16:52:21 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9ziti?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/waterMark.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/waterMark.js b/src/utils/waterMark.js index 6cbe521..5818d16 100644 --- a/src/utils/waterMark.js +++ b/src/utils/waterMark.js @@ -22,11 +22,12 @@ Vue.directive('watermark', { can.style.display = 'none' const cans = can.getContext('2d') cans.rotate(-20 * Math.PI / 180) - cans.font = font || '13px Microsoft Yahei' + cans.font = font || '13px Helvetica Neue' cans.fillStyle = textColor || 'rgba(100, 100, 100, 0.2)' cans.textAlign = 'left' cans.textBaseline = 'Middle' cans.fillText(str, fillTextX, can.height) + console.log(cans) // 设置背景图（整个项目中都添加水印建议使用此方法） // parentNode.style.backgroundImage = "url(" + can.toDataURL("image/png") + ")"; From 45f4373b1050c03b76a496acabad0b42baf68378 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 8 May 2023 10:45:10 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Report/ReportDetail.vue | 33 +++++++++++++++++++++++++- src/views/Report/ReportList.vue | 37 ++++++++++++++++++++++++++---- src/views/Report/ReportManager.vue | 2 +- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue index 7cb966b..04b1072 100644 --- a/src/views/Report/ReportDetail.vue +++ b/src/views/Report/ReportDetail.vue @@ -7,6 +7,10 @@
+ + +
{{ row.createUserName }}
+
{{ getKeyContent(row.keyContent) }}
@@ -19,6 +23,14 @@
{{ row.department || '-' }}
 + + +
{{ row.confidentialLevel || '-' }}
+ + + +
{{ row.labelList || '-' }}
+
@@ -28,6 +40,14 @@
+
+
+ 报告满意度: +
+
+
+ +
@@ -39,6 +59,7 @@ export default { name: 'ReportDetail', data () { return { + value1:'', watermarkText: '', // 水印 content: '', row: {} @@ -81,10 +102,13 @@ export default { // cancelButtonText: '取消', // type: 'warning' // }).then(() => { - this.$api.report.reportDownload({ fileId: row.fileId }).then(res => { + this.$api.report.reportDownload({ fileId: row.fileId,repostId:row.id }).then(res => { downloadFile(res) }) // }) + }, + saveScore(){ + } }, created () { @@ -179,6 +203,13 @@ export default { } } + .report-jug{ + display: flex; + .report-jug-left{ + display: flex; + padding-left: 10px; + } + } } diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index 59645ce..56bb9bf 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -97,8 +97,16 @@
- 权限申请 + + 权限申请 + +
+ 时间 + 点击量 + 下载量 +
+
@@ -172,16 +180,30 @@ + + - -