修改bug

src/enums/column-name.js

@@ -774,6 +774,9 @@ const columnName = [{
 }, {
   code: 184,
   name: '提成统计'
+}, {
+  code: 185,
+  name: '销售利润(N)-列表页'
 }
 ]
 export const getColumnName = (key) => {

src/views/statisticAnalysis/salesDetails/index.vue

@@ -160,7 +160,7 @@ export default {
           },
           {
             label: "特价金额",
-            prop: "fd",
+            prop: "specialPrice",
             overHidden: true
           }
         ]

src/views/statisticAnalysis/salesProfitN/index.vue

@@ -8,14 +8,20 @@
         <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport">导出</el-button>
         </template>
-        <template slot="corpIdSearch">
-          <crop-select v-model="search.corpId" corpType="KH"></crop-select>
+        <template slot="corpNameSearch">
+          <crop-select v-model="search.corpName" corpType="KH" :zhKey="true"></crop-select>
         </template>
-        <template slot="businesDateSearch">
-          <el-date-picker v-model="search.businesDate" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
+        <template slot="careteTimeSearch">
+          <el-date-picker v-model="search.careteTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']">
           </el-date-picker>
         </template>
+        <template slot="brandSearch">
+          <el-select v-model="search.brand" filterable clearable>
+            <el-option v-for="(item, index) in brandOption" :key="index" :label="item.dictValue"
+              :value="item.dictValue" />
+          </el-select>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -58,32 +64,28 @@ export default {
         column: [
           {
             label: "客户名称",
-            prop: "corpId",
+            prop: "corpName",
             overHidden: true,
             width: 100,
-            search: true,
-            formatter: row => {
-              return row.corpsName;
-            }
+            search: true
           },
           {
             label: "品牌",
-            prop: "billType",
+            prop: "brand",
             type: "select",
-            hide: true,
             showColumn: false,
             search: true
           },
           {
             label: "省份",
-            prop: "orderNo",
+            prop: "province",
             overHidden: true,
             width: 100,
             search: true
           },
           {
             label: "日期",
-            prop: "businesDate",
+            prop: "careteTime",
             type: "date",
             format: "yyyy-MM-dd",
             overHidden: true,
@@ -92,95 +94,99 @@ export default {
           },
           {
             label: "业务员",
-            prop: "portOfLoad",
+            prop: "salesName",
             overHidden: true,
             search: true,
             width: 100
           },
           {
             label: "发货数量",
-            prop: "portOfDestination",
+            prop: "quantity",
             overHidden: true,
             width: 100
           },
           {
             label: "销售金额",
-            prop: "transport",
+            prop: "amount",
             overHidden: true,
             width: 100
           },
           {
             label: "特价条数",
-            prop: "procurementCost",
+            prop: "specialOfferQuantity",
             overHidden: true,
             width: 100
           },
           {
             label: "特价总金额",
-            prop: "partsCost",
+            prop: "specialOfferAmounts",
             overHidden: true,
             width: 100
           },
           {
             label: "非特价条数",
-            prop: "purchasePrice",
+            prop: "nonSpecialOfferQuantity",
             overHidden: true,
             width: 100
           },
           {
             label: "非特价总金额",
-            prop: "amount",
+            prop: "nonSpecialOfferAmount",
             overHidden: true,
             width: 100
           },
           {
             label: "17寸以上数量",
-            prop: "grossProfit",
+            prop: "seventeenQuantity",
             overHidden: true,
             width: 100
           },
           {
             label: "17寸以上金额",
-            prop: "grossProfitRate",
+            prop: "seventeenAmount",
             overHidden: true,
             width: 100
           },
           {
             label: "采购金额",
-            prop: "fd",
+            prop: "purchaseAmount",
             overHidden: true,
             width: 100
           },
           {
             label: "返利使用额",
-            prop: "fc",
+            prop: "thisUsedProfit",
             overHidden: true,
             width: 100
           },
           {
             label: "费用总金额",
-            prop: "singleTicketMargin",
+            prop: "totalAmount",
             overHidden: true,
             width: 100
           },
           {
             label: "销售毛利",
-            prop: "singleTicketMargin",
+            prop: "grossProfit",
             overHidden: true,
             width: 100
           },
           {
             label: "销售毛利率",
-            prop: "singleTicketMargin",
+            prop: "grossProfitRate",
             overHidden: true,
             width: 100
           }
         ]
-      }
+      },
+      brandOption: []
     };
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(185), this.option);
+    this.getWorkDicts('brand').then(res => {
+      this.brandOption = res.data.data;
+    })
   },
   methods: {
     cellStyle() {
@@ -211,11 +217,17 @@ export default {
       this.page.pageSize = val;
     },
     onLoad(page, params = {}) {
+      let data = this.deepClone(Object.assign({}, params, this.search));
+      if (data.careteTime) {
+        data.beginCreateTime = data.careteTime[0]
+        data.endCreateTime = data.careteTime[1]
+        delete data.careteTime
+      }
       this.loading = true;
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.search)
+        data
       )
         .then(res => {
           if (res.data.data.records) {
@@ -251,9 +263,23 @@ export default {
       }
     },
     outExport() {
+      let params = { ...this.search }
+      if (params.careteTime && params.careteTime.length > 0) {
+        params = {
+          ...params,
+          beginCreateTime: params.careteTime[0] + ' 00:00:00',
+          endCreateTime: params.careteTime[1] + ' 23:59:59',
+        }
+      } else {
+        params = {
+          ...params,
+          beginCreateTime: '',
+          endCreateTime: '',
+        }
+      }
       window.open(
-        `/api/blade-purchase-sales/exportOrder/selPurchaseExport?${this.website.tokenHeader
-        }=${getToken()}&billType=${this.search.billType}`
+        `/api/blade-purchase-sales/exportOrder/selSalesProfitExport?${this.website.tokenHeader
+        }=${getToken()}&corpName=${this.search.corpName}&brand=${params.brand}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}&salesName=${params.salesName}&province=${params.province}`
       );
     },
   }