lilei 1 anno fa
parent
commit
2d4fb51ff3

+ 1 - 1
public/version.json

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

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

@@ -81,7 +81,7 @@
           </a-col>
           <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="cityPrice" v-if="$hasPermissions('M_ShowAllCityPrice')" id="salesQuery-cityPrice">市级价</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="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
             <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
           </a-col>

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

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