接口对正

src/api/dataSource/saleReport.js

@@ -102,21 +102,14 @@ export function listXdata(query) {
     params: query
   })
 }
-export function listCZData(query) {
+export function listCZXFData(query) {
   return request({
-    url: '/customer/recharge/listCZData',
+    url: '/customer/record/listCZXFData',
     method: 'get',
     params: query
   })
 }
 
-export function listXFData(query) {
-  return request({
-    url: '/customer/consumption/listXFData',
-    method: 'get',
-    params: query
-  })
-}
 export function listHYData(query) {
   return request({
     url: '/customer/card/listHYData',

src/utils/pageStatus.js

@@ -16,6 +16,9 @@ export async function queryPageStatus(allowJiBieArr=[], type) { // 1 积分 2
   if(getGroupInfoRes.code != 200){
     return 3
   }
+  if(getGroupInfoRes.data == null){
+    return 1
+  }
   const integralRuleFlag = getGroupInfoRes.data.integralRuleFlag; // 0 不共享 1 共享
   const cardRuleFlag = getGroupInfoRes.data.cardRuleFlag;
   const couponFlag = getGroupInfoRes.data.couponFlag;

src/views/dataSource/saleReport.vue

@@ -11,6 +11,7 @@
           <el-date-picker style="margin: 0px 10px;"
             v-model="dateRangeCreatedDate"
             type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
             size="mini"
             range-separator="至"
             start-placeholder="开始日期"
@@ -193,7 +194,7 @@
 </template>
 
 <script>
-  import { listSum,listOilType,listViewData,listCZData,listXFData,listHYData,listJRHYData } from "@/api/dataSource/saleReport";
+  import { listSum,listOilType,listCZXFData,listViewData,listHYData,listJRHYData } from "@/api/dataSource/saleReport";
 
 export default {
   name: "sourceI",
@@ -341,24 +342,21 @@ export default {
       this.queryParams.stationId=this.$store.selectDeptId;
       this.getList();
       console.log("this.queryParams",this.queryParams);
-      listCZData(this.queryParams).then(response => {
+      listCZXFData(this.queryParams).then(response => {
         if(response.hasOwnProperty('data')){
-          if(response.data.amt){
-            this.infoFrom.czAmt = response.data.amt;
+          if(response.data.czAmt){
+            this.infoFrom.czAmt = response.data.czAmt;
           }else{
             this.infoFrom.czAmt = 0;
           }
-        }
-      });
-      listXFData(this.queryParams).then(response => {
-        if(response.hasOwnProperty('data')){
-          if(response.data.amt){
-            this.infoFrom.xfAmt = response.data.amt;
+          if(response.data.xfAmt){
+            this.infoFrom.xfAmt = response.data.xfAmt;
           }else{
             this.infoFrom.xfAmt = 0;
           }
         }
       });
+     
       this.queryInfo.stationId =this.queryParams.stationId;
       listHYData(this.queryInfo).then(response => {
         if(response.hasOwnProperty('data')){

src/views/dzk/Dzk_Rule.vue

@@ -470,7 +470,6 @@ export default {
     init() {
       selectCustomerCardSetting().then((response) => {
         this.settingForm = response.data;
-        console.log('你好',this.settingForm);
         this.settingForm.collectClickCalendar = [];
         this.settingForm.collectClickDay = "";
         if(this.settingForm.cardOilsType == null){

src/views/overview/Overview_Daily.vue

@@ -19,6 +19,7 @@
               style="margin: 0px 10px;"
               size="mini"
               v-model="dateRangeCreatedDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
               type="datetimerange"
               range-separator="至"
               start-placeholder="开始日期"

src/views/overview/Overview_Summary.vue

@@ -19,6 +19,7 @@
             style="margin: 0px 10px"
             v-model="dateRangeCreatedDate"
             type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
             size="mini"
             range-separator="至"
             start-placeholder="开始日期"
@@ -342,25 +343,21 @@ export default {
     //本日的数据
     getTodayList(query) {
       // 查询汇总充值金额
-      listCZData(query).then((response) => {
+      listCZXFData(query).then((response) => {
         if (response.data!=null ) {
           if (response.data.amt) {
             this.infoFrom.czAmt = response.data.amt;
           } else {
             this.infoFrom.czAmt = 0;
           }
-        }
-      });
-      // 查询消费金额
-      listXFData(query).then((response) => {
-        if (response.data!=null ) {
-          if (response.data.amt) {
-            this.infoFrom.xfAmt = response.data.amt;
+          if (response.data.xfAmt) {
+            this.infoFrom.xfAmt = response.data.xfAmt;
           } else {
             this.infoFrom.xfAmt = 0;
           }
         }
       });
+     
       // 汇总电子卡数据
       listHYData({ stationId: query.stationId }).then((response) => {
         if (response.data!=null ) {