chenrui hai 1 ano
pai
achega
dae5972c28

+ 1 - 1
src/config/router.config.js

@@ -3027,7 +3027,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'permissionSetting/:sn/:name',
+                path: 'permissionSetting/:sn/:name/:dealerLevel',
                 name: 'merchantInfoManagementSet',
                 component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/permissionSettingNew.vue'),
                 meta: {

+ 1 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -135,7 +135,7 @@
           <div slot="costTitle">
             <a-tooltip placement="top">
               <template slot="title">
-                当调拨对象是经销商时,如果收货客户名称不为空,则按照收货客户的价格级别计算得到。
+                当调拨对象是经销商时,如果收货客户名称不为空,则按照调往对象的价格级别计算得到。
               </template>
               <span style="margin-right: 5px;">实际总售价</span> <a-icon type="question-circle" />
             </a-tooltip>

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/chooseTypeList.vue

@@ -10,7 +10,7 @@
                 id="inventoryQueryList-productBrandType"
                 v-model="queryParam.productBrandType"
                 allowClear
-                placeholder="请选择价格级别"></v-select>
+                placeholder="请选择品牌分类"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">

+ 11 - 1
src/views/dealerManagement/merchantInfoManagement/chooseTypeModal.vue

@@ -20,10 +20,12 @@
         <a-form-model-item label="价格级别" prop="priceLevel">
           <v-select
             code="PRICE_LEVEL"
+            :notIn="notArr"
             style="width: 50%;"
             id="productPriceLevel-level"
             v-model="form.priceLevel"
             allowClear
+            :disabled="notArrFlag"
             placeholder="请选择价格级别"></v-select>
         </a-form-model-item>
         <a-form-model-item label="添加品类" prop="productScopeList"></a-form-model-item>
@@ -72,7 +74,9 @@ export default {
         productScopeList: [
           { required: true, message: '请选择产品品类', trigger: 'blur' }
         ]
-      }
+      },
+      notArr: [],
+      notArrFlag: false
     }
   },
   methods: {
@@ -114,6 +118,12 @@ export default {
         this.$refs.chooseTypeInfo.clearSelectTable()
         this.$emit('close')
       } else {
+        if (this.$route.params.dealerLevel === 'SPECIAL') {
+          this.form.priceLevel = 'SPECIAL'
+          this.notArrFlag = true
+        } else {
+          this.notArr = ['SPECIAL']
+        }
         this.$nextTick(() => {
           this.$refs.chooseTypeInfo.getTableData()
         })

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -248,7 +248,7 @@ export default {
     },
     // 经销权
     handleDistribution (row) {
-      this.$router.push({ name: `merchantInfoManagementSet`, params: { sn: row.dealerSn, name: row.dealerName } })
+      this.$router.push({ name: `merchantInfoManagementSet`, params: { sn: row.dealerSn, name: row.dealerName, dealerLevel: row.dealerLevel } })
     },
     // 差价
     handlePriceSpread (row) {