chenrui 1 tahun lalu
induk
melakukan
a6eca9710c

+ 19 - 16
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -23,7 +23,7 @@
             {{ nowData.subDealer.dealerName }}
           </a-form-model-item>
           <a-form-model-item label="上级经销商">
-            <queryChild ref="higherLevel" :isShowSn="rebateDealerSn" placeholderInfo="请输入上级经销商名称搜索" :dealerLevelList="higherDealerLevelList" @change="handleHigherLevel"></queryChild>
+            <queryChild ref="higherLevel" :isShowSn="rebateDealerSn" placeholderInfo="请输入上级经销商名称搜索" :dealerLevelList="dealerLevelList" @change="handleHigherLevel"></queryChild>
           </a-form-model-item>
           <a-form-model-item label="指定差价归属">
             <queryChild ref="queryChid" :isShowSn="higherDealerSn" placeholderInfo="请输入指定差价归属经销商名称搜索" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
@@ -66,8 +66,7 @@ export default {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
       },
-      higherDealerLevelList: ['CITY', 'PROVINCE'],
-      dealerLevelList: ['CITY', 'PROVINCE'],
+      dealerLevelList: [],
       rebateDealerSn: '',
       higherDealerSn: ''
     }
@@ -126,22 +125,26 @@ export default {
         this.$refs.queryChid.resetForm()
         this.rebateDealerSn = ''
         this.higherDealerSn = ''
+        this.dealerLevelList = []
       } else {
-        this.$nextTick(() => {
-          // 上级经销商
-          if (this.nowData && this.nowData.supDealer) {
-            this.higherDealerSn = this.nowData.supDealer.dealerSn ? this.nowData.supDealer.dealerSn : ''
-            const higherDealerName = this.nowData.supDealer.dealerName ? this.nowData.supDealer.dealerName : ''
+        // 上级经销商
+        if (this.nowData && this.nowData.supDealer) {
+          this.higherDealerSn = this.nowData.supDealer.dealerSn ? this.nowData.supDealer.dealerSn : ''
+          const higherDealerName = this.nowData.supDealer.dealerName ? this.nowData.supDealer.dealerName : ''
+          if (higherDealerName) {
             this.$refs.higherLevel.setVal(this.higherDealerSn, higherDealerName)
-            this.higherDealerLevelList = this.nowData.supDealer.dealerLevel === 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
           }
-          if (this.nowData && this.nowData.rebateDealer) {
-            this.rebateDealerSn = this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
-            const dealerName = this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
-            this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
-            this.dealerLevelList = this.nowData.rebateDealer.dealerLevel === 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
-          }
-        })
+        }
+        // 指定差价归属
+        if (this.nowData && this.nowData.rebateDealer) {
+          this.rebateDealerSn = this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
+          const dealerName = this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
+          this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
+        }
+        // 特约  ['CITY', 'PROVINCE'] 市级经销商 ['PROVINCE']
+        if (this.nowData && this.nowData.subDealer) {
+          this.dealerLevelList = this.nowData.subDealer.dealerLevel == 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
+        }
       }
     }
   }

+ 14 - 2
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -420,14 +420,26 @@ export default {
       text-align: center;
       margin: 35px 0 10px;
     }
+    //处理滚动条不显示
     .tabBox{
        max-height:100px;
        overflow-y:scroll;
     }
    .tabBox::-webkit-scrollbar {
-       // width: 0px;
-       display: none;
+       width: 0px;
     }
+    .tabBox::-webkit-scrollbar-track {
+      background: transparent;
+    }
+     
+    .tabBox::-webkit-scrollbar-thumb {
+      background: transparent;
+    }
+     
+    .tabBox::-webkit-scrollbar-button {
+      display: none;
+    }
+    // 设置input  禁用颜色
     .ant-form-item-control .ant-input[disabled]{
       color:#333333;
       background:#ffffff;