lilei 1 year ago
parent
commit
4a4c250785

+ 1 - 1
public/version.json

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

+ 2 - 1
src/store/modules/user.js

@@ -17,7 +17,8 @@ const user = {
     changeOrg: '',
     changeOrg: '',
     settleAccountFlag: 0, // 结算账户管理是否开启
     settleAccountFlag: 0, // 结算账户管理是否开启
     isShowSpecialPrice: 0, // 是否显示特约价
     isShowSpecialPrice: 0, // 是否显示特约价
-    dealerSupplierFlag: 0 // 是否是省仓用户
+    dealerSupplierFlag: 0 ,// 是否是省仓用户
+    dealerLevel: ''  // 经销商级别
   },
   },
 
 
   mutations: {
   mutations: {

+ 8 - 5
src/views/Home.vue

@@ -351,7 +351,8 @@ import { mapGetters, mapActions } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import newProduct from '@/views/productManagement/newProduct/modal.vue'
 import newProduct from '@/views/productManagement/newProduct/modal.vue'
 import { queryNewProductPage } from '@/api/product'
 import { queryNewProductPage } from '@/api/product'
-import { bizStateCount, bizData, dealerData, findAllLookup } from '@/api/data'
+import { bizStateCount, bizData, dealerData } from '@/api/data'
+
 export default {
 export default {
   name: 'Home',
   name: 'Home',
   components: { ResetPwd, newProduct },
   components: { ResetPwd, newProduct },
@@ -787,7 +788,7 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
-    ...mapActions(['getAllLookUp','getLookUpDataByCode']),
+    ...mapActions(['getAllLookUp', 'getLookUpDataByCode']),
     hasNewProduct () {
     hasNewProduct () {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
@@ -877,22 +878,24 @@ export default {
       dealerData({}).then(res => {
       dealerData({}).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.dealerData = res.data
           this.dealerData = res.data
+          this.$store.state.user.dealerLevel = res.data.dealerLevel
         } else {
         } else {
           this.dealerData = null
           this.dealerData = null
+          this.$store.state.user.dealerLevel = ''
         }
         }
       })
       })
     }
     }
   },
   },
   activated () {
   activated () {
     const vm = this
     const vm = this
-    
+
     // 请求导航指引合计
     // 请求导航指引合计
     this.getNavCount()
     this.getNavCount()
     this.getMerchantData()
     this.getMerchantData()
-    
+
     // 获取所有数据字典
     // 获取所有数据字典
     const allLookup = sessionStorage.getItem('allLookup')
     const allLookup = sessionStorage.getItem('allLookup')
-    if(!allLookup){
+    if (!allLookup) {
       this.getAllLookUp()
       this.getAllLookUp()
     }
     }
   },
   },

+ 1 - 1
src/views/power/role/menuModal.vue

@@ -146,7 +146,7 @@ export default {
       this.menuData = newValue
       this.menuData = newValue
       console.log(this.menuData)
       console.log(this.menuData)
       if (newValue) { // 编辑
       if (newValue) { // 编辑
-        if (this.$store.state.user.isShowSpecialPrice == 1) { // 特约经销商
+        if (this.$store.state.user.dealerLevel == 'SPECIAL') { // 特约经销商
           const newChilderArr = this.filterTree(newValue.allMenuList)
           const newChilderArr = this.filterTree(newValue.allMenuList)
           this.treeData = newChilderArr
           this.treeData = newChilderArr
         } else {
         } else {

+ 1 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -81,7 +81,7 @@
           </a-col>
           </a-col>
           <a-col flex="auto" style="margin-bottom: 15px;display:flex;align-items:center;">
           <a-col flex="auto" style="margin-bottom: 15px;display:flex;align-items:center;">
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
-            <a-checkbox v-model="cityPrice" v-if="$hasPermissions('M_ShowAllCityPrice')&&$store.state.user.isShowSpecialPrice==0" id="salesQuery-cityPrice">市级价</a-checkbox>
+            <a-checkbox v-model="cityPrice" v-if="$hasPermissions('M_ShowAllCityPrice')&&$store.state.user.dealerLevel != 'SPECIAL'" id="salesQuery-cityPrice">市级价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
             <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
             <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
           </a-col>
           </a-col>

+ 1 - 1
src/views/salesManagement/salesQueryNew/chooseProductModal.vue

@@ -114,7 +114,7 @@
                 <a-menu-item v-if="$hasPermissions('M_ShowAllCost')" >
                 <a-menu-item v-if="$hasPermissions('M_ShowAllCost')" >
                   <a-checkbox v-model="cost" id="salesQuery-cost">成本价</a-checkbox>
                   <a-checkbox v-model="cost" id="salesQuery-cost">成本价</a-checkbox>
                 </a-menu-item>
                 </a-menu-item>
-                <a-menu-item v-if="$hasPermissions('M_ShowAllCityPrice')&&$store.state.user.isShowSpecialPrice==0">
+                <a-menu-item v-if="$hasPermissions('M_ShowAllCityPrice')&&$store.state.user.dealerLevel != 'SPECIAL'">
                   <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
                   <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
                 </a-menu-item>
                 </a-menu-item>
                 <a-menu-item v-if="$store.state.user.isShowSpecialPrice==1" >
                 <a-menu-item v-if="$store.state.user.isShowSpecialPrice==1" >