From a33494632c4890c84461a81aa1eef58ab5049305 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 23 Dec 2022 10:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B1=87=E6=80=BB(?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzjd/step6-1.vue       | 92 ++++++++++++-------
 1 file changed, 59 insertions(+), 33 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
index c1c53ecd8..bdd588f52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
@@ -501,43 +501,69 @@
             },
             getData() {
               this.$http.get('lawss/activiti/decodeDetail',{
-                taskId: this.taskIds,
+                taskIds: this.taskIds,
                 pId: this.pId
               },{},res=>{
-
+                let data = JSON.parse(res.mesg)
+                console.log(data)
+                this.form.endTime = data.endTime || data.form.endTime
+                this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                this.form.itemsName = data.itemsName || data.form.itemsName
+                this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
+                this.commentText6 = data.commentText || ''
+                if (data.form) {
+                  this.form.itemsName1 = data.form.itemsName1 || ''
+                  this.form.itemsNum1 = data.form.itemsNum1 || ''
+                } else {
+                  this.form.itemsName1 = data.itemsName1 || ''
+                  this.form.itemsNum1 = data.itemsNum1 || ''
+                }
+                this.sarType = data.standInData || data.sarType
+                this.json = data
+                this.itemList = data.itemList
+                this.itemList.forEach(item => {
+                  if(item.complianceRequir === '1'){
+                    item.complianceRequirShow = '符合'
+                  }else{
+                    item.complianceRequirShow = '不符合'
+                  }
+                })
+                this.loading = false
               })
+
                 // return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
-                        taskIds: this.taskIds,
-                        pId: this.pId
-                    }).then(res => {
-                        let data = JSON.parse(res.mesg)
-                        this.form.endTime = data.endTime || data.form.endTime
-                        this.form.itemsNum = data.itemsNum || data.form.itemsNum
-                        this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
-                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
-                        this.commentText6 = data.commentText || ''
-                        if (data.form) {
-                            this.form.itemsName1 = data.form.itemsName1 || ''
-                            this.form.itemsNum1 = data.form.itemsNum1 || ''
-                        } else {
-                            this.form.itemsName1 = data.itemsName1 || ''
-                            this.form.itemsNum1 = data.itemsNum1 || ''
-                        }
-                        this.sarType = data.standInData || data.sarType
-                        this.json = data
-                        this.itemList = data.itemList
-                        this.itemList.forEach(item => {
-                        if(item.complianceRequir === '1'){
-                          item.complianceRequirShow = '符合'
-                        }else{
-                          item.complianceRequirShow = '不符合'
-                        }
-                      })
-                        this.loading = false
-                    }).catch(e => {
-                    })
+                //     inboundLiaisonDetail({
+                //         taskIds: this.taskIds,
+                //         pId: this.pId
+                //     }).then(res => {
+                //         let data = JSON.parse(res.mesg)
+                //         this.form.endTime = data.endTime || data.form.endTime
+                //         this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                //         this.form.itemsName = data.itemsName || data.form.itemsName
+                //         this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                //         this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
+                //         this.commentText6 = data.commentText || ''
+                //         if (data.form) {
+                //             this.form.itemsName1 = data.form.itemsName1 || ''
+                //             this.form.itemsNum1 = data.form.itemsNum1 || ''
+                //         } else {
+                //             this.form.itemsName1 = data.itemsName1 || ''
+                //             this.form.itemsNum1 = data.itemsNum1 || ''
+                //         }
+                //         this.sarType = data.standInData || data.sarType
+                //         this.json = data
+                //         this.itemList = data.itemList
+                //         this.itemList.forEach(item => {
+                //         if(item.complianceRequir === '1'){
+                //           item.complianceRequirShow = '符合'
+                //         }else{
+                //           item.complianceRequirShow = '不符合'
+                //         }
+                //       })
+                //         this.loading = false
+                //     }).catch(e => {
+                //     })
                 // })
             },
         },