diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 1ba207ed8..43d5cfd60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -37,18 +37,19 @@ clearable > - -
-

{{ listForm.modelName }} + +

+

{{ item.name }} @@ -204,6 +205,15 @@ 流程列表加载中

+ + + @@ -211,7 +221,8 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; + export default { name: "bzqdfbStep1-4", components: { @@ -221,6 +232,11 @@ export default { }, data() { return { + nodeList:[], + isTransfer: false, + drawerTitle:'', + // 调整处理人抽屉状态 + drawerModal: false, detailData: [], // 当前流程类型(1待办/2已办) processType: 1, @@ -236,10 +252,12 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -274,6 +292,47 @@ export default { }; }, methods: { + //确认转办 + checkedRole (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, @@ -337,6 +396,15 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') + item.fileName.forEach(itemId => { + this.fileIds = itemId.id + this.getFileInfo(); + }) }); }, // 请求上传的文件信息 @@ -346,11 +414,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -378,18 +450,13 @@ export default { } } }, - //驳回事件 + // 驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); - } else { + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.listForm.approvalOpinion = "1"; - this.handleSubmit(); - } - }, - //提交事件 - handleSubmit() { - this.isSubmit = true + this.saveLoading = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -403,8 +470,29 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.saveLoading = false }); + }/**/ + }, + //提交事件 + handleSubmit() { + this.isSubmit = true; + this.listForm.approvalOpinion = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + 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 + }); }, //选择标准取消事件 closeDrawer() { @@ -465,6 +553,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 6179964e5..a3a4344c8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -191,7 +191,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" @@ -499,7 +499,6 @@ export default { }, res => { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -840,6 +839,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index ab4dd630f..093914c98 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -59,6 +59,7 @@ 选择清单 { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -834,6 +839,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue index 042cae413..43db410b6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue @@ -137,7 +137,7 @@
- +
- - - {{ opt.label }} - - + + + + + + +