Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/views/material/BOMmanage/detailsPop.vue

@@ -449,6 +449,8 @@
   import routing from './components/routing.vue';
   import workmanship from './components/workmanship.vue';
   import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
+import { mapGetters } from 'vuex';
+
   export default {
     name: 'bomDetailsPop',
     components: {
@@ -534,7 +536,8 @@
     computed: {
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
-      }
+      },
+      ...mapGetters(['user'])
     },
 
     methods: {
@@ -856,7 +859,7 @@
           let params = {
             businessId: this.currentNodeData.id,
             businessKey: businessKey||'bom_approver',
-            formCreateUserId: this.currentNodeData.createUserId,
+            formCreateUserId: this.user.info.userId,
             variables: {
               businessCode: this.currentNodeData.code,
               businessName: this.currentNodeData.name,