From 40a8cac2c83e4c37a99005fdf7fdc46cf548b782 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 09:20:05 +0800 Subject: [PATCH 1/2] commit --- .../pages/creatProcess/bzzqyj/step1-9.vue | 49 ------------------- 1 file changed, 49 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index dc34bc316..e7faf9028 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -14,7 +14,6 @@ @@ -265,18 +264,6 @@ export default { commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], - type: '', - defaultProps: { - children: 'children', - label: 'name' - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 - drawerTitle: '', //drawer标题 - textarea: '', // 意见 - ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 isSubmit: false, saveLoading: false, @@ -290,11 +277,6 @@ export default { modelList: [], modelNameList: '', }, - formRules: { - responUserList: [ - { required: true, message: '请选择责任人', trigger: 'change' }, - ] - }, json: {} } }, @@ -323,16 +305,6 @@ export default { this.$message.warning('文件不存在,下载失败') } }, - updataFj (item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) - }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -384,27 +356,6 @@ export default { handleTabs(name) { this.active = name }, - handleSubmitNo() { - if (this.commentText) { - this.isSubmit = true - var json = this.json - json.actionFlag = 1 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskIds: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('驳回成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } else { - this.$message.warning('请输入反馈意见') - } - }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ From 19f09e2309eb37ce34e284ccde93abc6904f72a1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 6 Jan 2022 10:03:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/mechanismManage/index.vue | 68 +++++++++++++++---- .../page/listProject.vue | 2 +- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 6f613fbf6..3e8039de6 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -68,6 +68,12 @@ 清空 + + + + 批量配置岗位 + + + 导入中... { - if (res.ok) { - this.$message.success('配置岗位成功') - this.modalPost = false - this.getData() - } - }) + if (this.drawerTitle === '配置岗位') { + this.$http.postData('sarUser/user/position', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } else { + this.$http.postData('sarUser/user/positionBatch', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } + }, searchPostName() { this.page = 1; @@ -407,7 +436,6 @@ export default { loading: 'treeLoading' }, res => { this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.$nextTick(function () { this.$refs.tree.setCurrentKey(this.nodeKeyId) @@ -493,6 +521,20 @@ export default { this.pageSize = pageSize this.getTree2() }, + + /** 批量编辑岗位的勾选数据 */ + selectedData(val) { + this.manageData = val + }, + + selectEdit() { + this.userId = [] + this.manageData.forEach(item=>{ + this.userId.push(item.userId) + }) + this.drawerTitle = '批量配置岗位' + this.modalPost = true + }, }, computed: {}, watch: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 2cdd5f528..f3cc934b5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -314,7 +314,7 @@ export default { }, //清空 clearSearch() { - this.sarSarAccessEOSearch.projectName = '' + this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess()