From 7de086cac6fcd647bce1d419ac4c80c28a914460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 27 Jan 2022 09:31:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step7.vue | 29 ++++++++++++++++- .../pages/creatProcess/bzpg/step8.vue | 31 +++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 471af52e5..239463f8c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -135,6 +135,15 @@ + + + + { + if(item.projectName === tab.name){ + this.dataList.push(item) + } + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -583,7 +604,13 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.newDataList = item.dataList this.dataList = item.dataList + item.dataList.forEach(item => { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) } else { this.listForm = item.form; this.dataList = item.form.dataList; @@ -594,7 +621,7 @@ export default { //提交事件 handleSubmit() { - this.listForm.dataList = this.dataList + this.listForm.dataList = this.newDataList this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index a8264ba86..4293a0906 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -1,4 +1,4 @@ - + - - + + Date: Thu, 27 Jan 2022 09:45:17 +0800 Subject: [PATCH 3/8] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 14 +++++++------- .../pages/creatProcess/bzjd/step1-6.vue | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 176dc863b..56ce7693a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -125,13 +125,6 @@ 查看条款内容 - - + + 查看条款内容 - - + + Date: Thu, 27 Jan 2022 16:59:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9E=84=E5=9B=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 237 ++++++++++++++---- .../pages/creatProcess/qbzxdlx/step2.vue | 226 +++++++++++++++-- 2 files changed, 394 insertions(+), 69 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 56a377757..f18eee83f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -50,7 +50,7 @@
- 新增 + 新增 上传 模板下载 删除 @@ -65,14 +65,19 @@ @selection-change="selectedDelete" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - - - - - + + + + + + + + @@ -98,7 +103,6 @@ @@ -117,7 +121,7 @@

责任人

- +
@@ -130,18 +134,53 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + +
取消 @@ -172,7 +211,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst } from '@/api/process.js' +import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst} from '@/api/process.js' export default { components: { @@ -193,8 +232,8 @@ export default { qblxRule: {}, roleForm: { - startUser: '', - startUserName: '', + startUserName: this.$store.getters.userInfo.userName, + startUser: this.$store.getters.userInfo.userId, dockUser: '', dockUserName: '', }, @@ -205,16 +244,21 @@ export default { fillFileList: [], // 新增弹框 + qblxTitle: '', + btnType: '', qblxModel: false, addQblxData: { esName: '', dutyUnit: '', + dutyPeopleId: '', dutyPeople: '', firstDraftTime: '', planTime: '', endTime: '', }, - addRule: {}, + addRule: { + dutyPeople: [{required: true, message: '请选择责任人', trigger: ['blur', 'change']}] + }, isSubmit: false, saveLoading: false, @@ -225,6 +269,15 @@ export default { taskID: '', bpnId: '', + + // 表格勾选数据储存 + deleteDataList: [], + // 设置当前日期之前不可选择 + datePicker: { + disabledDate(date) { + return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 + } + } } }, @@ -315,7 +368,8 @@ export default { }, // 表格勾选事件 - selectedDelete() { + selectedDelete(val) { + this.deleteDataList = val }, // 流程阶段负责人选择 @@ -323,24 +377,90 @@ export default { this.nodeList = [] this.nodeList.push(id) this.type = type - this.drawerTitle = title this.modalshowflag = true }, // 选人组件确认 drawerCheck(data) { - this.roleForm.dockUser = data[0].id - this.roleForm.dockUserName = data[0].name + this.addQblxData.dutyPeopleId = data[0].id + this.addQblxData.dutyPeople = data[0].name this.modalshowflag = false }, /** 新增按钮 */ - addQblx() { + addQblx(type,title) { + this.btnType = type + this.qblxTitle = title this.qblxModel = true }, // 抽屉确认按钮 - OkDrawer() {}, + OkDrawer() { + this.$refs['addQblxData'].validate((valid) => { + if (valid) { + if (this.btnType === 'add') { + this.qblx_pageData.qblxData.push(this.addQblxData) + } + this.addQblxData = {} + this.qblxModel = false + } + }) + }, // 抽屉取消按钮 - closeDrawer() {}, + closeDrawer() { + if (this.btnType === 'edit') { + let Items = JSON.parse(localStorage.getItem('obj')) + this.addQblxData.esName = Items.esName + this.addQblxData.dutyUnit = Items.dutyUnit + this.addQblxData.dutyPeopleId = Items.dutyPeopleId + this.addQblxData.dutyPeople = Items.dutyPeople + this.addQblxData.firstDraftTime = Items.firstDraftTime + this.addQblxData.planTime = Items.planTime + this.addQblxData.endTime = Items.endTime + } else { + this.addQblxData = {} + } + this.qblxModel = false + }, + + editRow(type,title,val) { + this.btnType = type + this.qblxTitle = title + localStorage.setItem('obj', JSON.stringify(val)) + this.addQblxData = val + this.qblxModel = true + }, + /** 删除按钮*/ + delQblx() { + if (this.deleteDataList.length < 1) { + this.$message.warning("请选择一条数据进行删除"); + } else { + this.$confirm("您确认删除这些数据?", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let exits = []; + this.deleteDataList.map(item => { + let index; + index = this.qblx_pageData.qblxData.findIndex(items => { + return items === item; + }); + if (index > -1) { + this.qblx_pageData.qblxData.splice(index, 1); + } + exits.push(item); + }); + this.deleteDataList = []; + }).catch(() => { + }); + } + }, + + /** 数据上传到列表 */ + uploadQblx() {}, + + /** 模板下载 */ + qblxTemplate() {}, // 保存按钮 handleSave() { this.saveLoading = true @@ -368,7 +488,6 @@ export default { let json = { prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUserName: this.$store.getters.userInfo.userName, - roleForm: this.roleForm, qblx_pageData: this.qblx_pageData, commentText: this.commentText } @@ -386,23 +505,37 @@ export default { processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskID) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res => { - return res - }) - } - this.$router.push("/processCenter"); + this.qblx_pageData.qblxData.forEach((item, index) => { + let newJson = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + qblx_pageData: { + projectTarget: this.qblx_pageData.projectTarget, + qblxFile: this.qblx_pageData.qblxFile, + qblxData: item, + }, + commentText: this.commentText } - this.isSubmit = false + params.set('json', JSON.stringify(newJson)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskID) + completeTask(params).then(res => { + if (res.success === true) { + if (index === this.qblx_pageData.qblxData.length) { + this.$message.success('提交成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + } + this.$router.push("/processCenter"); + } + } + this.isSubmit = false + }) }) }) } else { @@ -425,10 +558,11 @@ export default { position: relative; height: 100%; - /deep/.el-upload-list__item-name { + /deep/ .el-upload-list__item-name { margin-left: 48px; } - /deep/.el-upload-list { + + /deep/ .el-upload-list { width: 50%; margin-bottom: 10px; } @@ -500,10 +634,23 @@ export default { /deep/ .el-textarea__inner { font-family: inherit; } + /deep/ .el-table th { padding: 0px; } } + + .picker_style { + margin-left: 10px; + margin-bottom: 0; + min-height: 50px; + line-height: 50px; + border-bottom: 1px dashed #e5e5e5; + /deep/.el-input__inner{ + border: 0; + } + } + } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 0f498ab5b..9383de57d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -1,12 +1,12 @@