lilei 1 rok pred
rodič
commit
0bf39eeb32

+ 1 - 1
pages/sales/chooseProduct.vue

@@ -27,7 +27,7 @@
 							<view>{{toThousands(item.putCost||0, 2)}}</view>
 							<view class="color_6">成本价</view>
 						</view>
-						<view class="footer-item" v-if="searchParams && searchParams.cityPrice">
+						<view class="footer-item" v-if="searchParams && searchParams.cityPrice &&$hasPermissions('M_showAllCityPrice_mobile')">
 							<view>{{toThousands(item.dealerProduct && item.dealerProduct.cityPrice || 0, 2)}}</view>
 							<view class="color_6">市级价</view>
 						</view>

+ 11 - 3
pages/sales/productPricing.vue

@@ -115,17 +115,25 @@
 			},
 			tabList(){
 				let ret = this.priceList
+				// 成本价不显示
 				if(!this.$hasPermissions('M_showCostPrice_mobile')){
 					ret = this.priceList.slice(1,4)
 				}
-				// 特约价
+				
 				if(this.dealerData){
+					// 特约价不显示市级
 					if(this.dealerData.dealerLevel == 'SPECIAL'){
-						return ret.filter((item, index) => index !== 1)
+						ret = ret.filter((item, index) => index !== 1)
 					}else{
-						return ret.filter((item, index) => index !== 2)
+						// 市级不显示特约
+						ret = ret.filter((item, index) => index !== 2)
+						// 市级价不显示
+						if(!this.$hasPermissions('M_showAllCityPrice_mobile')){
+							ret = ret.filter((item, index) => index !== 1)
+						}
 					}
 				}
+				
 				return ret
 			}
 		},

+ 1 - 1
pages/sales/productSearch.vue

@@ -10,7 +10,7 @@
 						</view>
 					</u-upload>
 				</u-form-item>
-				<u-form-item label="产品编码1" prop="productCode" class="form-item">
+				<u-form-item label="产品编码" prop="productCode" class="form-item">
 					<u-input v-model.trim="form.productCode" placeholder="请输入产品编码" input-align="right" />
 				</u-form-item>
 				<u-form-item label="原厂编码" prop="productOrigCode" class="form-item">