From a07d22f12efdaef3761499572f1cba89d3bfdcf6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 23 Sep 2021 10:46:24 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=8F=90=E4=BA=A4=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=A4=B1=E8=B4=A5=E5=90=8E=E4=B8=8D=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fe724dbf5..aa2af7797 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -93,7 +93,7 @@ - + { if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.form.country=this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -2395,7 +2397,7 @@ this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.countryOptions=res.data.COUNTRY//国家地区 + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 From a39f8aec84c148e426d0ccf1078891204beca3b1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 23 Sep 2021 11:06:03 +0800 Subject: [PATCH 02/21] =?UTF-8?q?table=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index e1738e66c..4649eb652 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -87,7 +87,7 @@ ref="multipleTable" :data="localProTableList" tooltip-effect="dark" - style="width: 100%;height: calc(100% - 150px)" + style="width: 100%;overflow-y: scroll; height: calc(100% - 150px)" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px', fontWeight: 'normal', height: '48px'}" @@ -191,7 +191,7 @@ @@ -360,7 +381,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process"; export default { name: "xmpgStep1-7", @@ -373,6 +394,11 @@ export default { return { //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, + nodeList:[], + drawerTitle:'', + isTransfer: false, + // 调整处理人抽屉状态 + drawerModal: false, detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -451,6 +477,47 @@ export default { foldForm() { this.foldFormFlag = !this.foldFormFlag }, + //确认转办 + checkedTransferRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, + // 请求转换流程图 + processNum (row) { + axios.request({ + url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), + responseType: 'blob', + method: 'get', + params: { + prcNum: this.$route.query.prcNum + } + }).then(res => { + // let blob = new Blob([res.data], {type: 'image/jpg'}) + // let url = window.URL.createObjectURL(res.data) + this.processStep = window.URL.createObjectURL(res.data) + }) + }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -517,35 +584,31 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; - this.listForm.dataList = this.dataList - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; + this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + this.listForm.zrUserId = this.$store.getters.userInfo.userId ; + this.listForm.commentText = this.commentText; + this.listForm.standId = this.listForm.standId; + this.listForm.fenFlag = "1"; + this.listForm.dataList = this.dataList + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { - }); - } + }); }, //标准表格选择框改变 selectStandChange(data) { @@ -580,7 +643,6 @@ export default { From 28649dcadec41d94a27524c2f2513af763c9d8ac Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 23 Sep 2021 15:28:20 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E6=94=B6=E8=97=8F=20=E8=BF=87=E9=95=BF=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f58115107..78cdfd35b 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -40,26 +40,42 @@