From d1b360b63d72ca51a095b7b63aea608445856bae Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Fri, 8 Sep 2023 16:12:42 +0800 Subject: [PATCH 1/2] 9.8 --- .../src/router/modules/codemenu.js | 7 + .../src/views/Yjsq/AddYjsq.vue | 12 +- .../src/views/Yjsq/LookYzsq/index.vue | 393 ++++++++++++++++++ .../src/views/Yjsq/index.vue | 38 +- 4 files changed, 437 insertions(+), 13 deletions(-) create mode 100644 supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue diff --git a/supervise-enterprise-ui/src/router/modules/codemenu.js b/supervise-enterprise-ui/src/router/modules/codemenu.js index 40644b04..70bc5357 100644 --- a/supervise-enterprise-ui/src/router/modules/codemenu.js +++ b/supervise-enterprise-ui/src/router/modules/codemenu.js @@ -456,6 +456,13 @@ const codemenu = [{ import('@/views/paichanguanliFlow/paichanguanli/haveDone.vue'), name: 'haveDone' }, + // 代办的编辑 + { + path: '/LookYzsq/index', + component: () => + import('@/views/Yjsq/LookYzsq/index.vue'), + name: 'LookYzsq' + }, ] export default codemenu diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue index e5d5e4ad..16ece9e8 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue @@ -214,7 +214,9 @@ } }, created() { - this.userSid = window.sessionStorage.getItem('userSid') + this.formobj.user_sid = window.sessionStorage.getItem('userSid') + this.formobj.project_name=this.projectName + this.formobj.project_sid=this.projectSid }, watch: { imgList:{ @@ -231,9 +233,6 @@ }, methods: { saveOrUpdate() { - this.formobj.project_name=this.projectName - this.formobj.project_sid=this.projectSid - this.userSid = window.sessionStorage.getItem('userSid') this.backcheckList() if (this.formobj.sid) { req.sealrecordSave(this.formobj) @@ -271,9 +270,6 @@ }, saveSubmit(){ - this.formobj.project_name=this.projectName - this.formobj.project_sid=this.projectSid - this.userSid = window.sessionStorage.getItem('userSid') this.backcheckList() req.sealrecordSubmit(this.formobj) .then(resp => { @@ -304,7 +300,7 @@ this.title= "【修改】印鉴信息" req.fetchDetailsBySid(row).then((res)=>{ if(res.code==200){ - // this.formobj.project_sid=res.data.project_sid + this.formobj.project_sid=res.data.project_sid this.formobj.sid=res.data.sid this.formobj.project_name=res.data.project_name this.formobj.code=res.data.code diff --git a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue new file mode 100644 index 00000000..2effdcf7 --- /dev/null +++ b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue @@ -0,0 +1,393 @@ + + + + + \ No newline at end of file diff --git a/supervise-enterprise-ui/src/views/Yjsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/index.vue index 55c92b3a..f24663c8 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/index.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/index.vue @@ -131,6 +131,7 @@ total: 0, viewState: 1, sids:'', + userSid:'', listQuerys: { current: 1, size: 10, @@ -233,14 +234,25 @@ }, // 打开办理 toEdit() { - if(this.state==''){ + var usSid=window.sessionStorage.getItem('userSid') + if(this.state=='待提交' && this.userSid==usSid || this.state=='用章申请' && this.userSid==usSid){ this.viewState = 3 this.$refs['divAdd'].showEdit(this.sids) - }else{ + }else if(this.state!='待提交' && this.state!='用章申请' && this.userSid==usSid && this.state!=''){ this.$message({ message: '已提交，不能继续办理', type: 'warning' - }); + }); + }else if(this.state=='待提交' && this.userSid!=usSid || this.state=='用章申请' && this.userSid!=usSid){ + this.$message({ + message: '非本人发起的申请，无权限操作', + type: 'warning' + }); + }else if(this.state=='终止'){ + this.$message({ + message: '该印鉴信息已终止，您无法办理', + type: 'warning' + }); } }, /** 流程流转记录 */ @@ -279,10 +291,14 @@ }) }, handleSelectionChange(row) { + this.sids = '' + this.state = '' + this.userSid = '' const aa = [] row.forEach((element) => { this.sids = element.sid this.state = element.nodeState + this.userSid = element.user_sid }) if (row.length > 1) { this.$refs.Table.clearSelection() @@ -293,8 +309,9 @@ doDel() { const sids = [] sids.push(this.sids) - const tip = '请确认是否删除所选记录?' - this.$confirm(tip, '提示', { + if(this.sids && this.state=='待提交'){ + const tip = '请确认是否删除所选记录?' + this.$confirm(tip, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -306,6 +323,17 @@ } }) }) + }else if(this.state!='待提交' && this.state!=''){ + this.$message({ + message: '已提交的印鉴信息无法删除', + type: 'warning' + }); + }else{ + this.$message({ + message: '请选择要删除的印鉴信息', + type: 'warning' + }); + } }, resetState() { this.viewState = 1 From 786f7a98cce6ac6cc51be052816767a5cdcf8ae6 Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Fri, 8 Sep 2023 16:55:47 +0800 Subject: [PATCH 2/2] 9.8 --- .../src/views/Yjsq/AddYjsq.vue | 23 +++++++++++++++---- .../src/views/Yjsq/LookYzsq/index.vue | 9 +------- supervise-portal-ui/src/store/modules/user.js | 4 +++- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue index 16ece9e8..9632d161 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue @@ -23,7 +23,9 @@ - {{ projectName }} + + + @@ -204,19 +206,17 @@ }, industryAllList: [], industryList: [], - projectName:'heps', - projectSid:'51be22ac-4944-4ccb-a4d3-fce5740b814f', userSid:'', imgList: [], msg:[], checkList:[], + projectSidList:[] } }, created() { this.formobj.user_sid = window.sessionStorage.getItem('userSid') - this.formobj.project_name=this.projectName - this.formobj.project_sid=this.projectSid + this.projectSidList= JSON.parse(window.sessionStorage.getItem("projectSidList")); }, watch: { imgList:{ @@ -340,6 +340,19 @@ var List=str.replace(/^,+/, ''); this.formobj.seal_type = List }, + changeOrgDept(value) { + let bb = {} + this.projectSidList.forEach((e) => { + if (e.entryName === value) { + bb = { + entryName: e.entryName, + sid: e.sid + } + } + }) + this.formobj.project_sid = bb.sid + this.formobj.project_name = bb.entryName + }, getHangYe(value) { const choose = this.industryList.filter((item) => item.dictKey === value) this.formobj.industryName = choose[0].dictValue diff --git a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue index 2effdcf7..38e451a2 100644 --- a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue +++ b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue @@ -202,8 +202,6 @@ }, industryAllList: [], industryList: [], - projectName:'heps', - projectSid:'51be22ac-4944-4ccb-a4d3-fce5740b814f', userSid:'', imgList: [], msg:[], @@ -233,9 +231,6 @@ }, methods: { saveOrUpdate() { - this.formobj.project_name=this.projectName - this.formobj.project_sid=this.projectSid - this.formobj.user_sid = '164ec725-0b27-489c-974f-18d46de7bcfb' this.backcheckList() if( this.formobj.sid){ req.sealrecordSave(this.formobj) @@ -256,9 +251,6 @@ } }, saveSubmit(){ - this.formobj.project_name=this.projectName - this.formobj.project_sid=this.projectSid - this.formobj.user_sid = '164ec725-0b27-489c-974f-18d46de7bcfb' this.backcheckList() req.sealrecordSubmit(this.formobj) .then(resp => { @@ -286,6 +278,7 @@ req.fetchDetailsBySid(sid).then((res)=>{ if(res.code==200){ this.formobj.project_sid=res.data.project_sid + this.formobj.project_name=res.data.project_name this.formobj.sid=res.data.sid this.formobj.project_name=res.data.project_name this.formobj.code=res.data.code diff --git a/supervise-portal-ui/src/store/modules/user.js b/supervise-portal-ui/src/store/modules/user.js index a5c891d5..636dc0af 100644 --- a/supervise-portal-ui/src/store/modules/user.js +++ b/supervise-portal-ui/src/store/modules/user.js @@ -43,8 +43,9 @@ const actions = { pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName, roleName: data.roleName, defaultOrgPathName: data.defaultOrgPathName, - defaultOrgPath: data.defaultOrgPath + defaultOrgPath: data.defaultOrgPath, } + let projectSidList=data.projectSidList commit('SET_UESRINFO', user) window.sessionStorage.setItem('userSid', user.userSid) window.sessionStorage.setItem('Orgname', user.Orgname) @@ -54,6 +55,7 @@ const actions = { window.sessionStorage.setItem('roleName', user.roleName) window.sessionStorage.setItem('defaultOrgPathName', user.defaultOrgPathName) window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath) + window.sessionStorage.setItem("projectSidList",JSON.stringify(projectSidList)); resolve(data) }).catch(error => { reject(error)