From 70cd1523442e8623dd31c6a73fa9527afc4dd259 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 24 May 2022 17:04:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/home2/components/todoList/index.vue | 15 ++-------
.../pages/creatProcess/qbfz/step1.vue | 33 +++++++++++--------
.../pages/creatProcess/qbfz/step3.vue | 5 ++-
.../pages/creatProcess/qbfz/step4.vue | 21 ++++++++----
.../pages/creatProcess/qbfz/step5.vue | 24 ++++++++++----
.../pages/creatProcess/qbfz/step6.vue | 20 ++++++++---
.../pages/creatProcess/qbfz/step7.vue | 20 ++++++++---
.../tabComponents/processCenter/index.vue | 24 ++------------
8 files changed, 90 insertions(+), 72 deletions(-)
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 77b06c4c5..f5df18b37 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -1584,18 +1584,7 @@ export default {
}
break
case '24':
- if (row.taskInfo === '标准法规部部长审核') {
- this.$router.push({
- name: 'qbfzStep2',
- query:{
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- } else if(row.taskInfo === '会签') {
+ if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -1617,7 +1606,7 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '标准法规部部长审核1') {
+ } else if(row.taskInfo === '审核') {
this.$router.push({
name: 'qbfzStep5',
query:{
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index 43cdc71f1..b03f504e5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -138,20 +138,6 @@
-
-
-
- 标准法规部部长
-
-
-
-
-
-
-
-
@@ -166,6 +152,20 @@
+
+
+
+ 标准法规部部长
+
+
+
+
+
+
+
+
@@ -596,6 +596,7 @@ export default {
},
//流程保存
handleSave(){
+ this.isSubmit = true
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
@@ -608,10 +609,12 @@ export default {
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
+ this.isSubmit = false
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
+ this.isSubmit = false
this.saveLoading = false
})
},
@@ -624,6 +627,7 @@ export default {
if (valid) {
if (this.$route.query.type == '2') {
this.isSubmit = true
+ this.saveLoading = true
this.standardSearch.commentText = this.commentText
var json = Object.assign( this.roleForm,this.standardSearch)
this.$http.post('lawss/activiti/completeTaskNew', {
@@ -641,6 +645,7 @@ export default {
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
+ this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
index b402b6ffe..07e0f33cc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
@@ -354,6 +354,8 @@ export default {
},
//确认转办
checkedRoles (data) {
+ this.isTransfer = true;
+ this.isSubmit = true;
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -361,7 +363,8 @@ export default {
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
- this.isTransfer = false
+ this.isTransfer = false;
+ this.isSubmit = false;
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
index 0c89e09c7..85cb34129 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
@@ -64,6 +64,14 @@
clearable
>
+
+
+
@@ -125,19 +133,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
-
@@ -284,7 +289,8 @@ export default {
releaseDate: "",
implementDate: "",
reviewDate: "",
- nextStatus: ""
+ nextStatus: "",
+ nextStatusDetils: ""
},
formRules: {
nextStatus: [
@@ -397,6 +403,8 @@ export default {
},
//确认转办
checkedRole(data) {
+ this.isTransfer = true;
+ this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -405,6 +413,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
+ this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index 6b7b536db..c0a755785 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -64,6 +64,15 @@
clearable
>
+
+
+
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
-
@@ -231,8 +237,9 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ :isSubmitBack="isSubmit"
:approval="true"
- @back="beforeBack"
+ @over2="beforeBack"
@transfer="handleTransfer"
@submit="handleSubmit"
>
@@ -386,6 +393,7 @@ export default {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
this.isSubmit = true;
+ this.isTransfer = true;
this.qbfsForm.commentText = this.commentText;
this.qbfsForm.bzFlag = '0'
this.qbfsForm.dataList = this.dataList;
@@ -402,6 +410,7 @@ export default {
this.$router.push("/processCenter");
}
this.isSubmit = false;
+ this.isTransfer = false;
}, e => {
});
}else{
@@ -424,6 +433,8 @@ export default {
},
//确认转办
checkedRole(data) {
+ this.isTransfer = true;
+ this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +443,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
+ this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
index 72b7edc9c..da472f3ef 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
@@ -64,6 +64,15 @@
clearable
>
+
+
+
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
-
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ :isSubmitBack="isSubmit"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
},
//确认转办
checkedRole(data) {
+ this.isTransfer = true;
+ this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
+ this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 830ce13e4..5e5b20554 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -64,6 +64,15 @@
clearable
>
+
+
+
@@ -125,19 +134,16 @@
style="width: 100%;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
-
@@ -231,6 +237,7 @@
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
+ :isSubmitBack="isSubmit"
:approval="true"
@back="beforeBack"
@transfer="handleTransfer"
@@ -424,6 +431,8 @@ export default {
},
//确认转办
checkedRole(data) {
+ this.isTransfer = true;
+ this.isSubmit = true;
this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -432,6 +441,7 @@ export default {
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false;
+ this.isSubmit = false;
if (res.success) {
this.drawerModal = false;
this.$message.success("调整成功");
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index daa94b6d6..b94d0dfe6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -2072,27 +2072,7 @@ export default {
}
break
case '24':
- if (row.taskInfo === '标准法规部部长审核') {
- this.$router.push({
- name: 'qbfzStep2',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- } else if (row.taskInfo === '重新起草') {
- this.$router.push({
- name: 'qbfzStep1',
- query:{
- type: 2,
- taskIds: row.taskIds,
- prcId: row.prcId
- }
- })
- } else if(row.taskInfo === '会签') {
+ if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -2114,7 +2094,7 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '标准法规部部长审核1') {
+ } else if(row.taskInfo === '审核') {
this.$router.push({
name: 'qbfzStep5',
query:{