From 8c1de52cb77974de74ce7f772ac464a8ae53fcd6 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 14 Jul 2022 16:42:07 +0800
Subject: [PATCH 1/3] feat: There is no way the,

---
 src/pages/processCenter/pages/creatProcess/zcrh/step1.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
index 3b2404926..99d486075 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
@@ -753,7 +753,6 @@
                                                         form: this.rhform,
                                                         roleForm: this.roleForm,
                                                         commentText: this.commentText,
-                                                        sarType: this.sarType,
                                                         data1: this.data1,
                                                         data2: this.data2,
                                                     })

From d8a31ef97e9deb73b840cb9d88ae769fbeb05c81 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 14 Jul 2022 17:43:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205650?=
 =?UTF-8?q?5=20=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=9A=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/zcch/step1.vue         | 63 +++++++++++++++++--
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
index 5311f4ec8..b4a9eecd0 100644
--- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue
@@ -75,7 +75,7 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
-                                        <div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in rhform.modelList" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;">
                                             {{ item.name }}
                                         </div>
                                     </div>
@@ -251,7 +251,7 @@
                             align="center">
                         <template slot-scope="scope">
                             <div v-if="scope.row.data.length > 0" class="fileClass">
-                                <div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
+                                <div v-for="(item, index) in scope.row.data" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;">
                                     {{ item.name }}
                                 </div>
                             </div>
@@ -392,7 +392,7 @@
     import ProcessHeader from "../../components/ProcessHeader";
     import ProcessFooter from "../../components/ProcessFooter";
     import ProcessTitle from "../../components/ProcessTitle";
-    import { saveTaskFirst } from "api/process";
+    import { saveTaskFirst,taskDel,queryTaskFirst } from "api/process";
 
     export default {
         name: "zcchStep1",
@@ -652,6 +652,24 @@
                 })
                 this.data2[this.fileIndex].dataName = list
             },
+            // 文件预览及下载
+            handleFilePreview(file) {
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
+                if (this.preview) {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             fileUpload() {
                 this.fileMadel = true
             },
@@ -748,8 +766,17 @@
                                     this.$refs['Form'].validate((valid) => {
                                         if (valid) {
                                             this.isSubmit = true
-                                            this.$http.get('lawss/activiti/startProcess', {
-                                                type: '18'
+                                            this.$http.post('lawss/activiti/startProcessRollBack', {
+                                                createUser: this.$store.getters.userInfo.userId,
+                                                createUserName: this.$store.getters.userInfo.userName,
+                                                type: '18',
+                                                json: JSON.stringify({
+                                                    form: this.rhform,
+                                                    roleForm: this.roleForm,
+                                                    commentText: this.commentText,
+                                                    data1: this.data1,
+                                                    data2: this.data2,
+                                                })
                                             }, {}, res => {
                                                 if (res.ok) {
                                                     var json = Object.assign(this.rhform, this.roleForm)
@@ -763,6 +790,14 @@
                                                     }, {}, res => {
                                                         if (res.success) {
                                                             this.$message.success('流程发起成功')
+                                                            if (this.$route.query.bpnId !== '') {
+                                                                let taskId = {
+                                                                    id: this.$route.query.bpnId
+                                                                }
+                                                                taskDel(taskId).then(res=>{
+                                                                    return res
+                                                                })
+                                                            }
                                                             this.$router.push('/processCenter')
                                                             this.isSubmit = false
                                                         } else {
@@ -822,8 +857,24 @@
                     this.roleForm.presidentIdName = data[0].name
                 }
             }, // 选择人员确认事件
+            getTaskId() {
+                queryTaskFirst({
+                    bpnId: this.$route.query.bpnId
+                }).then(res => {
+                    let mes = JSON.parse(res.mes)
+                    this.rhform = JSON.parse(JSON.stringify(mes.form))
+                    this.data1 = mes.data1
+                    this.data2 = mes.data2
+                    this.roleForm = mes.roleForm
+                    this.commentText = mes.commentText
+                })
+            },
         },
-        mounted() {}
+        mounted() {
+            if(this.$route.query.bpnId){
+                this.getTaskId()
+            }
+        }
     };
 </script>
 

From 63ae1c62857cde7d577197a52d6e37fbc87d4653 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 14 Jul 2022 17:50:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205656?=
 =?UTF-8?q?2=20=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=20=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=20?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E9=83=BD=E4=B8=A2=E5=A4=B1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessHeader.vue          | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessHeader.vue b/src/pages/processCenter/pages/components/ProcessHeader.vue
index 3aafff9df..510c6e2a4 100644
--- a/src/pages/processCenter/pages/components/ProcessHeader.vue
+++ b/src/pages/processCenter/pages/components/ProcessHeader.vue
@@ -36,12 +36,23 @@ export default {
   methods: {
     handleBack() {
       if (this.$store.state.detailMap !== '') {
-        this.$router.push({
-          path: this.$store.state.detailMap,
-          query: {
+        let queryParam = {}
+        if(this.$route.query.bpnId){
+          queryParam = {
+            bpnId: this.$route.query.bpnId,
             prcNum: this.$store.getters.getHandleInfo.prcNum || '',
             tabsName: this.$store.getters.getHandleInfo.tabsName || ''
           }
+        }else {
+          queryParam = {
+            bpnId: this.$route.query.bpnId,
+            prcNum: this.$store.getters.getHandleInfo.prcNum || '',
+            tabsName: this.$store.getters.getHandleInfo.tabsName || ''
+          }
+        }
+        this.$router.push({
+          path: this.$store.state.detailMap,
+          query: queryParam
         })
         this.$store.commit('setDetailMap', '')
       } else {