lilei 1 سال پیش
والد
کامیت
bb654e33a4
1فایلهای تغییر یافته به همراه12 افزوده شده و 9 حذف شده
  1. 12 9
      src/views/dealerManagement/rebateBinding/categoryList.vue

+ 12 - 9
src/views/dealerManagement/rebateBinding/categoryList.vue

@@ -66,13 +66,16 @@ export default {
       // 差价归属
       const jcgsFormat = function (record, data, h) {
         const colors = { 'ASSIGN': '#00aaff', 'SUPERIORS': '#ff0000', 'HEAD': '#55aa7f' }
-        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>
-            )
-          })
-        )
+        if (data) {
+          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>
+              )
+            })
+          )
+        }
+        return '--'
       }
       // 操作按钮
       const actionFormat = function (record, data, h) {
@@ -157,15 +160,15 @@ export default {
           rebateScopeList[j].no = no + j + 1
           if (j == 0) {
             rebateScopeList[j].rowspan = rebateScopeList.length
+            rebateScopeList[j].rebateDealerList = item.rebateDealerList
           }
           rebateScopeList[j].dealerUpsSn = item.dealerUpsSn
           rebateScopeList[j].dealerSn = item.dealerSn
 
           if (supDealerList) {
-            // rebateScopeList[j].supDealerList = supDealerList
+            rebateScopeList[j].supDealerList = supDealerList
             rebateScopeList[j].superDealerName = supDealerList.parentDealer.dealerName
           }
-          // rebateScopeList[j].rebateDealerList = item.rebateDealerList
         }
 
         no = no + rebateScopeList.length