Browse Source

全局配置机构编号

lex-xin 3 years ago
parent
commit
79f51e2ffd
5 changed files with 29 additions and 6 deletions
  1. 2 2
      package.json
  2. 1 0
      src/components/save-form/index.vue
  3. 3 0
      src/store/modules/user.js
  4. 11 1
      src/utils/request.js
  5. 12 3
      src/utils/request2.js

+ 2 - 2
package.json

@@ -17,8 +17,8 @@
     "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "JSONPath": "^0.11.2",
     "JSONPath": "^0.11.2",
     "axios": "0.18.1",
     "axios": "0.18.1",
-    "browserslist": "^4.16.4",
-    "caniuse-lite": "^1.0.30001214",
+    "browserslist": "^4.18.1",
+    "caniuse-lite": "^1.0.30001286",
     "clean-deep": "^3.3.0",
     "clean-deep": "^3.3.0",
     "copy-to-clipboard": "^3.3.1",
     "copy-to-clipboard": "^3.3.1",
     "dayjs": "^1.8.35",
     "dayjs": "^1.8.35",

+ 1 - 0
src/components/save-form/index.vue

@@ -2,6 +2,7 @@
   <el-form
   <el-form
     class="save-form"
     class="save-form"
     v-bind="{...$attrs, ...$props}"
     v-bind="{...$attrs, ...$props}"
+    size="small"
     v-on="$listeners"
     v-on="$listeners"
     @submit.stop.native="submit"
     @submit.stop.native="submit"
     @reset.stop.native="reset"
     @reset.stop.native="reset"

+ 3 - 0
src/store/modules/user.js

@@ -87,6 +87,9 @@ const actions = {
           const phone = data.data.phone
           const phone = data.data.phone
           const isSuperAdmin = data.data.isSuperAdmin
           const isSuperAdmin = data.data.isSuperAdmin
           const roles = data.data.roles
           const roles = data.data.roles
+          if(data.data.tenantId) { // 设置机构编号
+            sessionStorage.setItem('tenantId', data.data.tenantId)
+          }
           // const { name, avatar } = data
           // const { name, avatar } = data
           commit('SET_NAME', username)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           commit('SET_AVATAR', avatar)

+ 11 - 1
src/utils/request.js

@@ -80,7 +80,17 @@ service.interceptors.request.use(
       config.headers['Authorization'] = getToken()
       config.headers['Authorization'] = getToken()
       // config.headers['content-type'] = "application/x-www-form-urlencoded"
       // config.headers['content-type'] = "application/x-www-form-urlencoded"
     }
     }
-    config.params = cleanDeep(config.params)
+    const tenantId = sessionStorage.getItem('tenantId') || null
+    const configData = {
+      ...config.data,
+      tenantId
+    }
+    const configParams = {
+      ...config.params,
+      tenantId
+    }
+    config.data = cleanDeep(configData)
+    config.params = cleanDeep(configParams)
     //  params: cleanDeep(options.params),
     //  params: cleanDeep(options.params),
     //  (config)
     //  (config)
     return config
     return config

+ 12 - 3
src/utils/request2.js

@@ -81,13 +81,22 @@ service.interceptors.request.use(
       // please modify it according to the actual situation
       // please modify it according to the actual situation
       config.headers['Authorization'] = getToken()
       config.headers['Authorization'] = getToken()
     }
     }
+    const tenantId = sessionStorage.getItem('tenantId') || null
+    const configData = {
+      ...config.data,
+      tenantId
+    }
+    const configParams = {
+      ...config.params,
+      tenantId
+    }
     if (config.requestType === 'form') {
     if (config.requestType === 'form') {
       config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
       config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-      config.data = qs.stringify(cleanDeep(config.data))
+      config.data = qs.stringify(cleanDeep(configData))
     } else {
     } else {
-      config.data = cleanDeep(config.data)
+      config.data = cleanDeep(configData)
     }
     }
-    config.params = cleanDeep(config.params)
+    config.params = cleanDeep(configParams)
     return config
     return config
   },
   },
   error => {
   error => {