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

src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue

@@ -551,8 +551,8 @@ export default {
      */
     initProcessData () {
       this.loading = true
-      const { processInstanceId, draftId, taskId } = this.$route.query
-      queryStandardECProcessData({ processInstanceId, draftId, taskId }).then(async res => {
+      const { processInstanceId, draftId, taskId, projectId } = this.$route.query
+      queryStandardECProcessData({ processInstanceId, draftId, taskId, projectId }).then(async res => {
         if (res.success) {
           const businessData = Object.assign({}, { ...res.result.businessInfoDTO.businessMap })
           this.businessId = res.result.businessId
@@ -897,6 +897,15 @@ export default {
         this.$message.warning(this.$t('pleaseFillInAtLeastOneItem'))
         return
       }
+      formData.infoJsonStr = JSON.stringify(formData)
+      formData.businessId = this.businessId
+      formData.draftId = this.$route.query.draftId
+      // saveSource：从待办进入保存--1；发起/草稿页面--2
+      if (this.currentNode !== FGEntryChangeProcessNode.initiate.value || this.$route.query.processInstanceId) {
+        formData.saveSource = 1
+      } else {
+        formData.saveSource = 2
+      }
       this.loading = true
       saveStandardECProcess(formData).then(res => {
         if (res.success) {