From d1af3737d39946a9e0f967d355e77125eb4c480c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 15 Feb 2022 11:09:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=90=BD=E5=AE=9E=E4=BA=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzpg/step4.vue | 45 ++++++++++++-------
1 file changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 406c19d4b..b36091c4b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -424,27 +424,38 @@ export default {
},
//提交
handleSubmit(){
+ let comFlag = false
this.dataList.map(item => {
delete item.termsConditions
})
- this.listForm.commentText = this.commentText
- 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.dataList.forEach(item => {
+ if(item.implementer){
+ comFlag = true
+ return
}
- this.isSubmit = false
- }, e => {
- });
+ })
+ if(!comFlag){
+ this.$message.warning('请选择落实人')
+ }else{
+ this.listForm.commentText = this.commentText
+ 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 => {
+ });
+ }
},
//确认转办
checkedRole (data) {
From 324ae1bdd5fa4a2a53070c993dee3f734431a5e1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 15 Feb 2022 11:29:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9=E5=8D=95=E5=9C=A8=E7=BA=BF?=
=?UTF-8?q?=E7=BC=96=E8=BE=91=20=E6=8E=A5=E5=8F=A3=20=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/qbzxdjhgk/component/establish.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 4770f5fb6..47d288c5e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -564,7 +564,9 @@ export default {
this.qcdwOptions = res.data.QCDW // 起草单位
})
if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
- this.$http.get('/lawss/activiti/saveEditFile', '',{
+ this.$http.get('/lawss/activiti/saveEditFile', {
+ model: 'model_lx'
+ },{
_this: this
}, res => {
console.log(res)
From a2e50a629de5bba78a663d5ff443b764cfc24d00 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 15 Feb 2022 14:43:19 +0800
Subject: [PATCH 3/4] feat: There is no way the,
---
.../processCenter/pages/creatProcess/qbrk-product/step3.vue | 4 ++++
.../processCenter/pages/creatProcess/qbrk-product/step6.vue | 4 ++++
.../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 4 ++++
.../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 4 ++++
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 4 ++++
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 4 ++++
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 4 ++++
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 4 ++++
8 files changed, 32 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 9fe9c268a..217bdb1e8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -1380,6 +1380,10 @@
this.form.QCDW = institutionNameList
}
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index d5d21c68e..6931e578f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -1472,6 +1472,10 @@
this.form.QCDW = institutionNameList
}
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 258e725dd..14c79c17f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -1381,6 +1381,10 @@
this.form.QCDW = institutionNameList
}
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index dc92c7d41..20eadf631 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -1472,6 +1472,10 @@
this.form.QCDW = institutionNameList
}
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 686758f8f..9b7ccb127 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1349,6 +1349,10 @@
this.modalShowRoleFlag = false
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index b83fd0990..c4c5eba51 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -1692,6 +1692,10 @@
this.modalShowRoleFlag = false
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index dd12635bb..6981af921 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -1349,6 +1349,10 @@
this.modalShowRoleFlag = false
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 09b1ced95..53ff41365 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -1692,6 +1692,10 @@
this.modalShowRoleFlag = false
},
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+ },
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
From 01c5f13d3708516dbd03a3ff0c22ebca2b695560 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 15 Feb 2022 15:55:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
=?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/onlineEdit/index.js | 2 +-
.../creatProcess/qbfs/common/formList.vue | 109 ++++++++++++--
.../pages/creatProcess/qbfs/step2.vue | 8 +-
.../pages/creatProcess/qbfs/step3.vue | 141 +++++++++++++++++-
4 files changed, 240 insertions(+), 20 deletions(-)
diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js
index 7b1eff3d1..b8866bd2c 100644
--- a/src/common/onlineEdit/index.js
+++ b/src/common/onlineEdit/index.js
@@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => {
editFileInfo.pId = editFileInfo.pid
}
const nowTime = new Date().getTime()
- window.open(onlyOfficeUrl+'/editor?pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+ window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
}
}).catch(e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index 540042375..127b8576a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -192,14 +192,8 @@