From 9ed13dc09fe5c0b304be2624e5d33796efb1eb09 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Wed, 4 Aug 2021 14:38:57 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?=
=?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?=
=?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nonConfomity/pages/rectificationDatabase.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 6cba4419d..d48e92931 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -203,7 +203,7 @@
- 查看
+ 查看123
From 6439e5ea670ceaf7f775ca77bbb8666b34a56600 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Wed, 4 Aug 2021 14:46:18 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
=?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E5=BE=97=E5=88=B0=E5=85=B3?=
=?UTF-8?q?=E9=97=AD=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../regulatoryRepository/nonConfomity/pages/historicalData.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index a520ab673..ac1ad2ac2 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -232,7 +232,7 @@
{{historySeeForm.qaEngineer}}
- {{historySeeForm.actualCloseTime}}
+ {{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}
From 64f8962b645292dd7626b59cb397d8db6df80131 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 4 Aug 2021 14:46:58 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b5bc7ca67..32977c38e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1528,10 +1528,16 @@
this.zrUserIds = nameList
},
checkedRole (data) {
- if (this.userType === 'jlUserId') {
- this.roleForm.jlUserId = data.id
- this.roleForm.jlUserName = data.name
- }
+ if (this.userType === 'jlUserId') {
+ this.roleForm.jlUserId = data[0].id
+ this.roleForm.jlUserName = data[0].name
+ }else if(this.userType === 'zrUserId'){
+ this.roleForm.zrUserId=data[0].id;
+ this.roleForm.zrUserName=data[0].name;
+
+ }
+
+
},
// z责任人会签姓名搜索
filterNode(value, data) {
@@ -1834,6 +1840,7 @@
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+
this.treeData = res.data
})
},
From c400abf6836421898bc9438a4f24ad7bfcc81783 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 4 Aug 2021 14:49:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E6=8B=86=E5=88=86-=E6=9F=A5=E7=9C=8B-=E8=8A=82?=
=?UTF-8?q?=E7=82=B9=E5=BF=AB=E9=80=9F=E6=9F=A5=E6=89=BE=20=E5=9C=A8?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9D=A1=E4=BB=B6=E5=90=8E=E6=B8=85=E7=A9=BA?=
=?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=9B=AE=E5=BD=95=E8=87=AA=E5=8A=A8=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index c531d6c0f..22836fdde 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -18,6 +18,7 @@
:showRMenu="jurisdictionCheckForTree"
:isHideRNode="jurisdictionCheckForTree"
:editable="jurisdictionCheckForTree"
+ expandFirst
showCopyBtn
deptSelect
autoSelect
From f1715c39bd7c0208874d51a604a4f68c56f61790 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Wed, 4 Aug 2021 15:46:52 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
=?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nonConfomity/pages/historicalData.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index ac1ad2ac2..db8ee5016 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -201,7 +201,7 @@
style="width: 100%;"
:model="historySeeForm"
>
-
+
{{historySeeForm.standSerialNumber}}
@@ -566,6 +566,7 @@ export default {
this.$nextTick(() => {
const arr = []
let questionType = []
+ if (this.historySeeForm.quesType){
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
@@ -576,6 +577,7 @@ export default {
})
})
this.historySeeForm.quesType = arr.toString()
+ }
})
},
// 分页事件
From 098b8a557c5b931a700209cf494e13536510a9a2 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 4 Aug 2021 16:18:00 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?-=E9=A1=B9=E7=9B=AE---=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=92=8C=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84?=
=?UTF-8?q?bug=EF=BC=8C=E5=BA=94=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF?=
=?UTF-8?q?=E7=BC=96=E8=BE=91disabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 4 ++++
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue | 2 ++
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue | 2 ++
13 files changed, 28 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 74b4b3417..ad751c081 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -30,6 +30,7 @@
@@ -37,6 +38,7 @@
@@ -232,12 +234,14 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 7864191ff..725892839 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -30,6 +30,7 @@
@@ -37,6 +38,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 4891306dc..5d7b5b78f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index ecd157571..08c35a775 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 5cb4a140c..775521076 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index d00f00f00..6bdf02a5e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 0c2e6b9b9..13c6cd453 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -24,12 +24,14 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index b536d78b2..95cf42fe0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 8d4cf8c13..c920a368e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 632d439fa..571089bfc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 1043c1f48..6e2987607 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 06afbaec8..76691bd6c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index a88631f58..97e7b0ffa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -24,6 +24,7 @@
@@ -31,6 +32,7 @@
From 281193bcaa4ab204d4fb913bc3353c692562433d Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Wed, 4 Aug 2021 16:24:57 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/wfhxzg/step2.vue | 8 ++--
.../pages/creatProcess/wfhxzg/step3.vue | 40 ++++++++++++++--
.../pages/creatProcess/wfhxzg/step4.vue | 46 +++++++++++++++++--
3 files changed, 82 insertions(+), 12 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 8b3878ffb..34d9c9a60 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { roleTreeData } from "@/api/unqualProcess.js"
-import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js"
+import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
export default {
name: "wfhxzgStep2",
@@ -373,10 +373,10 @@ export default {
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
- itemsList: this.dataList,
+ standardInfoList: this.dataList,
commentText: this.commentText
}))
- saveinboundTask(_formData).then(res => {
+ saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
@@ -388,7 +388,7 @@ export default {
handleSubmit() {
this.isSubmit = true
let zqa = new Map();
- for (let lastDataListElement of this.lastDataList) {
+ for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index afdc672db..e8a67fc9b 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -241,7 +241,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
export default {
name: "wfhxzgStep3",
@@ -405,7 +405,41 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
- handleSave() {},
+ handleSave() {
+ this.isSubmit = true
+ let zqa = new Map();
+ for (let lastDataListElement of this.dataList) {
+ let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+ if( a == null){
+ a = {
+ id: lastDataListElement.dutyPeopleInfoId,
+ name: lastDataListElement.dutyPeopleInfo,
+ standardInfoList: []
+ }
+ }
+ a.standardInfoList.push(lastDataListElement);
+ zqa.set(a.id, a);
+ }
+ let list = [];
+ for(let item of zqa) {
+ list.push(item[1])
+ }
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ // roleForm: this.roleForm,
+ dockUserList: list,
+ commentText: this.commentText
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
// 提交按钮
handleSubmit() {
this.isSubmit = true
@@ -418,7 +452,7 @@ export default {
})
if(flag)return this.$message.warning('请选择负责人填入')
let zqa = new Map();
- for (let lastDataListElement of this.lastDataList) {
+ for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleId)
if( a == null){
a = {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index df0c6c866..627b58150 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {uploadFile} from '@/api/unqualProcess.js';
-import {inboundLiaisonDetail, completeTask} from "@/api/process"
+import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
export default {
name: "wfhxzgStep4",
@@ -306,10 +306,13 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
-
- this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
+ let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
+ if (listJSON.length !== undefined) {
+ this.dataList = listJSON
+ } else {
+ this.dataList = [listJSON]
+ }
this.newDataList = []
- console.log(this.dataList)
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => {
@@ -402,7 +405,40 @@ export default {
window.open(routeUrl.href, '_blank')
},
// 保存按钮
- handleSave() {},
+ handleSave() {
+ let zqa = new Map();
+ for (let lastDataListElement of this.dataList) {
+ let a = zqa.get(lastDataListElement.dutyPeopleId)
+ if( a == null){
+ a = {
+ standardInfoList: []
+ }
+ }
+ a.standardInfoList.push(lastDataListElement);
+ zqa.set(a.id, a);
+ }
+ let list = []
+ for(let item of zqa) {
+ list.push(item[1].standardInfoList)
+ }
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ // roleForm: this.roleForm,
+ responUserInfo: {
+ info: this.dataList.splice(-1, 1)
+ },
+ commentText: this.commentText
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
// 提交按钮
handleSubmit() {
this.isSubmit = true