Merge branch 'feature-0530wyz-完成工单需求' into 'dev'

添加返回按钮，接受scrm参数

See merge request !2

src/permission.js

@@ -12,10 +12,12 @@ store.dispatch('settings/getSystemSettings')
 const whiteList = [
   '/login',
   '/auth-redirect',
-  '/process/all',
-  '/process/my-create',
-  '/process/upcoming',
-  '/process/apply-process-list'
+  '/process/all', // 所有工单
+  '/process/my-create', // 我创建的
+  '/process/upcoming', // 我的代办
+  '/process/apply-process-list', // 工单申请
+  '/process/related', // 相关工单
+  '/process/handle-ticket' // 处理工单
 ] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {
@@ -32,17 +34,26 @@ router.beforeEach(async(to, from, next) => {
     }
     return null
   }
-
-  const token = getQueryParam('token')
+  const token = getQueryParam('token') // 获取scrm带过来的参数
+  // 从scrm跳转过来时，是否隐藏侧边栏 1:隐藏侧边栏 2:隐藏返回键
   const hiddenSidler = getQueryParam('hiddenSidler')
+  // 使用你的 getQueryParam 方法获取参数
+  const scrmParamsStr = decodeURIComponent(getQueryParam('scrmParams'))
   if (token) {
     removeToken()
     store.dispatch('user/setToken', token)
     store.dispatch('user/setHiddenSidler', hiddenSidler)
+    // 解析成对象
+    if (scrmParamsStr) {
+      try {
+        const scrmParams = JSON.parse(scrmParamsStr)
+        store.dispatch('user/setScrmParams', scrmParams)
+      } catch (e) {
+        console.error('解析失败', e)
+      }
+    }
     setToken(token)
   }
-  // const newhiddenSidler = store.state.user.hiddenSidler
-  // console.log(newhiddenSidler)
 
   // start progress bar
   NProgress.start()

src/store/modules/user.js

@@ -9,7 +9,8 @@ const state = {
   introduction: '',
   roles: [],
   permissions: [],
-  hiddenSidler: ''
+  hiddenSidler: '', // 是否隐藏侧边栏
+  scrmParams: { showBack: true } // scrm系统跳转所带参数
 }
 
 const mutations = {
@@ -40,6 +41,9 @@ const mutations = {
   },
   SET_hiddenSidler: (state, hiddenSidler) => {
     state.hiddenSidler = hiddenSidler
+  },
+  SET_scrmParams: (state, scrmParams) => {
+    state.scrmParams = scrmParams
   }
 }
 
@@ -65,18 +69,15 @@ const actions = {
   setHiddenSidler({ commit }, hiddenSidler) {
     commit('SET_hiddenSidler', hiddenSidler)
   },
+  setScrmParams({ commit }, scrmParams) {
+    commit('SET_scrmParams', scrmParams)
+  },
 
   // get user info
   getInfo({ commit, state }) {
-    console.log('====================================')
-    console.log('getInfo')
-    console.log('====================================')
     return new Promise((resolve, reject) => {
       getInfo()
         .then((response) => {
-          console.log('====================================')
-          console.log('getInfo', response)
-          console.log('====================================')
           if (!response || !response.data) {
             commit('SET_TOKEN', '')
             removeToken()

src/views/process/list/create.vue

 <template>
   <div class="app-container">
+    <el-button v-if="scrmParams.showBack" style="margin-bottom:16px;" type="primary" @click="goBack">
+      返回
+    </el-button>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>公共信息</span>
@@ -121,10 +124,18 @@ export default {
       }
     }
   },
+  computed: {
+    scrmParams() {
+      return this.$store.state.user.scrmParams
+    }
+  },
   created() {
     this.getProcessNodeList()
   },
   methods: {
+    goBack() {
+      this.$router.go(-1)
+    },
     getProcessNodeList() {
       processStructure({
         processId: this.$route.query.processId