【修改】修改所有节点名

src/components/ProcessMixin.vue

@@ -12,6 +12,10 @@
                         label: '权限申请流程',
                         value: '1'
                     },
+                  {
+                    label: '报告上传流程',
+                    value: '2'
+                  },
                 ],
                 formDisableFlag: false,
                 nowOrder: '',

src/views/permissionApplication/components/reportTable.vue

@@ -156,7 +156,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            if (this.$route.query.taskDefinitionKey == 'aid4' ){
+            if (this.$route.query.taskDefinitionKey == 'reEdit' ){
               // 有idde
               console.log(this.value)
               debugger
@@ -217,7 +217,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            if (this.$route.query.taskDefinitionKey == 'aid4' ){
+            if (this.$route.query.taskDefinitionKey == 'reEdit' ){
               if(row.id && row.id !=''){
                 // this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
                   this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.reportId])

src/views/permissionApplication/launch.vue

@@ -236,7 +236,7 @@ export default {
       })
 
     }
-    if (this.$route.query.taskDefinitionKey == 'aid4' ) {
+    if (this.$route.query.taskDefinitionKey == 'reEdit' ) {
       this.taskId = this.$store.getters.handleProcess.taskId
       this.prcNum = this.$store.getters.handleProcess.prcNum
       this.prcId = this.$store.getters.handleProcess.prcId
@@ -376,7 +376,7 @@ export default {
     },
     handleReset() {
       this.processForm.prcName = ''
-      if(this.$route.query.taskDefinitionKey == 'aid4'){
+      if(this.$route.query.taskDefinitionKey == 'reEdit'){
         this.processForm.prcName = this.prcName
       }
       this.applicationForm = {

src/views/reportProcess/components/reportForm.vue

@@ -244,6 +244,12 @@ export default {
       fileList:[]
     }
   },
+  watch:{
+    processForm(val){
+      debugger
+      this.form=this.processForm
+    }
+  },
   methods: {
     loadMore(){
       this.q.pageNo++

src/views/reportProcess/examine.vue

@@ -102,7 +102,7 @@ export default {
       },
       PERMISSION,
       submitjson:{},
-      prcType:1
+      prcType:2
     }
   },
   created () {
@@ -110,7 +110,7 @@ export default {
     this.prcNum=this.$store.getters.handleProcess.prcNum
     this.prcId=this.$store.getters.handleProcess.prcId
     this.prcName=this.$store.getters.handleProcess.prcName
-    this.$set(this.processForm,'prcName',this.prcName)
+
 
     let params={
       prcId: this.prcId,
@@ -121,7 +121,7 @@ export default {
     }
     this.getProcessDetail(params).then(res=>{
       this.processForm = JSON.parse(this.processOld.dataJson)
-
+      this.$set(this.processForm,'prcName',this.prcName)
       this.disabled=false
       this.formControl= true
       if(this.$route.query.type=='yiban'){

src/views/reportProcess/launch.vue

@@ -188,7 +188,7 @@ export default {
       })
 
     }
-    if (this.$route.query.taskDefinitionKey == 'aid4' ) {
+    if (this.$route.query.taskDefinitionKey == 'reEdit' ) {
       this.taskId = this.$store.getters.handleProcess.taskId
       this.prcNum = this.$store.getters.handleProcess.prcNum
       this.prcId = this.$store.getters.handleProcess.prcId
@@ -231,7 +231,7 @@ export default {
   methods: {
     handleReset() {
       this.processForm.prcName = ''
-      if(this.$route.query.taskDefinitionKey == 'aid4'){
+      if(this.$route.query.taskDefinitionKey == 'reEdit'){
         this.processForm.prcName = this.prcName
       }
       this.applicationForm = {

src/views/userCenter/processCenter/finishProcess.vue

@@ -118,7 +118,7 @@ export default {
         this.$store.commit('setHandleProcess',params)
         switch (row.prcType) {
           case '1' :
-            if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid4') {
+            if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') {
               this.$router.push({
                 path: '/permission/launch',
                 query: {
@@ -136,7 +136,27 @@ export default {
                   taskDefinitionKey:row.taskDefinitionKey
                 }
               })
+            };break;
+          case '2' :
+            if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') {
+              this.$router.push({
+                path: '/reportprocess/launch',
+                query: {
+                  id: this.$route.query.id,
+                  type:'yiban',
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
+              })
+            }else{
+              this.$router.push({
+                path: '/reportprocess/examine',
+                query: {
+                  id: this.$route.query.id,
+                  type:'yiban',
+                  taskDefinitionKey:row.taskDefinitionKey
+                }
+              })
+            };break;
         }
       },
     }

src/views/userCenter/processCenter/gencyProcess.vue

@@ -109,7 +109,7 @@ export default {
         switch (row.prcType) {
           case '1' :
             debugger
-            if (row.taskDefinitionKey == 'aid4') {
+            if (row.taskDefinitionKey == 'reEdit') {
               this.$router.push({
                 path: '/permission/launch',
                 query: {
@@ -127,7 +127,27 @@ export default {
                   prcName: row.prcName
                 }
               })
+            };break;
+          case '2' :
+            if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') {
+              this.$router.push({
+                path: '/reportprocess/launch',
+                query: {
+                  id: this.$route.query.id,
+                  prcName: row.prcName,
+                  taskDefinitionKey:row.taskDefinitionKey
                 }
+              })
+            }else{
+              this.$router.push({
+                path: '/reportprocess/examine',
+                query: {
+                  id: this.$route.query.id,
+                  prcName: row.prcName,
+                  taskDefinitionKey:row.taskDefinitionKey
+                }
+              })
+            };break;
         }
     },
   },

src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue

@@ -121,7 +121,7 @@ export default {
               pId: this.pId
             }
             if(this.prcType == '1'){
-                if(this.aid=='aid2'){
+                if(this.aid=='oneApply'){
                   params.replaceMap="oneApprove:"+ this.form.assignee+','+"oneApproveName:"+ this.form.assigneeName
                 }else{
                   params.replaceMap="twoApprove:"+ this.form.assignee+','+"twoApproveName:"+ this.form.assigneeName

src/views/userCenter/processCenter/sentProcess.vue

@@ -106,8 +106,8 @@ export default {
                 res.isViewDetails = 1
                 res.prcType = prcType
                 res.prcNum = row.prcNum
-                if (res.taskDefinitionKey == 'aid1' ||
+                if (res.taskDefinitionKey == 'start' ||
-                  res.taskDefinitionKey == 'aid4' ) {
+                  res.taskDefinitionKey == 'reEdit' ) {
                     this.$router.push({
                       path: '/permission/launch',
                       query: res,