chenrui 1 anno fa
parent
commit
fadb8fbb49
3 ha cambiato i file con 38 aggiunte e 24 eliminazioni
  1. 10 3
      src/components/Select/index.js
  2. 6 5
      src/store/getters.js
  3. 22 16
      src/store/modules/user.js

+ 10 - 3
src/components/Select/index.js

@@ -41,9 +41,16 @@ export default {
       isEnable: _this.isEnable ? 1 : undefined
     }).then(res => {
       if (res.status == 200) {
-        _this.dataList = res.data.list
+        // 判断是否是省仓用户
+        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
+        }
       }
-      _this.$emit("loadDataFinish",_this.dataList)
+      _this.$emit('loadDataFinish', _this.dataList)
     })
   },
   methods: {
@@ -90,7 +97,7 @@ export default {
         this.$emit('change', obj.target.value, _.find(this.dataList, ['code', obj.target.value]))
       }
     }
-    if(this.showType === 'radio'){
+    if (this.showType === 'radio') {
       return (
         <a-radio-group vModel={props.value} {...{ props, on: radioOn }} >,
           {

+ 6 - 5
src/store/getters.js

@@ -12,8 +12,9 @@ const getters = {
   userInfo: state => state.user.info,
   authOrgs: state => state.user.authOrgs,
   changeOrg: state => state.user.changeOrg,
-  settleAccountFlag:state => state.user.settleAccountFlag,
+  settleAccountFlag: state => state.user.settleAccountFlag,
   isShowSpecialPrice: state => state.user.isShowSpecialPrice,
+  dealerSupplierFlag: state => state.user.dealerSupplierFlag,
   addRouters: state => state.permission.addRouters,
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,
@@ -23,10 +24,10 @@ const getters = {
   isNewSubTab: state => state.app.isNewSubTab,
   closeTabPages: state => state.app.closeTabPages,
   loadingStatus: state => state.app.loadingStatus,
-  printDefNeedle:state => state.app.printDefNeedle,
-  printDefInk:state => state.app.printDefInk,
-  printUseing:state => state.app.printUseing,
-  printSettingType:state => state.app.printSettingType,
+  printDefNeedle: state => state.app.printDefNeedle,
+  printDefInk: state => state.app.printDefInk,
+  printUseing: state => state.app.printUseing,
+  printSettingType: state => state.app.printSettingType,
   returnReason: state => state.app.returnReason,
   cartCount: state => state.cart.cartCount
 }

+ 22 - 16
src/store/modules/user.js

@@ -17,6 +17,7 @@ const user = {
     changeOrg: '',
     settleAccountFlag: 0, // 结算账户管理是否开启
     isShowSpecialPrice: 0, // 是否显示特约价
+    dealerSupplierFlag: 0 // 是否是省仓用户
   },
 
   mutations: {
@@ -47,12 +48,15 @@ const user = {
     SET_MUSTCHANGEPWD: (state, status) => {
       state.mustChangePwd = status
     },
-    SET_SETTLEACCOUNT:(state, status) => {
+    SET_SETTLEACCOUNT: (state, status) => {
       state.settleAccountFlag = status
     },
-    SET_isShowSpecialPrice:(state, status) => {
+    SET_isShowSpecialPrice: (state, status) => {
       state.isShowSpecialPrice = status
     },
+    SET_dealerSupplierFlag: (state, status) => {
+      state.dealerSupplierFlag = status
+    }
   },
 
   actions: {
@@ -72,7 +76,8 @@ const user = {
               commit('SET_AUTHORGS', res.auth_orgs || [])
               commit('SET_NAME', { name: users.userNameCN, welcome: welcome() })
               commit('SET_MUSTCHANGEPWD', users.mustChangePwd)
-              commit('SET_isShowSpecialPrice',users.extInfo.isShowSpecialPrice)
+              commit('SET_isShowSpecialPrice', users.extInfo.isShowSpecialPrice)
+              commit('SET_dealerSupplierFlag', users.extInfo.dealerSupplierFlag)
               Vue.ls.set('rolesAccess-qpls-md', { permissionList: users.permCodes }, 7 * 24 * 60 * 60 * 1000)
               commit('SET_AVATAR', res.avatar ? res.avatar : '')
               // 记住密码
@@ -100,7 +105,7 @@ const user = {
       const roles = Vue.ls.get('rolesAccess-qpls-md')
       // 如果存在不同步采购退货,屏蔽同步的采购退货
       const hasOutSyncReturn = roles.permissionList.find(item => item == 'M_purchaseReturn_outSnycList')
-      if(hasOutSyncReturn){
+      if (hasOutSyncReturn) {
         roles.permissionList = roles.permissionList.filter(item => item != 'M_purchaseReturnList')
       }
       commit('SET_ROLES', roles)
@@ -113,32 +118,32 @@ const user = {
       commit('SET_CHANGEORG', info)
     },
     // 更新结算账户状态
-    UpdateSettleAccount({ commit, state }, info) {
+    UpdateSettleAccount ({ commit, state }, info) {
       return new Promise((resolve, reject) => {
         updateAccountMangeState(info).then(res => {
-          if(res.status == 200){
+          if (res.status == 200) {
             resolve(res)
-          }else{
+          } else {
             reject(ret)
           }
         }).catch(error => {
-            reject(error)
-          })
+          reject(error)
+        })
       })
     },
     // 查询结算账户状态
-    GetSettleAccountState({ commit, state }) {
+    GetSettleAccountState ({ commit, state }) {
       return new Promise((resolve, reject) => {
         queryAccountMangeState().then(res => {
-          if(res.status == 200){
-            commit('SET_SETTLEACCOUNT', res.data&&res.data.functionEnableFlag)
+          if (res.status == 200) {
+            commit('SET_SETTLEACCOUNT', res.data && res.data.functionEnableFlag)
             resolve(res)
-          }else{
+          } else {
             reject(ret)
           }
         }).catch(error => {
-            reject(error)
-          })
+          reject(error)
+        })
       })
     },
     // 登出
@@ -157,7 +162,8 @@ const user = {
           commit('SET_MUSTCHANGEPWD', '')
           commit('SET_AVATAR', '')
           commit('SET_TOKEN', '')
-          commit('SET_isShowSpecialPrice','0')
+          commit('SET_isShowSpecialPrice', '0')
+          commit('SET_isShowSpecialPrice', '0')
           commit('SET_ROLES', { permissionList: [] })
           Vue.ls.remove(ACCESS_TOKEN)
           Vue.ls.remove('userName')