Selaa lähdekoodia

修改用户分析bug

chenrui 2 vuotta sitten
vanhempi
commit
3d7d16fe57

+ 7 - 6
src/views/dataStatistics/orderDataSummary/list.vue

@@ -104,8 +104,8 @@
                 货架数量:<strong>{{ statisticsObj.shelfNum }}</strong>;
                 铺货数量合计:<strong>{{ statisticsObj.totalShelfMaxQty }}</strong>;
                 铺货金额合计:<strong>{{ statisticsObj.totalShelfMaxCost }}</strong>;
-                货架取货数量合计:<strong>{{ statisticsObj.totalOrderAmount }}</strong>;
-                货架取货金额合计:<strong>{{ statisticsObj.totalOrderQty }}</strong>;
+                货架取货数量合计:<strong>{{ statisticsObj.totalOrderQty }}</strong>;
+                货架取货金额合计:<strong>{{ statisticsObj.totalOrderAmount }}</strong>;
               </div>
               <div>
                 急送数量合计:<strong>{{ statisticsObj.tempOrderQty }}</strong>;
@@ -171,7 +171,8 @@ export default {
       itemData: null, // 编辑行数据
       openStatusModal: false, // 货架状态弹窗初始状态
       statisticsObj: null,
-      areaArr:[],
+      areaArr: [],
+
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
@@ -269,10 +270,10 @@ export default {
         dealerProvinceSn: undefined,
         dealerCitySn: undefined
       }
-      this.areaArr=[];
+      this.areaArr = []
       this.$refs.rangeDate.resetDate()
-      if(this.advanced){
-        this.$refs.orderDate.resetDate();
+      if (this.advanced) {
+        this.$refs.orderDate.resetDate()
       }
       this.$refs.dealerList.resetForm()
       this.$refs.storeList.resetForm()

+ 2 - 5
src/views/dataStatistics/userAnalysis/activeUser.vue

@@ -177,9 +177,6 @@ import storeList from '@/views/common/storeList.vue'
 import { toThousands } from '@/libs/tools.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import setModal from './setModal.vue'
-import { dealChooseDate } from '@/utils/util'
-// import { forEach } from 'core-js/js/array'
-// import { assign } from 'core-js/es7/object'
 export default {
   name: 'UserList',
   components: { STable, VSelect, rangeDate, dealerList, storeList, areaList, setModal },
@@ -249,8 +246,8 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
-      this.queryParam.endDate = date[1] ? dealChooseDate(date[1], 'end') : ''
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
 
     // 经销商 change

+ 2 - 3
src/views/dataStatistics/userAnalysis/registeredUser.vue

@@ -97,7 +97,6 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { registerUserQueryPage, queryStatistics } from '@/api/report.js'
 import dealerList from '@/views/common/dealerList.vue'
 import storeList from '@/views/common/storeList.vue'
-import { dealChooseDate } from '@/utils/util'
 export default {
   name: 'UserList',
   components: { STable, VSelect, rangeDate, dealerList, storeList },
@@ -164,8 +163,8 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
-      this.queryParam.endDate = date[1] ? dealChooseDate(date[1], 'ends') : ''
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     // 经销商 change
     dealerChange (obj) {

+ 4 - 5
src/views/dataStatistics/userAnalysis/usedUser.vue

@@ -110,7 +110,6 @@ import dealerList from '@/views/common/dealerList.vue'
 import storeList from '@/views/common/storeList.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { toThousands } from '@/libs/tools.js'
-import { dealChooseDate } from '@/utils/util'
 export default {
   name: 'UserList',
   components: { STable, VSelect, rangeDate, dealerList, storeList, areaList },
@@ -187,13 +186,13 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.shelfCreateBeginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
-      this.queryParam.shelfCreateEndDate = date[1] ? dealChooseDate(date[1], 'end') : ''
+      this.queryParam.shelfCreateBeginDate = date[0]
+      this.queryParam.shelfCreateEndDate = date[1]
     },
     //  时间  change
     orderDateChange (date) {
-      this.queryParam.lastOrderBeginDate = date[0] ? dealChooseDate(date[0], 'start') : ''
-      this.queryParam.lastOrderEndDate = date[1] ? dealChooseDate(date[1], 'end') : ''
+      this.queryParam.lastOrderBeginDate = date[0]
+      this.queryParam.lastOrderEndDate = date[1]
     },
     // 经销商 change
     dealerChange (obj) {