From b2f7e17576adecea0792add719846dd9974b19b9 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Wed, 15 Sep 2021 17:50:42 +0800
Subject: [PATCH 1/3] commit
---
.../pages/creatProcess/bzdy/step2.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step3.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step4.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step5.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step6.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step7.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step8.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzdy/step9.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzjd/step2.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzjd/step3.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzjd/step4.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzjd/step5.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzjd/step6.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step2.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step3.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step4.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step5.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step6.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step7.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step8.vue | 45 ++++++++++++++++++-
.../pages/creatProcess/bzzqyj/step9.vue | 45 ++++++++++++++++++-
src/sysConfig/index.js | 4 +-
22 files changed, 926 insertions(+), 23 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index 97069d856..a7974a795 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -154,9 +154,17 @@
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
+ show-transfer
+ @transfer="handleTransfer"
@submit="handleSubmit"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index c43e7f9f6..573bbe5b5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -181,10 +181,18 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index d1e942968..330f6ecde 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -181,10 +181,18 @@
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
+ show-transfer
+ @transfer="handleTransfer"
approval
submitBTNText="同意"
>
+
@@ -192,12 +200,14 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+ import axios from "axios";
export default {
name: "bzdyStep4",
data() {
return {
+ drawerModal: false,
foldFormFlag: false,
histortData: [],
commentText: '',
@@ -234,6 +244,39 @@
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 5b8b83f88..3a5c40337 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -181,10 +181,18 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 37bc0fe66..a358b5730 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -178,10 +178,18 @@
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 425a57a14..8eab163dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -178,10 +178,18 @@
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 42d73606b..d846bed34 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -178,10 +178,18 @@
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
+ show-transfer
+ @transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 40188ff62..c8b978be7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -178,10 +178,18 @@
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index fda339a9b..57bba8b32 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -258,10 +258,18 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index a4c271a0b..78a652431 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -344,10 +344,18 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index f93a932a5..47f1c8eb5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -318,9 +318,17 @@
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
+ show-transfer
+ @transfer="handleTransfer"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 3975423c0..b4cccc98a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -315,11 +315,19 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ show-transfer
+ @transfer="handleTransfer"
show-back
@back="handleSubmitNo"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 58c400199..02f61090d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -316,9 +316,17 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ show-transfer
+ @transfer="handleTransfer"
submitBTNText="同意"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index b0c3ffbd5..5ecec3818 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -149,8 +149,16 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ show-transfer
+ @transfer="handleTransfer"
>
+
{
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index d134c589b..cb6eb7584 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -221,8 +221,16 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ show-transfer
+ @transfer="handleTransfer"
>
+
@@ -230,12 +238,14 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+ import axios from "axios";
export default {
name: "bzzqyjStep3",
data() {
return {
+ drawerModal: false,
histortData: [],
idList: [],
data: [],
@@ -278,6 +288,39 @@
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 3b464f68c..e1b712ae0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -195,6 +195,8 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ show-transfer
+ @transfer="handleTransfer"
@save="handleSave"
@submit="handleSubmit"
show-back
@@ -203,6 +205,12 @@
submitBTNText="同意"
>
+
@@ -210,12 +218,14 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+ import axios from "axios";
export default {
name: "bzzqyjStep4",
data() {
return {
+ drawerModal: false,
histortData: [],
data: [],
commentText: '',
@@ -257,6 +267,39 @@
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index c7688ae01..e46fd2f85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -239,8 +239,16 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ show-transfer
+ @transfer="handleTransfer"
>
+
@@ -248,12 +256,14 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew } from "api/process";
+import axios from "axios";
export default {
name: "bzzqyjStep5",
data() {
return {
+ drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -296,6 +306,39 @@ export default {
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index bc6e8f871..8d500a7a3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -218,10 +218,18 @@
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
+ show-transfer
+ @transfer="handleTransfer"
approval
submitBTNText="同意"
>
+
@@ -229,12 +237,14 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import axios from "axios";
export default {
name: "bzzqyjStep6",
data() {
return {
+ drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -280,6 +290,39 @@ export default {
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 2d116fc5f..985625407 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -215,11 +215,19 @@
@save="handleSave"
@submit="handleSubmit"
show-back
+ show-transfer
+ @transfer="handleTransfer"
@back="handleSubmitNo"
approval
submitBTNText="同意"
>
+
@@ -227,12 +235,14 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+ import axios from "axios";
export default {
name: "bzzqyjStep7",
data() {
return {
+ drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -275,6 +285,39 @@
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 75efde0eb..55f6d84dc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -216,10 +216,18 @@
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
+ show-transfer
+ @transfer="handleTransfer"
approval
submitBTNText="同意"
>
+
@@ -227,12 +235,14 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+ import axios from "axios";
export default {
name: "bzzqyjStep8",
data() {
return {
+ drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -275,6 +285,39 @@
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 2fb277a75..9f0f45287 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -220,8 +220,16 @@
@back="handleSubmitNo"
approval
submitBTNText="同意"
+ show-transfer
+ @transfer="handleTransfer"
>
+
@@ -229,12 +237,14 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import axios from "axios";
export default {
name: "bzzqyjStep9",
data() {
return {
+ drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -277,6 +287,39 @@ export default {
ProcessTitle
},
methods: {
+ handleTransfer() {
+ this.drawerModal = true
+ },
+ checkedRole (data) {
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.userId, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.processNum()
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ } 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 => {
+ this.processStep = window.URL.createObjectURL(res.data)
+ })
+ },
updataFj (item) {
let id
let type = item.fileName.split('.')
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d3cd25a02..7cb8e2ea1 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,8 +4,8 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
-const devIp = '10.96.10.171'
-const devInterfacePORT = '9999'
+const devIp = '62.234.136.153'
+const devInterfacePORT = '8033'
// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
// 云端端口号
From 20e25c7e059ea7706eaece7f9202e6b5ee88660b Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 15 Sep 2021 17:59:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?=
=?UTF-8?q?=E5=B7=B2=E8=A2=AB=E5=88=86=E8=A7=A3=E7=9A=84=E7=9A=84=E6=96=87?=
=?UTF-8?q?=E6=9C=AC=E6=89=8D=E6=9C=89=E5=88=86=E8=A7=A3=E5=8D=95=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../details/otherStandardDetails/index.vue | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 08138be9c..3b0df04a6 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -408,12 +408,14 @@
标准分解单
+
@@ -519,6 +521,7 @@
{{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
-
{
this.sarStandardsInfoEO = res.data || {}
+ this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
+ console.log("hllo",this.sarStandardsInfoEO);
if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
}
@@ -2343,13 +2351,18 @@ export default {
}.bind(this)
})
},
+ sort(column){
+ this.order=column.order;
+ this.orderBy=column.prop;
+ this.selectSarStandItems();
+ },
// 分解单----查看标准条款相关
selectSarStandItems(id, flag) {
this.standItemSearch.standId = this.sarStandardsInfoEO.id
this.standItemSearch.fileType = this.fileType
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
...this.standItemSearch,
- pageSize: this.pageSize7, page: this.page7,
+ pageSize: this.pageSize7, page: this.page7,order:this.order,orderBy:this.orderBy
}, {}, res => {
this.selectedItemList = []
if (res.ok) {
From 70e24768f9e45ee9719266e95d0243f791a430ac Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 16 Sep 2021 09:10:18 +0800
Subject: [PATCH 3/3] commit
---
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 1 -
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 93f53c890..5f03b0a46 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -250,7 +250,6 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from "api/process";
import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew } from "api/process";
import axios from "axios";
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 2e45e0e3e..76ea31aa2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -231,7 +231,6 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, processCreateStand} from "api/process";
import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
import axios from "axios";