修改加气平台

src/api/dataSource/saleReport.js

@@ -9,6 +9,18 @@ export function listSum(query) {
   })
 }
 
+
+// 查询今日销售总金额，总升数包括已经作废的订单
+export function listAllSum(query) {
+  return request({
+    url: '/station/order/selectAllDaySources',
+    method: 'get',
+    params: query
+  })
+}
+
+
+//根据油品查询总的金额
 export function listOilType(query) {
   return request({
     url: '/station/order/selectOilTypeSources',
@@ -16,6 +28,15 @@ export function listOilType(query) {
     params: query
   })
 }
+//根据油品查询总的金额（包括退款的信息）
+export function listAllOilType(query) {
+  return request({
+    url: '/station/order/selectAllOilTypeSources',
+    method: 'get',
+    params: query
+  })
+}
+//查询收入的金额展示
 export function listViewData(query) {
   return request({
     url: '/station/order/selectOverViewData',
@@ -23,6 +44,14 @@ export function listViewData(query) {
     params: query
   })
 }
+//查询收入的金额展示（包括退款）
+export function listAllViewData(query) {
+  return request({
+    url: '/station/order/selectAllOverViewData',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询订单支付详细
 export function getOrder(orderId) {
@@ -39,6 +68,7 @@ export function listDayReport(query) {
     params: query
   })
 }
+//查询本月的消费情况
 export function selectDayReportDetail(query) {
   return request({
     url: '/station/order/selectDayReportDetail',
@@ -46,6 +76,15 @@ export function selectDayReportDetail(query) {
     params: query
   })
 }
+//查询本月的消费情况（包括已经退款的）
+export function selectAllDayReportDetail(query) {
+  return request({
+    url: '/station/order/selectAllDayReportDetail',
+    method: 'get',
+    params: query
+  })
+}
+//查询本天的消费情况
 export function getDetails(query) {
   return request({
     url: '/station/order/dayOilTypeSources',
@@ -53,6 +92,14 @@ export function getDetails(query) {
     params: query
   })
 }
+//查询本天的消费情况（包括已经退款的）
+export function getAllDetails(query) {
+  return request({
+    url: '/station/order/dayAllOilTypeSources',
+    method: 'get',
+    params: query
+  })
+}
 export function listQydata92(query) {
   return request({
     url: '/station/order/listQydata92',
@@ -102,6 +149,7 @@ export function listXdata(query) {
     params: query
   })
 }
+//累计充值
 export function listCZXFData(query) {
   return request({
     url: '/customer/record/listCZXFData',
@@ -109,7 +157,15 @@ export function listCZXFData(query) {
     params: query
   })
 }
-
+//累计充值（包含退款金额）
+export function listAllCZXFData(query) {
+  return request({
+    url: '/customer/record/listAllCZXFData',
+    method: 'get',
+    params: query
+  })
+}
+//汇总电子卡
 export function listHYData(query) {
   return request({
     url: '/customer/card/listHYData',
@@ -117,6 +173,8 @@ export function listHYData(query) {
     params: query
   })
 }
+
+
 export function listJRHYData(query) {
   return request({
     url: '/customer/card/listJRHYData',

src/api/station/order.js

@@ -8,6 +8,14 @@ export function listOrder(query) {
     params: query
   })
 }
+//查询订单的总数和总金额
+export function listOrder(query) {
+  return request({
+    url: '/station/order/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询订单支付详细
 export function getOrder(orderId) {
@@ -16,6 +24,21 @@ export function getOrder(orderId) {
     method: 'get'
   })
 }
+// 当前订单退款
+export function refund(orderId) {
+  return request({
+    url: '/station/order/refund/' + orderId,
+    method: 'get'
+  })
+}
+// 恢复当前订单
+export function reback(orderId) {
+  return request({
+    url: '/station/order/reback/' + orderId,
+    method: 'get'
+  })
+}
+
 
 // 新增订单支付
 export function addOrder(data) {

src/views/order/Order_Lng.vue

@@ -6,6 +6,12 @@
       :inline="true"
       label-width="68px"
     >
+     <el-form-item label="订单数：" prop="orderCount">
+       <label >{{ !lngData.countNum ? 0 : lngData.countNum}}</label>
+      </el-form-item>
+      <el-form-item label="金额：" prop="orderAmt">
+       <label >{{ !lngData.sellAmt ? 0 : lngData.amt}}</label>
+      </el-form-item>
       <el-form-item label="订单号" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -64,7 +70,7 @@
     </el-form>
     <el-table :data="orderList">
       <af-table-column label="油站名" align="center" prop="stationName" v-if="jiBie==0||jiBie==1"/>
-
+      <af-table-column label="订单id" align="center" prop="orderId"  v-if="false"/>
       <af-table-column label="订单号" align="center" prop="orderNo" />
       <af-table-column label="油品名称" align="center" prop="oilName" />
 
@@ -90,6 +96,28 @@
           }}</span>
         </template>
       </af-table-column>
+
+ <af-table-column label="支付状态" align="center" prop="status" :formatter="statusFotmat">
+      
+      </af-table-column>
+
+  <af-table-column label="操作" align="center" prop="payDate">
+        <template slot-scope="scope">
+            <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handlerefund(scope.row)"
+          >退款</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handlereback(scope.row)"
+          >回退</el-button>
+        </template>
+      </af-table-column>
+     
       <!-- <af-table-column label="创建时间" align="center" prop="createdDate">
         <template slot-scope="scope">
           <span>{{
@@ -109,9 +137,10 @@
   </div>
 </template>
 <script>
-import { listOrder, exportOrder, exportLngOrderGroup, exportLngOrderStation,  queryGroupOrder, queryStationOrder  } from "@/api/station/order";
+import { listOrder, exportOrder, exportLngOrderGroup, exportLngOrderStation,  queryGroupOrder, queryStationOrder,refund,reback,  } from "@/api/station/order";
 import { stationinfo } from "@/api/station/gun";
 import { listPrice, getPrice } from "@/api/station/price";
+import { listSum,listAllSum } from "@/api/dataSource/saleReport";
 
 export default {
   name: "Order_Lng",
@@ -148,6 +177,7 @@ export default {
       },
       // 表单校验
       rules: {},
+      lngData:{},
     };
   },
   created() {
@@ -186,24 +216,65 @@ export default {
         return "未支付";
       } else if (row.status === "1") {
         return "已支付";
+      }else if (row.status === "2") {
+        return "已退款";
       }
     },
     /** 查询订单支付列表 */
     getList() {
       this.queryParams.levelId = this.levelId
       let arrPro
+      const query = {
+        stationId: null,
+        createdDate: null,
+        stationName: null,
+        beginTime: null,
+        endTime: null,
+        levelId: this.levelId
+      };
       if(this.jiBie == 1){
         arrPro = queryGroupOrder(
           this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
-        )
+        );
+        query.beginTime=this.dateRangeCreatedDate[0];
+        query.endTime=this.dateRangeCreatedDate[1];
+        listSum(query).then((response) => {
+        if(response.data !=null) {
+          this.lngData=response.data;
+        }else{
+          throw new Error("")
+        }
+      }).catch(() => {
+        this.msgError("拉取overview不同油品的数据失败")
+      });
       }else if(this.jiBie == 2){
         arrPro = queryStationOrder(
           this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
-        )
+        );
+        query.beginTime=this.dateRangeCreatedDate[0];
+        query.endTime=this.dateRangeCreatedDate[1];
+        listSum(query).then((response) => {
+        if(response.data !=null) {
+          this.lngData=response.data;
+        }else{
+          throw new Error("")
+        }
+      }).catch(() => {
+        this.msgError("拉取overview不同油品的数据失败")
+      });
       }else{
         arrPro = queryGroupOrder(
           this.addDateRange(this.queryParams, this.dateRangeCreatedDate)
-        )
+        );
+        listAllSum(query).then((response) => {
+        if(response.data !=null) {
+          this.lngData=response.data;
+        }else{
+          throw new Error("")
+        }
+      }).catch(() => {
+        this.msgError("拉取overview不同油品的数据失败")
+      });
       }
       arrPro.then((response) => {
         this.orderList = response.rows;
@@ -242,6 +313,34 @@ export default {
           this.download(response.msg);
         });
     },
+      //退款方法接口
+    handlerefund(row) {
+      this.$confirm('是否进行退款"', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+           return refund(row.orderId)
+        }).then((res) => {
+         // this.getList();
+         this.getList();
+          this.msgSuccess("退款成功");
+        })
+    },
+      //回退方法
+    handlereback(row) {
+      this.$confirm('是否对退款账单进行回退"', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+           return reback(row.orderId)
+        }).then((res) => {
+         // this.getList();
+         this.getList();
+          this.msgSuccess("回退成功");
+        })
+    },
   },
 };
 </script>

src/views/overview/Overview_Daily.vue

@@ -129,10 +129,14 @@ import echarts from "echarts";
 require("echarts/theme/macarons"); // echarts theme
 import {
   listSum,
+  listAllSum,
+  listAllOilType,
   listOilType,
   listDayReport,
   selectDayReportDetail,
+  selectAllDayReportDetail,
   getDetails,
+  getAllDetails,
   listXdata,
   listQydata92,
   listQydata95,
@@ -480,12 +484,36 @@ export default {
 
     /** 查询优惠劵管理列表 */
     getList() {
+      if(this.jiBie==0){
+     listAllSum(this.queryParams).then(response => {
+        if (response.data!=null) {
+          this.form.zongAmt = response.data.amt;
+          this.form.zongliters = response.data.orderLiters;
+        }
+      });
+      }else{
       listSum(this.queryParams).then(response => {
         if (response.data!=null) {
           this.form.zongAmt = response.data.amt;
           this.form.zongliters = response.data.orderLiters;
         }
       });
+      }
+      if(this.jiBie==0){
+     listAllOilType(this.queryParams).then(response => {
+        if(response.hasOwnProperty('rows')){
+          for (let i in response.rows) {
+            if (response.rows[i].oilType === "1") {
+              this.form.qyamt = response.rows[i].amt;
+            } else if (response.rows[i].oilType === "2") {
+              this.form.cyamt = response.rows[i].amt;
+            }
+          }
+        }
+      });
+      }else{
+
+      
       listOilType(this.queryParams).then(response => {
         if(response.hasOwnProperty('rows')){
           for (let i in response.rows) {
@@ -497,14 +525,24 @@ export default {
           }
         }
       });
+      
+      }
       this.dayReportDetail();
     },
     dayReportDetail(){
+      if(this.jiBie==0){
+       selectAllDayReportDetail(this.queryParams).then(response => {
+        this.dayReportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      }else{
       selectDayReportDetail(this.queryParams).then(response => {
         this.dayReportList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
+      }
     },
     //本日的数据
     dayDataSource() {
@@ -677,12 +715,21 @@ export default {
       this.queryInfo.pageNum=row.page;
       this.queryInfo.pageSize =row.limit;
       this.queryInfo.orderType = "1";
+      if(this.jiBie==0){
+      getAllDetails(this.queryInfo).then(response => {
+        this.dayReportDetailsList = response.rows;
+        this.total1 = response.total;
+        this.open = true;
+        this.title = "日报详细信息";
+      });
+      }else{
       getDetails(this.queryInfo).then(response => {
         this.dayReportDetailsList = response.rows;
         this.total1 = response.total;
         this.open = true;
         this.title = "日报详细信息";
       });
+      }
     },
     getTotal(param) {
       const { columns, data } = param;

src/views/overview/Overview_LngSummary.vue

@@ -221,6 +221,10 @@ import {
   listCZXFData,
   listHYData,
   listJRHYData,
+  listAllSum,
+  listAllOilType,
+  listAllViewData,
+  listAllCZXFData,
 } from "@/api/dataSource/saleReport";
 
 export default {
@@ -264,10 +268,20 @@ export default {
   },
   created() {
     this.getData(0);
+    console.log('1111111111',this.jiBie)
   },
   methods: {
     /** 查询优惠劵管理列表 */
     getList(query) {
+      if(this.jiBie==0){
+         listAllSum(query).then((response) => {
+        if (response.data != null ) {
+          this.form.zongAmt = response.data.sellAmt;
+          this.form.zongliters = response.data.orderLiters;
+          this.form.countNum = response.data.countNum
+        }
+      });
+      }else if(this.jiBie==2){
       listSum(query).then((response) => {
         if (response.data != null ) {
           this.form.zongAmt = response.data.sellAmt;
@@ -275,6 +289,30 @@ export default {
           this.form.countNum = response.data.countNum
         }
       });
+      }else if(this.jiBie==1){
+      listSum(query).then((response) => {
+        if (response.data != null ) {
+          this.form.zongAmt = response.data.sellAmt;
+          this.form.zongliters = response.data.orderLiters;
+          this.form.countNum = response.data.countNum
+        }
+      });
+      }
+      if(this.jiBie==0){
+         listAllOilType(query).then((response) => {
+        if(response.code == 200) {
+          this.lngData = response.rows.filter((ele)=>{
+            return ele.oilType == '4'
+          })[0]
+          this.lngData = this.lngData == undefined ?  {} : this.lngData
+          console.log(this.lngData.orderLiters)
+        }else{
+          throw new Error("")
+        }
+      }).catch(() => {
+        this.msgError("拉取overview不同油品的数据失败")
+      });
+      }else{
       listOilType(query).then((response) => {
         if(response.code == 200) {
           this.lngData = response.rows.filter((ele)=>{
@@ -287,6 +325,53 @@ export default {
       }).catch(() => {
         this.msgError("拉取overview不同油品的数据失败")
       });
+      }
+      if(this.jiBie==0){
+       listAllViewData(query).then((response) => {
+        if (response.data!=null ) {
+          if (response.data.wxAmt) {
+            this.form.wxAmt = response.data.wxAmt;
+          } else {
+            this.form.wxAmt = 0;
+          }
+          if (response.data.zfbAmt) {
+            this.form.zfbAmt = response.data.zfbAmt;
+          } else {
+            this.form.zfbAmt = 0;
+          }
+          if (response.data.xjAmt) {
+            this.form.xjAmt = response.data.xjAmt;
+          } else {
+            this.form.xjAmt = 0;
+          }
+          if (response.data.didiAppAmt) {
+            this.form.didiAppAmt = response.data.didiAppAmt;
+          } else {
+            this.form.didiAppAmt = 0;
+          }
+          if (response.data.tyAppAmt) {
+            this.form.tyAppAmt = response.data.tyAppAmt;
+          } else {
+            this.form.tyAppAmt = 0;
+          }
+          if (response.data.otherAmt) {
+            this.form.otherAmt = response.data.otherAmt;
+          } else {
+            this.form.otherAmt = 0;
+          }
+          if (response.data.memberAmt) {
+            this.form.memberAmt = response.data.memberAmt;
+          } else {
+            this.form.memberAmt = 0;
+          }
+          if (response.data.posAmt) {
+            this.form.posAmt = response.data.posAmt;
+          } else {
+            this.form.posAmt = 0;
+          }
+        }
+      });
+      }else{
       listViewData(query).then((response) => {
         if (response.data!=null ) {
           if (response.data.wxAmt) {
@@ -331,9 +416,27 @@ export default {
           }
         }
       });
+      }
     },
     //本日的数据
     getTodayList(query) {
+      if(this.jiBie==0){
+    // 查询汇总充值金额(包括退款金额)
+      listAllCZXFData(query).then((response) => {
+        if (response.data!=null ) {
+          if (response.data.czAmt) {
+            this.infoFrom.czAmt = response.data.czAmt;
+          } else {
+            this.infoFrom.czAmt = 0;
+          }
+          if (response.data.xfAmt) {
+            this.infoFrom.xfAmt = response.data.xfAmt;
+          } else {
+            this.infoFrom.xfAmt = 0;
+          }
+        }
+      });
+      }else{
       // 查询汇总充值金额
       listCZXFData(query).then((response) => {
         if (response.data!=null ) {
@@ -349,6 +452,7 @@ export default {
           }
         }
       });
+      }
      
       // 汇总电子卡数据
       listHYData(query).then((response) => {

src/views/overview/Overview_Summary.vue

@@ -229,6 +229,7 @@ import {
   listCZXFData,
   listHYData,
   listJRHYData,
+  listAllSum,
 } from "@/api/dataSource/saleReport";
 
 export default {
@@ -275,12 +276,21 @@ export default {
   methods: {
     /** 查询优惠劵管理列表 */
     getList(query) {
+      if(this.jiBie==0){
+      listAllSum(query).then((response) => {
+        if (response.data!=null ) {
+          this.form.zongAmt = response.data.amt;
+          this.form.zongliters = response.data.orderLiters;
+        }
+      });
+      }else{
       listSum(query).then((response) => {
         if (response.data!=null ) {
           this.form.zongAmt = response.data.amt;
           this.form.zongliters = response.data.orderLiters;
         }
       });
+      }
       listOilType(query).then((response) => {
         if (response.hasOwnProperty("rows")) {
           for (let i in response.rows) {

src/views/system/dept/index.vue

@@ -81,7 +81,7 @@
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>
             <el-button
-            v-if="scope.row.parentId != 0"
+          
             size="mini"
             type="text"
             icon="el-icon-paperclip"
@@ -124,14 +124,7 @@
               <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="LNG平台" v-show="showIsLngFlag">
-              <el-radio-group v-model="form.isLngFlag">
-                <el-radio label="1"> 是 </el-radio>
-                <el-radio label="0"> 否 </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+         
           <el-col :span="12" v-show="false">
             <el-form-item label="jiBie " prop="jiBie">
               <el-input v-model="form.jiBie"  maxlength="50" />
@@ -200,26 +193,33 @@
             </el-form-item>
           </el-col>
          
-           <el-col :span="12" v-show="isShow">
+           <el-col :span="12" >
             <el-form-item label="分账收款商户编号" prop="mnoArray">
               <el-input v-model="form.mnoArray"  maxlength="50" />
             </el-form-item>
           </el-col>
-           <el-col :span="12" v-show="isShow">
+           <el-col :span="12" >
             <el-form-item label="分账账号比例" prop="mnoProportion">
               <el-input v-model="form.mnoProportion"  maxlength="50" />
             </el-form-item>
           </el-col>
 
-         <el-col :span="12" v-show="isShow">
+         <el-col :span="12" >
             <el-form-item label="是否分账" >
               <el-radio-group v-model="form.mnoStatus">
-                <el-radio label="0"> 是 </el-radio>
-                <el-radio label="1"> 否 </el-radio>
+                <el-radio label="1"> 是 </el-radio>
+                <el-radio label="0"> 否 </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        <el-col :span="12">
+            <el-form-item label="LNG平台" v-show="showIsLngFlag">
+              <el-radio-group v-model="form.isLngFlag">
+                <el-radio label="1"> 是 </el-radio>
+                <el-radio label="0"> 否 </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">