浏览代码

Merge branch 'develop_yh39' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh39

chenrui 1 年之前
父节点
当前提交
5f3cf784ef
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      src/views/dealerManagement/rebateBinding/categoryList.vue

+ 4 - 2
src/views/dealerManagement/rebateBinding/categoryList.vue

@@ -154,13 +154,15 @@ export default {
         const item = listData[i]
         const rebateScopeList = item.rebateScopeList ? this.filterData(item.rebateScopeList, queryParam) : [{ productBrandName: null, productTypeName1: null, productTypeName2: null, productTypeName3: null }]
         const supDealerList = item.rebateDealerList.find(b => b.rebateParentType == 'SUPERIORS')
+        const headDealerList = item.rebateDealerList.find(b => b.rebateParentType == 'HEAD')
+        const zdDealerList = item.rebateDealerList.find(b => b.rebateParentType == 'ASSIGN')
         // this.checkedDealerSn.push(rebateScopeList)
 
         for (let j = 0; j < rebateScopeList.length; j++) {
           rebateScopeList[j].no = no + j + 1
           if (j == 0) {
             rebateScopeList[j].rowspan = rebateScopeList.length
-            rebateScopeList[j].rebateDealerList = item.rebateDealerList.sort((a, b) => b.rebateParentType.localeCompare(a.rebateParentType))
+            rebateScopeList[j].rebateDealerList = [...supDealerList, ...zdDealerList, ...headDealerList]
           }
           rebateScopeList[j].dealerUpsSn = item.dealerUpsSn
           rebateScopeList[j].dealerSn = item.dealerSn
@@ -203,7 +205,7 @@ export default {
       console.log(record)
       this.$confirm({
         title: '提示',
-        content: '差价设置删除后,该商户关联的上级经销商和差价设置将同步解除,确定删除吗?',
+        content: '删除后,将解除该品类差价设置归属关系。确定删除吗?',
         centered: true,
         closable: true,
         onOk () {