Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON into develop

src/main.js

@@ -58,6 +58,8 @@ import hwh5  from 'api/hwh5-cloudonline.js';
 import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
 
 import { mapMutations, mapActions } from 'vuex'
+import VConsole from 'vuex'
+
 
 import isMobile from "./store/isMobile";
 // 路由拦截
@@ -405,6 +407,7 @@ const i18n = new VueI18n({
 })
 /* eslint-disable no-new */
 window.vm = new Vue({
+  VConsole,
   router,
   store,
   i18n,

src/pages/processCenter/pages/creatProcess/zcrk/step2.vue

@@ -2,7 +2,7 @@
     <div class="bzrkStep2">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
-            <template slot="proName">标准入库流程</template>
+            <template slot="proName">政策入库流程</template>
             <template slot="proNode">经理人审批</template>
         </ProcessHeader>
         <div class="headerTabs">

src/pages/processCenter/pages/creatProcess/zcrk/step5.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="bzrkStep2">
-        <!--        标准入库流程-->
+        <!--        政策入库流程-->
         <ProcessHeader toggle>
-            <template slot="proName">标准入库流程</template>
+            <template slot="proName">政策入库流程</template>
             <template slot="proNode">流程数据信息</template>
         </ProcessHeader>
         <div class="headerTabs">

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -231,7 +231,7 @@ export default {
       },
       choiceForm: {}, //选择标准清单列表
       // countryOptions: [], //适用区域下拉框数据
-      userId: this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.account,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       signFlag: "1",   //是否会签 1为会签 2为不会签
@@ -273,7 +273,7 @@ export default {
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
           assignee: data[0].id, // 被委托人
-          userId: this.userId, // 委托人
+          userId: this.userId, // 被委托人
           pId: this.pId // 流程实例
         }).then(res =>{
           if (res.success) {