chenrui 4 anni fa
parent
commit
902bddb40e

+ 0 - 8
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -211,9 +211,6 @@ export default {
               typeList.push(item)
             }
           })
-          console.log('chanp', productList)
-          console.log('pinpai', brandList)
-          console.log('fenlei', typeList)
           if (type == 'PRODUCT') { //  选择产品
             this.chooseProducts = productList
             this.openProductsModal = true
@@ -229,19 +226,16 @@ export default {
     },
     // 品牌
     handleBrandOk (obj) {
-      console.log(obj, '---------------品牌')
       this.chooseBrand = obj
       this.changeData('BRAND')
     },
     // 产品
     handleProductsOk (obj) {
-      console.log(obj, '---------------产品')
       this.chooseProducts = obj
       this.changeData('PRODUCT')
     },
     // 分类
     handleTypeOk (obj) {
-      console.log(obj, '---------------分类')
       this.chooseType = obj
       this.changeData('CATEGORY')
     },
@@ -282,10 +276,8 @@ export default {
         goodsType: type,
         goodsSnList: snList
       }
-      console.log('传参-------------', snList)
       dealerScopeSave(params).then(res => {
         if (res.status == 200) {
-          console.log('----------chenggong')
           _this.$message.success(res.message)
           _this.getProductList(1)
         }

+ 9 - 9
src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue

@@ -9,9 +9,9 @@
     @cancle="isShow=false"
     width="80%">
     <div class="table-operator">
-      <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-brand" type="primary" class="button-error" @click="choosePModal('brand')">选择产品品牌</a-button>
-      <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-type" type="primary" class="button-info" @click="choosePModal('type')">选择产品分类</a-button>
-      <a-button id="choosePosPriceProducts-product" type="primary" class="button-success" @click="choosePModal('product')">选择产品</a-button>
+      <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-brand" type="primary" class="button-error" @click="choosePModal('BRAND')">选择产品品牌</a-button>
+      <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-type" type="primary" class="button-info" @click="choosePModal('CATEGORY')">选择产品分类</a-button>
+      <a-button id="choosePosPriceProducts-product" type="primary" class="button-success" @click="choosePModal('PRODUCT')">选择产品</a-button>
     </div>
     <!-- 参与产品 -->
     <div class="products-con">
@@ -236,17 +236,17 @@ export default {
           productList.push(item)
         } else if (item.goodsType == 'BRAND') {
           brandList.push(item)
-        } else if ((item.goodsType == 'TYPE_1') || (item.goodsType == 'TYPE_2') || (item.goodsType == 'TYPE_3')) {
+        } else if (item.goodsType == 'CATEGORY') {
           typeList.push(item)
         }
       })
-      if (type == 'product') { //  选择产品
+      if (type == 'PRODUCT') { //  选择产品
         this.chooseProducts = productList
         this.openProductsModal = true
-      } else if (type == 'brand') { //  选择品牌
+      } else if (type == 'BRAND') { //  选择品牌
         this.chooseBrand = brandList
         this.openBrandModal = true
-      } else if (type == 'type') { //  选择分类
+      } else if (type == 'CATEGORY') { //  选择分类
         this.chooseType = typeList
         this.openTypeModal = true
       }
@@ -317,8 +317,8 @@ export default {
       if (_this.chooseType.length > 0) {
         _this.chooseType.map(item => {
           const obj = {
-            goodsType: 'TYPE_' + item.productTypeLevel,
-            goodsTypeName: (item.productTypeLevel == 1 ? '一级' : item.productTypeLevel == 2 ? '二级' : item.productTypeLevel == 3 ? '三级' : '') + '分类',
+            goodsType: 'CATEGORY',
+            goodsTypeName: '分类',
             goodsName: item.productTypeName,
             goodsSn: item.productTypeSn,
             orderGoodsUnit: undefined,