lilei hai 1 ano
pai
achega
222372c958

+ 1 - 1
src/views/dealerManagement/rebateBinding/categoryList.vue

@@ -69,7 +69,7 @@ export default {
         return (
           data.sort((a, b) => b.rebateParentType.localeCompare(a.rebateParentType)).map(item => {
             return (
-              <a-tag style="margin:5px;" color={colors[item.rebateParentType]}>{item.parentDealer.dealerName}{Number(item.allotRate * 100).toFixed(2) + '%'}</a-tag>
+              <a-tag style="margin:5px;" color={colors[item.rebateParentType]}>{item.parentDealer.dealerName}({Number(item.allotRate * 100).toFixed(2) + '%'})</a-tag>
             )
           })
         )

+ 3 - 1
src/views/dealerManagement/rebateBinding/list.vue

@@ -13,6 +13,7 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form-model
             id="rebateBinding-form"
+            v-show="!isTeyue"
             ref="ruleForm"
             class="form-model-con"
             layout="inline"
@@ -109,6 +110,7 @@ export default {
       this.$router.push({ name: 'merchantInfoManagementList', query: { closeLastOldTab: true } })
     },
     loadList (list) {
+      console.log(list.length == 0)
       this.showBtns = this.isTeyue ? list.length == 0 : true
     },
     // 查询
@@ -176,7 +178,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - (!this.showBtns ? 140 : 205)
+      this.tableHeight = window.innerHeight - tableSearchH - (!this.showBtns ? 50 : 205)
     }
   },
   watch: {

+ 3 - 2
src/views/dealerManagement/rebateBinding/priceDiffModal.vue

@@ -26,7 +26,7 @@
             <a-row :gutter="10">
               <a-col :span="17">
                 <custList
-                  v-if="!form.dealerUpsSn"
+                  v-if="!form.dealerUpsSn || isSpecial"
                   ref="custList"
                   :notDealerSn="notZdDealer"
                   :notDealerType="['special']"
@@ -129,6 +129,7 @@ export default {
       },
       form: {
         dealerSn: undefined,
+        dealerUpsSn: undefined,
         rebateParentType: [], // 差价归属
         rebateDealerList: [], // 经销商列表
         rebateScopeList: [] // 品类列表
@@ -322,7 +323,7 @@ export default {
     },
     // 重置表单
     resetForm () {
-      if (!this.isSpecial && !this.form.dealerUpsSn) {
+      if (this.isSpecial || !this.form.dealerUpsSn) {
         this.$refs.custList.resetForm()
       }
       this.form.dealerSn = undefined