Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -395,7 +395,7 @@ import ProcessTitle from '../../components/ProcessTitle'
 import {
   startProcess, saveTaskFirst,
   completeTask, queryTaskFirst,
-  taskDel, workGroup
+  taskDel, workGroup,processBack
 } from '@/api/process.js'
 
 export default {
@@ -742,10 +742,17 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '20'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '20')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                rh_pageData: this.rh_pageData,
+                commentText: this.commentText
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -338,7 +338,7 @@ import ProcessTitle from '../../components/ProcessTitle'
 import {
   startProcess, queryTaskFirst,
   saveTaskFirst, completeTask,
-  taskDel, workGroup} from '@/api/process.js'
+  taskDel, workGroup, processBack} from '@/api/process.js'
 
 export default {
   components: {
@@ -658,10 +658,18 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '21'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '21')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                ch_pageData: this.ch_pageData,
+                commentText: this.commentText
+
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -1062,7 +1062,18 @@ export default {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
-                this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
+                this.$http.post("lawss/activiti/startProcessRollBack", {
+                  id: this.bpnId || '',
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.userName,
+                  type: '4',
+                  json: JSON.stringify({
+                    taskInfo: '引入法规标准清单',
+                    form: this.listForm,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText
+                  })
+                }, {
                   _this: this
                 }, res => {
                   if (res.ok) {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue

@@ -186,7 +186,16 @@ export default {
       this.$refs["Form"].validate((valid) => {
         if (valid) {
           this.isSubmit = true
-          this.$http.get("lawss/activiti/startProcess", {type: "14"}, {
+          this.$http.post("lawss/activiti/startProcessRollBack", {
+            id: this.bpnId || '',
+            createUser: this.$store.getters.userInfo.userId,
+            createUserName: this.$store.getters.userInfo.userName,
+            type: '14',
+            json: JSON.stringify({
+              taskInfo: '责任部门对接人选择责任人',
+              roleForm: this.roleForm,
+            })
+          }, {
             _this: this
           }, res => {
             if (res.ok) {

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -266,7 +266,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js'
+import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js'
 import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
 export default {
   name: "wfhxzgStep1",
@@ -509,10 +509,17 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '8'
-              }
-              startProcess(paramsInfo).then(res => {
+              let paramsInfo = new FormData()
+              paramsInfo.append('id', this.bpnId || '')
+              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+              paramsInfo.append('type', '8')
+              paramsInfo.append('json', JSON.stringify({
+                roleForm: this.roleForm,
+                dataList: this.dataList,
+                commentText: this.commentText
+              }))
+              processBack(paramsInfo).then(res => {
                 this.taskID = res.data
                 const params = new FormData();
                 params.set('json', JSON.stringify(json))

src/pages/processCenter/pages/newProcess/index.vue

@@ -347,13 +347,13 @@
         </div>
         <div class="process-name">
           <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('15')">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>