lilei 1 år sedan
förälder
incheckning
ff9e64481a
8 ändrade filer med 60 tillägg och 64 borttagningar
  1. 1 1
      public/version.json
  2. 4 0
      src/App.vue
  3. 13 0
      src/api/data.js
  4. 7 32
      src/components/Select/index.js
  5. 10 12
      src/store/modules/app.js
  6. 16 4
      src/utils/request.js
  7. 7 13
      src/views/Home.vue
  8. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710385301874
+  "version": 1710396503610
 }

+ 4 - 0
src/App.vue

@@ -26,6 +26,10 @@ export default {
   created () {
     const _this = this
     this.envtips = process.env.VUE_APP_ENVTIPS
+    
+    // 获取所有数据字典
+    this.$store.dispatch('getAllLookUp')
+    
     // 在页面加载时读取sessionStorage
     if (sessionStorage.getItem('store')) {
       const data = JSON.parse(sessionStorage.getItem('store'))

+ 13 - 0
src/api/data.js

@@ -11,6 +11,19 @@ export function login (parameter) {
   })
 }
 
+// 所有数据字典
+export const findAllLookup = params => {
+  const url = `/lookup/findAllWithItem`
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST',
+    headers:{
+      'module': encodeURIComponent('数据字典查询')
+    }
+  })
+}
+
 export const listLookUp = params => {
   const url = `/lookup/queryLike`
   return axios({

+ 7 - 32
src/components/Select/index.js

@@ -1,13 +1,9 @@
 import Select from 'ant-design-vue/es/select'
-import _ from 'lodash'
-
-import { getLookUpData, listLookUp } from '@/api/data'
 
 /**
  * loopUp 组件
  * params: code loopUp的code 值
  * event: change(选中的值, 选中的对象 )
- * ref: getOptionDatas 获取所有查询的
  */
 export default {
   name: 'VSelect',
@@ -33,35 +29,15 @@ export default {
   }),
   created () {
     const _this = this
-    // console.log(_this.code, '_this.code')
-    getLookUpData({
-      pageNo: 1,
-      pageSize: 1000,
-      lookupCode: _this.code,
-      isEnable: _this.isEnable ? 1 : undefined
-    }).then(res => {
-      if (res.status == 200) {
-        // 判断是否是省仓用户
-        if (_this.$store.state.user.dealerSupplierFlag == '1') {
-          _this.dataList = res.data.list
-        } else {
-          let list = res.data.list
-          list = list.filter(item => item.dispName != '省级批发价')
-          _this.dataList = list
-        }
-      }
+    const allLookup = JSON.parse(sessionStorage.getItem('allLookup'))
+    const data = allLookup.find(item => item.code == _this.code)
+    // 判断是否是省仓用户
+    _this.dataList = _this.$store.state.user.dealerSupplierFlag == '1' ? data.itemList : data.itemList.filter(item => item.dispName != '省级批发价')
+    setTimeout(()=>{
       _this.$emit('loadDataFinish', _this.dataList)
-    })
+    },100)
   },
   methods: {
-
-    /**
-     * 获取当前所有的option 数据
-     * @returns options data
-     */
-    getOptionDatas () {
-      return _.cloneDeep(this.dataList)
-    },
     // 根据code 获取名称
     getNameByCode (code) {
       const a = this.dataList.find(item => {
@@ -69,9 +45,8 @@ export default {
       })
       return a ? a.dispName : '-'
     },
-    // 根据名称 获取code
+    // 根据名称 获取item
     getCodeByName (dispName) {
-      console.log(this.dataList)
       return this.datalist.find(item => item.dispName == dispName)
     }
   },

+ 10 - 12
src/store/modules/app.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { getLookUpData, listLookUp } from '@/api/data'
+import { getLookUpData, findAllLookup } from '@/api/data'
 import {
   SIDEBAR_TYPE,
   DEFAULT_THEME,
@@ -28,6 +28,7 @@ const app = {
     color: null,
     weak: false,
     multiTab: true,
+    appVersion:'',
     nowRoute: '', // 当前路由
     isShowVideo: false, // 是否显示视频弹窗
     isNewTab: false,
@@ -250,18 +251,15 @@ const app = {
     SetWinHeight ({ commit }, val) {
       commit('SET_WIN_HEIGHT', val)
     },
-    getLookUpDataByCode({ commit }, params) {
-      getLookUpData({
-        pageNo: 1,
-        pageSize: 1000,
-        lookupCode: params.code,
-        isEnable: params.isEnable
-      }).then(res => {
-        if (res.status == 200) {
-          commit('SET_returnReason', {key: params.key, val: res.data.list})
-        }
+    getAllLookUp({ commit }, params){
+      findAllLookup({}).then(res => {
+        sessionStorage.setItem('allLookup', JSON.stringify(res.data))
+        const a = res.data.find(item => item.code == 'GOOD_PRODUCT_RETURN')
+        const b = res.data.find(item => item.code == 'DEFECTIVE_PRODUCT_RETURN')
+        commit('SET_returnReason', {key: 'goodReturnReason', val: a.itemList})
+        commit('SET_returnReason', {key: 'defectiveReturnReason', val: b.itemList})
       })
-    },
+    }
   }
 }
 

+ 16 - 4
src/utils/request.js

@@ -90,16 +90,16 @@ service.interceptors.request.use(config => {
     config.headers['access-org'] = changeOrg // 当前要切换的账号 sn
   }
   // 操作系统、浏览器信息
-  config.headers['osInfo'] = getUserOsInfo()+','+getBrowserType()
+  config.headers['os'] = getUserOsInfo()+','+getBrowserType()
   // 分辨率
-  config.headers['dpi'] = window.screen.width+'X'+window.screen.height
+  config.headers['sdr'] = window.screen.width+'X'+window.screen.height
   // 当前页面路径
   const currentPage = router.history.current
   if(currentPage&&currentPage.meta&&config.headers['module']){
     config.headers['module'] = encodeURIComponent(currentPage.meta.title||'') + ',' +config.headers['module']
   }
-  console.log(config.url)
-  console.log(decodeURIComponent(config.headers['module']))
+  // console.log(config.url)
+  // console.log(decodeURIComponent(config.headers['module']))
   
   config.retry = 3
   config.retryDelay = 1000
@@ -149,6 +149,18 @@ service.interceptors.response.use((response) => {
     store.commit('SET_loadingStatus', false)
   }
   
+  // 检测版本号是否变更
+  if(store.state.app.appVersion == ''){
+    if(response.data.data.version){
+      store.state.app.appVersion = response.data.data.version
+    }
+  }else{
+    if(store.state.app.appVersion != response.data.data.version){
+      store.dispatch('getAllLookUp')
+      store.state.app.appVersion = response.data.data.version
+    }
+  }
+  
   return response.data
 }, err)
 

+ 7 - 13
src/views/Home.vue

@@ -351,7 +351,7 @@ import { mapGetters, mapActions } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import newProduct from '@/views/productManagement/newProduct/modal.vue'
 import { queryNewProductPage } from '@/api/product'
-import { bizStateCount, bizData, dealerData } from '@/api/data'
+import { bizStateCount, bizData, dealerData, findAllLookup } from '@/api/data'
 export default {
   name: 'Home',
   components: { ResetPwd, newProduct },
@@ -787,7 +787,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['getLookUpDataByCode']),
+    ...mapActions(['getAllLookUp','getLookUpDataByCode']),
     hasNewProduct () {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
         if (res.status == 200) {
@@ -884,9 +884,14 @@ export default {
     }
   },
   activated () {
+    const vm = this
+    
     // 请求导航指引合计
     this.getNavCount()
     this.getMerchantData()
+    
+    // 获取所有数据字典
+    this.getAllLookUp()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -900,17 +905,6 @@ export default {
       } else {
         vm.openResetPwd = true
       }
-      // 退货原因列表
-      vm.getLookUpDataByCode({
-        code: 'GOOD_PRODUCT_RETURN',
-        key: 'goodReturnReason',
-        isEnable: 1
-      })
-      vm.getLookUpDataByCode({
-        code: 'DEFECTIVE_PRODUCT_RETURN',
-        key: 'defectiveReturnReason',
-        isEnable: 1
-      })
     })
   }
 }

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.103/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.117/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,