Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/rank/salesVolumeRank.vue

@@ -192,7 +192,7 @@ export default {
         // type: "text"
       };
       let sumMoney = {
-        field: "PreferPrice",
+        field: "SumPreferPrice",
         title: this.$t('sm.salemoney'),
         titleAlign: "left",
         columnAlign: "left",
@@ -207,7 +207,7 @@ export default {
           //   }
           //   return content;
           // } else {
-          return `${rowData["PreferPrice"].toFixed(2)}`;
+          return `${rowData["SumPreferPrice"].toFixed(2)}`;
           //}
         }
       };
@@ -280,6 +280,14 @@ export default {
         width: 80,
         orderBy: ""
       };
+      let customerNum = {
+        field: "totalGuestNum",
+        title: '单项收客数',
+        titleAlign: "left",
+        columnAlign: "left",
+        isResize: true,
+        width: 80
+      };
       let unitPrice = {
         field: "avgPrice",
         title: this.$t('sm.keprice'),
@@ -321,6 +329,7 @@ export default {
         unitPrice.title = this.$t('sm.renxiaoshou');
         this.columns.push(avgPCount);
       }
+      this.columns.push(customerNum);
       this.columns.push(unitPrice);
       this.columns.push(proportion);
       this.isReady = true;
@@ -355,7 +364,7 @@ export default {
       if (!param.QStartDate) {
         param.QStartDate = "2019-01-01";
       }
-      this.apipost("sellorder_get_sellvolumerank", param, r => {
+      this.apipost("sellorder_get_sellvolumerankNew", param, r => {
         r.data.data.forEach(x => {
           x.incomeVal = parseFloat(x.income);
           x.avgPrice = parseFloat(x.avgPrice);