2 years ago
parent
commit
a2df06d814
3 changed files with 300 additions and 386 deletions
  1. 7 32
      src/components/businessDetail.vue
  2. 3 19
      src/components/saleGmv.vue
  3. 290 335
      src/components/serviceAbility.vue

+ 7 - 32
src/components/businessDetail.vue

@@ -11,7 +11,7 @@
         <!-- 搜索 -->
         <el-form :inline="true" size="small" v-model="listQuery1">
           <el-form-item label="城市">
-            <el-select v-model="listQuery1.city" clearable placeholder="请选择城市" multiple>
+            <el-select v-model="listQuery1.city" clearable placeholder="请选择城市">
               <el-option
                 v-for="(item,index) in cityList"
                 :key="index"
@@ -41,13 +41,6 @@
           <el-form-item>
             <el-button icon="el-icon-search" type="primary" plan @click="querySearch1">查询</el-button>
           </el-form-item>
-               <!-- v-per="'downloadBusiness'" -->
-            <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="downloadBusiness"
-           
-          >导出</el-button>
         </el-form>
 
         <!-- 列表数据 -->
@@ -83,15 +76,12 @@
 import moment from "moment";
 import Pagination from "./common/Pagination";
 import Service from "../script/api/service";
-import url from "@/script/baseUrl.js";
 import globalData from "@/components/common/globaldata/global.data.vue";
 // import addTrainHisDia from './components/addTrainHisDia';
 export default {
   components: { Pagination },
   data() {
     return {
-      exportBusinessUrl: url.exportUrl +'/reportservice/report/exportDayInvestMenDetail?token='+
-        window.localStorage.getItem("token"),
       activeTab: "1",
       cityList: [],
       stationList: [],
@@ -101,7 +91,7 @@ export default {
       pageSize1: 50,
       currentPage1: 1, //当前页
       listQuery1: {
-        city: [],
+        city: "",
         // serviceStation:'',
         timePart: []
       },
@@ -158,9 +148,10 @@ export default {
       }).then(res => {
         if (res.data.errno == "0") {
           this.cityList = res.data.data.userCityDataList;
-          // this.listQuery1.city = res.data.data.userCityDataList[0].dataName.split(
-          //   ",");
-
+          this.listQuery1.city = res.data.data.userCityDataList[0].dataName;
+          // this.allStationList = res.data.data.userCityDataList;
+               
+          // this.stationList = res.data.data.userCityDataList[0].subList;
           this.querySearch1();
         } else {
           this.$message.warning(res.data.errmsg);
@@ -195,7 +186,7 @@ export default {
       let temp = {
         startPage: this.currentPage1,
         limit: this.pageSize1,
-        city: this.listQuery1.city.join(','),
+        city: this.listQuery1.city,
         // serviceStation: this.listQuery1.serviceStation,
         startTime: this.listQuery1.createTime[0],
         endTime: this.listQuery1.createTime[1]
@@ -211,22 +202,6 @@ export default {
           // console.log(err);
         });
     },
-    downloadBusiness() {
-      //  if (this.isEmptyObjVue(this.listQuery1.city)) {
-      //   this.$message.warning("城市不能为空,请选择城市");
-      //   return false;
-      // }
-      if (this.isEmptyObjVue(this.listQuery1.createTime)) {
-        this.$message.warning("日期不能为空,请选择日期");
-        return false;
-      }
-      let params = `&city=${this.listQuery1.city.join(",")}&startTime=${
-        this.listQuery1.createTime[0]
-      }&endTime=${this.listQuery1.createTime[1]}`;
-      window.open(this.exportBusinessUrl + params);
-    },
-
-
   
   }
 };

+ 3 - 19
src/components/saleGmv.vue

@@ -17,21 +17,7 @@
       <div class="card-module gmv-data">
         <div class="month-wrapper">
           <div class="card-title">GMV数据</div>
-          <div>
-            <el-select v-model="listQuery1.city" clearable placeholder="请选择城市" multiple>
-            <el-option v-for="(item,index) in cityList" :key="index" :label="item.dataName" :value="item.dataName"></el-option>
-          </el-select>
-          </div>
-          <div>
-               <el-date-picker
-            v-model="current"
-            type="month"
-            placeholder="请选择月份"
-            value-format="yyyy-MM"
-            @change="dateChange5"
-          ></el-date-picker>
-          </div>
-          <!-- <div class="month-select">
+          <div class="month-select">
             <div @click="lastMonth">
               <i class="el-icon-arrow-left"></i>
               上月
@@ -41,7 +27,7 @@
               下月
               <i class="el-icon-arrow-right"></i>
             </div>
-          </div> -->
+          </div>
         </div>
         <div class="data-progress">
           <div class="progress-1">
@@ -1487,9 +1473,7 @@ export default {
           }
         }
       },
-   dateChange5(){
-      this.getCSGmvData();
-   }
+
 
 
 

File diff suppressed because it is too large
+ 290 - 335
src/components/serviceAbility.vue