优化respone数据判断，客户等级直降设置增加油品。

Yijia-SaaS/yijia-ui/src/api/dataSource/saleReport.js

@@ -38,10 +38,16 @@ export function listDayReport(query) {
     method: 'get',
     params: query
   })
+}export function selectDayReportDetail(query) {
+  return request({
+    url: '/station/order/selectDayReportDetail',
+    method: 'get',
+    params: query
+  })
 }
 export function getDetails(query) {
   return request({
-    url: '/station/order/listInfo',
+    url: '/station/order/list',
     method: 'get',
     params: query
   })
@@ -66,19 +72,22 @@ export function listQydata97(query) {
     method: 'get',
     params: query
   })
-}export function listQydata0(query) {
+}
+export function listQydata0(query) {
   return request({
     url: '/station/order/listQydata0',
     method: 'get',
     params: query
   })
-}export function listQydata10(query) {
+}
+export function listQydata10(query) {
   return request({
     url: '/station/order/listQydata10',
     method: 'get',
     params: query
   })
-}export function listQydata20(query) {
+}
+export function listQydata20(query) {
   return request({
     url: '/station/order/listQydata20',
     method: 'get',

Yijia-SaaS/yijia-ui/src/views/customer/manage/index.vue

@@ -241,8 +241,7 @@
         :total="totalOrder"
         :page.sync="queryOrder.pageNum"
         :limit.sync="queryOrder.pageSize"
-        @size-change='handleSizeChange'
-        @current-change='handleCurrentChange'
+        @pagination="listPage"
       />
     </el-dialog>
   </div>
@@ -304,6 +303,7 @@ export default {
         pageSize: 10,
         oilName: null,
         stationId: null,
+        customerName: null
       },
       // 表单参数
       form: {},
@@ -416,40 +416,25 @@ export default {
       });
     },
     lookinfo(row){
-      console.log("this.queryOrder.oilName:",row);
-      if(row !=null){
-        const id = row.id || this.ids
-        this.queryOrder.oilName=row.oilName;
-        this.queryOrder.stationId=row.stationId;
-        this.row =row;
-        getOrderInfo(this.queryOrder).then(response => {
-          this.orderList = response.rows;
-          this.openOrderInfo = true;
-          this.totalOrder = response.total;
-          this.titleOrderInfo = "查看客户订单信息";
-          this.loading = false;
-        });
-      }else{
-        this.queryOrder.oilName=this.row.oilName;
-        this.queryOrder.stationId=this.row.stationId;
-        console.log("this.queryOrder.oilName:",this.queryOrder.oilName);
-        console.log("this.queryOrder.stationId:",this.queryOrder.stationId);
-        getOrderInfo(this.queryOrder).then(response => {
-          this.orderList = response.rows;
-          this.openOrderInfo = true;
-          this.totalOrder = response.total;
-          this.titleOrderInfo = "查看客户订单信息";
-          this.loading = false;
-        });
-      }
-    },
-    handleSizeChange(val){
-      this.queryOrder.pagesize = val;
-      this.lookinfo();
+      this.row =row;
+      row.page= this.queryOrder.pageNum;
+      row.limit= this.queryOrder.pageSize;
+      this.listPage(row);
     },
-    handleCurrentChange(val){
-      this.queryOrder.pagenum = val;
-      this.lookinfo();
+    listPage(row){
+      this.queryOrder.oilName=this.row.oilName;
+      this.queryOrder.stationId=this.row.stationId;
+      this.queryOrder.consumer =this.row.customerName;
+      this.queryOrder.pageNum=row.page;
+      this.queryOrder.pageSize =row.limit;
+      getOrderInfo(this.queryOrder).then(response => {
+        this.orderList = response.rows;
+        this.openOrderInfo = true;
+        this.totalOrder = response.total;
+        this.titleOrderInfo = "查看客户订单信息";
+        this.loading = false;
+
+      });
     },
     /** 提交按钮 */
     submitForm() {

Yijia-SaaS/yijia-ui/src/views/customer/setting/index.vue

@@ -7,11 +7,12 @@
     <div class="cutLine firstLine"></div>
     <el-table v-loading="loading" :data="settingList" >
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
+      <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="等级名称" align="center" prop="grade" />
       <el-table-column label="优惠方式" align="center" prop="discountWay" />
       <el-table-column label="会员条件" align="center" prop="memberCondit" />
-      <el-table-column label="汽油优惠/L" align="center" prop="gasoilDiscountLitre" />
-      <el-table-column label="柴油优惠/L" align="center" prop="dieseloilDiscountLitre" />
+      <el-table-column label="优惠/L" align="center" prop="gasoilDiscountLitre" />
+<!--      <el-table-column label="柴油优惠/L" align="center" prop="dieseloilDiscountLitre" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -34,6 +35,16 @@
     <!-- 添加或修改客户优惠等级设置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-form-item label="油品名称" prop="oilName">
+          <el-select v-model="form.oilName" placeholder="油品名称" clearable size="small">
+            <el-option
+              v-for="dict in oilNameOptions"
+              :key="dict.dictLabel"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="等级" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入等级" />
         </el-form-item>
@@ -46,9 +57,9 @@
         <el-form-item label="汽油优惠/L" prop="gasoilDiscountLitre">
           <el-input v-model="form.gasoilDiscountLitre" placeholder="请输入汽油优惠/L" />
         </el-form-item>
-        <el-form-item label="柴油优惠/L" prop="dieseloilDiscountLitre">
-          <el-input v-model="form.dieseloilDiscountLitre" placeholder="请输入柴油优惠/L" />
-        </el-form-item>
+<!--        <el-form-item label="柴油优惠/L" prop="dieseloilDiscountLitre">-->
+<!--          <el-input v-model="form.dieseloilDiscountLitre" placeholder="请输入柴油优惠/L" />-->
+<!--        </el-form-item>-->
         <el-form-item label="类型" v-show="false" prop="growthValue">
           <el-input v-model="form.gradeType" value="1" />
         </el-form-item>
@@ -203,6 +214,8 @@ export default {
       grouthRuleList:[],
       settingList: [],
       DTsettingList: [],
+      //下拉油品名称
+      oilNameOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -264,6 +277,9 @@ export default {
     this.getList();
     //this.getRuleList();
    // this.getList2();
+    this.getDicts("oil_name").then(response => {
+      this.oilNameOptions = response.data;
+    });
   },
   methods: {
     /** 查询客户优惠等级设置列表 */
@@ -310,6 +326,7 @@ export default {
         grouthValueName: null,
         grouthValueConsume: null,
         grouthValue: null,
+        oilName:null,
         // gasoilConsume: null,
         // gasoilGrowthValue: null,
         // dieseloilConsume: null,

Yijia-SaaS/yijia-ui/src/views/dataSource/dayReport.vue

@@ -57,10 +57,10 @@
           </el-col>
         </el-row>
       </div>
-      <div style="width:100%; height: 360px;margin: 0px 30px;background: #FFFFFF;">
+      <div style="width:100%; height: 360px;background: #FFFFFF;">
         <span style="color:#ff9955;font-size:25px;">|</span>
         <span style="font-size:20px;">销售情况</span>
-        <div ref="myChart" style="width:100%; height: 350px;"></div>
+        <div ref="myChart" style="width:100%; height: 350px;margin: 0px 25px;"></div>
       </div>
       <div style="width:100%; height: 181px;">
         <span style="color:#ff9955;font-size:25px;">|</span>
@@ -89,17 +89,24 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="dayReportDetail"
+        />
       </div>
       <el-dialog :title="title" width="800px"  :visible.sync="open" append-to-body>
         <el-table v-loading="loading" :data="dayReportDetailsList">
           <el-table-column label="油品" align="center" prop="oilName" />
           <el-table-column label="油枪号" align="center" prop="oilGun" />
           <el-table-column label="销量（L）" align="center" prop="orderLiters" />
-          <el-table-column label="销额（元）" align="center" prop="amt" />
-          <el-table-column label="优惠" align="center" prop v-if="false" />
-          <el-table-column label="优惠卷" align="center" prop />
-          <el-table-column label="实收" align="center" prop />
-          <el-table-column label="会员支付" align="center" prop="menberAmt" />
+          <el-table-column label="销额（元）" align="center" prop="receivableAmt" />
+          <el-table-column label="优惠" align="center" prop="discountAmt" v-if="false" />
+          <el-table-column label="优惠卷" align="center" prop="discountCouponAmt" />
+          <el-table-column label="实收" align="center" prop="amt" />
+          <el-table-column label="会员支付" align="center" prop="menberAmt" v-if="false" />
           <el-table-column label="微信支付" align="center" prop="wxAmt" />
           <el-table-column label="支付宝支付" align="center" prop="zfbAmt" />
           <el-table-column label="会员充值" align="center" prop v-if="false" />
@@ -124,6 +131,7 @@ import {
   listSum,
   listOilType,
   listDayReport,
+  selectDayReportDetail,
   getDetails,
   listXdata,
   listQydata92,
@@ -189,6 +197,7 @@ export default {
         pageSize: 10,
         payDate: null,
         status: null,
+        createdDate: null,
         beginTime: null,
         endTime: null
       },
@@ -209,7 +218,6 @@ export default {
     this.$nextTick(() => {
       this.queryParams.beginTime = this.getMonthDate();
       this.queryParams.endTime = this.getEndFormatDate(new Date());
-      // this.initChart();
       setTimeout(() => {
         this.initChart();
       }, 1000);
@@ -222,17 +230,10 @@ export default {
     this.queryParams.endTime = this.getEndFormatDate(new Date());
     this.getDatas();
     this.dayDataSource();
-    //不加等待时间的话，初始化了echarts,，getDatas的数据没有获取到。等待后数据获取到，重新加载就可以了。
-    // setTimeout(() =>{
-    //   this.initChart();
-    // },2000);
   },
   methods: {
     initChart() {
-      console.log("打印查询参数1", this.queryParams);
       // 初始化echarts
-      console.log("6", this.xdata);
-      console.log("7", this.cydata0);
       this.charts = echarts.init(this.$refs.myChart, "macarons");
       this.charts.setOption(
         {
@@ -357,12 +358,10 @@ export default {
         true
       );
     },
-
     getXData() {
       return listXdata(this.queryParams).then(response => {
         this.xdata = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             this.xdata.push(response.rows[i].createdDate);
           }
@@ -373,8 +372,7 @@ export default {
     getQyData92() {
       return listQydata92(this.queryParams).then(response => {
         this.qydata92 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -388,8 +386,7 @@ export default {
     getQydata95() {
       return listQydata95(this.queryParams).then(response => {
         this.qydata95 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -403,8 +400,7 @@ export default {
     getQydata97() {
       return listQydata97(this.queryParams).then(response => {
         this.qydata97 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -418,8 +414,7 @@ export default {
     getQydata0() {
       return listQydata0(this.queryParams).then(response => {
         this.cydata0 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -433,8 +428,7 @@ export default {
     getQydata10() {
       return listQydata10(this.queryParams).then(response => {
         this.cydata10 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -448,8 +442,7 @@ export default {
     getQydata20() {
       return listQydata20(this.queryParams).then(response => {
         this.cydata20 = [];
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             let data = [];
             data.push(response.rows[i].createdDate);
@@ -478,15 +471,13 @@ export default {
     /** 查询优惠劵管理列表 */
     getList() {
       listSum(this.queryParams).then(response => {
-        if (response.data === "undefined") {
-        } else {
+        if (response.hasOwnProperty('data')) {
           this.form.zongAmt = response.data.amt;
           this.form.zongliters = response.data.orderLiters;
         }
       });
       listOilType(this.queryParams).then(response => {
-        if (response.rows === "undefined") {
-        } else {
+        if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
             if (response.rows[i].oilType === "1") {
               this.form.qyamt = response.rows[i].amt;
@@ -496,8 +487,12 @@ export default {
           }
         }
       });
-      listDayReport(this.queryParams).then(response => {
+      this.dayReportDetail();
+    },
+    dayReportDetail(){
+      selectDayReportDetail(this.queryParams).then(response => {
         this.dayReportList = response.rows;
+        console.log("response",response);
         this.total = response.total;
         this.loading = false;
       });
@@ -642,13 +637,18 @@ export default {
 
     /** 查看详情按钮操作 */
     handleLook(row) {
-      const createdDate = row.createdDate;
+      this.row =row;
+      row.page= this.queryInfo.pageNum;
+      row.limit= this.queryInfo.pageSize;
+      this.getLookOrder(row);
+    },
+    getLookOrder(row) {
+      const createdDate = this.row.createdDate;
       this.queryInfo.beginTime =createdDate.substring(0,10) +" 00:00:00";
       this.queryInfo.endTime =createdDate.substring(0,10) +" 23:59:59";
       this.queryInfo.status = "1";
-      this.getLookOrder();
-    },
-    getLookOrder() {
+      this.queryInfo.pageNum=row.page;
+      this.queryInfo.pageSize =row.limit;
       getDetails(this.queryInfo).then(response => {
         this.dayReportDetailsList = response.rows;
         this.total1 = response.total;

Yijia-SaaS/yijia-ui/src/views/dataSource/saleReport.vue

@@ -141,7 +141,7 @@
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
             <div>
-              <span>268</span>
+              <span>0</span>
             </div>
             <div>充值金额(元)</div>
           </div>
@@ -149,38 +149,38 @@
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
             <div>
-              <span>26800</span>
+              <span>0</span>
             </div>
             <div>会员消费金额（元）</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
-            <div><span>26800</span></div>
+            <div><span>0</span></div>
             <div>会员余额（元）</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
-            <div><span>1</span></div>
+            <div><span>0</span></div>
             <div>新增会员(人)</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
-            <div><span>1</span></div>
+            <div><span>0</span></div>
             <div>会员总数（人）</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
-            <div><span>1</span></div>
+            <div><span>0</span></div>
             <div>营销费用(元)</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="3">
           <div class="flex-sr">
-            <div><span>1</span></div>
+            <div><span>0</span></div>
             <div>营销产出比(%)</div>
           </div>
         </el-col>
@@ -259,21 +259,19 @@ export default {
     /** 查询优惠劵管理列表 */
     getList() {
       listSum(this.queryParams).then(response => {
-        if(response.data==="undefined"){
-        }else{
+        if(response.hasOwnProperty('data')){
           this.form.zongAmt = response.data.amt;
           this.form.zongliters = response.data.orderLiters;
         }
 
       });
       listOilType(this.queryParams).then(response => {
-        if(response.rows==="undefined"){
-        }else{
+        if(response.hasOwnProperty('rows')){
           for(let i in response.rows){
-            if(response.rows[i].oilType==="1"){
+            if(response.rows[i].oilType==="2"){
               this.form.qyamt=response.rows[i].amt;
               this.form.qyliters=response.rows[i].orderLiters;
-            }else if(response.rows[i].oilType==="2"){
+            }else if(response.rows[i].oilType==="1"){
               this.form.cyamt=response.rows[i].amt;
               this.form.cyliters=response.rows[i].orderLiters;
             }
@@ -281,8 +279,7 @@ export default {
         }
       });
       listViewData(this.queryParams).then(response => {
-        if(response.data=="undefined"){
-        }else{
+        if(response.hasOwnProperty('data')){
           this.form.wxAmt = response.data.wxAmt;
           this.form.zfbAmt = response.data.zfbAmt;
           this.form.xjAmt = response.data.xjAmt;

Yijia-SaaS/yijia-ui/src/views/station/price/index.vue

@@ -91,7 +91,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="调整价格" prop="oilAdjustPrice">
-          <el-input-number v-model="form1.oilAdjustPrice" :precision="2" :min="1" :step="0.1" ></el-input-number>
+          <el-input-number v-model="form1.oilAdjustPrice" :precision="2" :min="0" :step="0.1" ></el-input-number>
         </el-form-item>
         <el-form-item label="生效状态" prop="takeEffectStatus">
           <el-radio-group v-model="form1.takeEffectStatus">

Yijia-SaaS/yijia-ui/src/views/station/structure/index.vue

@@ -103,8 +103,7 @@ export default {
     }else{
        //初始化数据，在数据中查询上次班结结束时间，这里登陆人，还不能是员工，员工不能登陆，我们只能默认这里的数据是写死的油站
       getAgeClassStructure().then(response => {
-        if(response.data==undefined){
-        }else{
+        if(response.hasOwnProperty('data')){
           this.opo.classStartDate = response.data.classStructureDate;
         }
         this.opo.classStructureMan =this.$store.state.user.name;

Yijia-SaaS/yijia-ui/src/views/station/summary/index.vue

@@ -212,7 +212,7 @@ export default {
     /** 查询【请填写功能名称】列表 */
     getList() {
       this.loading = true;
-      listSummary(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listSummary(this.addDateRange(this.queryParams, this.dateRangeCreatedDate)).then(response => {
         this.summaryList = response.rows;
         this.total = response.total;
         this.loading = false;