Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main

2024-10-23 10:09:33 +08:00 · 2024-10-23 10:09:33 +08:00 · 74e06e1c11
commit 74e06e1c11
parent dc552e4c48 3a590eb4b3
8 changed files with 251 additions and 140 deletions
--- a/fuintAdmin/src/api/sys/sysLog.js
+++ b/fuintAdmin/src/api/sys/sysLog.js
@ -8,6 +8,14 @@ export function getListApi(query) {
    params: query
  })
 }
+// 分页查询所有的订单信息
+export function getList1Api(query) {
+  return request({
+    url: 'sysLog/list',
+    method: 'get',
+    params: query
+  })
+}

 //
 export function deleteApi(ids) {
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@ -138,7 +138,7 @@
                size="mini"
                type="text"
                @click="returnRecord(scope.row.id)"
-              >170px</el-button>
+              >归还详情</el-button>
            </template>
          </el-table-column>
        </el-table>
--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@ -96,7 +96,7 @@
 ">
          <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" @click="exportExcelGoodsOrder()">导出订单</el-button>
+          <el-button type="primary" @click="exportExcelGoodsOrder()">导出</el-button>

        </el-form-item>
      </el-form>
@ -131,10 +131,10 @@
          </el-table-column>
          <el-table-column label="订单状态" align="center" prop="payType">
            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status === 'refund'">退款成功</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <div v-if="scope.row.status == 'unpaid'" style="color: #F44522">未支付</div>
+              <div v-else-if="scope.row.status == 'paid'" style="color: #0DC291">支付成功</div>
+              <div v-else-if="scope.row.status === 'refund'" style="color: #F44522">退款成功</div>
+              <div v-else style="color: #F44522">支付失败</div>
            </template>
          </el-table-column>
          <!--        <el-table-column label="订单类型" align="center" prop="type"/>-->
@ -202,7 +202,8 @@
        <div>
          <el-input placeholder="请输入退款原因" v-model="refundRemark"></el-input>
          <br/>
-          <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+          <span
+            style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
        </div>
        <span slot="footer" class="dialog-footer">
        <el-button @click="dialogRefund = false">取 消</el-button>
@ -307,6 +308,10 @@ export default {
  },
  methods: {
    exportExcelGoodsOrder() {
+      this.$confirm('是否导出列表中的数据！', '提示', {
+        confirmButtonText: '导出',
+        cancelButtonText: '取消'
+      }).then(() => {
        let dateRange = []
        if (this.beginTime && this.endTime) {
          dateRange.push(this.beginTime.toLocaleDateString())
@ -316,6 +321,9 @@ export default {
          const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
          this.$download.saveAs(blob, '商品订单统计.xLsx')
        })
+      }).catch(() => {
+
+      });
    },
    // 订单统计
    getOrderStatistics() {
@ -336,7 +344,8 @@ export default {
        // return delUser(row.id);
      }).then(() => {
        this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
-      }).catch(() => {});
+      }).catch(() => {
+      });
    },
    // 退款
    async handleRefund(id) {
@ -354,8 +363,10 @@ export default {


      let title = '是否将该收银台下的订单全部退款'
-      await getOrderInfoApi({orderNo: this.goods.orderNo,
-        type: 'goods'}).then(res=>{
+      await getOrderInfoApi({
+        orderNo: this.goods.orderNo,
+        type: 'goods'
+      }).then(res => {
        if (res.code === 200) {
          if (res.data.type === "1") {
            title = '该订单下有其它商品订单，是否一并退款'
@ -531,6 +542,7 @@ export default {
  height: 100%;
  background: #f6f8f9;
 }
+
 .app-top {
  width: 100%;

@ -538,14 +550,17 @@ export default {
  box-sizing: border-box;
  padding: 10px;
 }
+
 .clearfix {
  width: 100%;

 }
+
 .box-card {
  width: 100%;
  margin-bottom: 15px;
 }
+
 .box-gang {
  width: 100%;
  display: flex;
@ -553,6 +568,7 @@ export default {
  flex-wrap: wrap;

 }
+
 .box {
  //box-sizing: border-box;
  padding: 5px;
@ -568,9 +584,11 @@ export default {
  border: 1px solid #fe8c4a;

 }
+
 .el-form--inline .el-form-item {
  margin-right: 44px;
 }
+
 .size-hui {
  display: flex;
  align-items: center;
@ -583,10 +601,12 @@ export default {
  text-align: left;
  font-style: normal;
  text-transform: none;
+
  .nei {
    width: 150px;
  }
 }
+
 .size-bole {
  //font-weight: bold;

@ -601,6 +621,7 @@ export default {
  font-style: normal;
  text-transform: none;
 }
+
 .wgang {
  width: 100%;
  display: flex;
@ -609,16 +630,21 @@ export default {
  margin-bottom: 20px;

 }
+
 .table-box {
  width: 100%;
+  height: 70vh;
+  overflow: auto;
 }
+
 .pagination-box {
  width: 100%;
  margin: 10px auto;
  display: flex;
-  align-items: center;
-  justify-content: center;
+  align-items: end;
+  justify-content: end;
 }
+
 .top-app-sou {
  width: 20%;
 }
@ -628,6 +654,7 @@ export default {
  width: 100%;
  height: 20px;
  margin-right: 5px;
+
  img {
    float: right;
    //width: 100%;
@ -635,6 +662,7 @@ export default {
    height: 100%;
  }
 }
+
 .box1 {
  //box-sizing: border-box;
  padding: 5px;
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@ -21,19 +21,33 @@
            </el-option>
          </el-select>
        </el-form-item>
+        <el-form-item label="" prop="oilGunNum">
+          <el-select
+            v-model="queryParams.oils"
+            filterable
+            clearable
+            placeholder="请选择油品油号"
+          >
+            <el-option v-for="item in oilTypeList"
+                       :key="item.oilId"
+                       :label="item.oilName"
+                       :value="item.oilId">
+              <span style="float: left">{{ item.oilType }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilName }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
        <el-form-item label="" prop="oilGunNum">
          <el-select
            v-model="queryParams.oilGunNum"
            filterable
            clearable
-            placeholder="请选择油号油枪"
+            placeholder="请选择油枪"
          >
            <el-option v-for="item in oilGunList"
                       :key="item.id"
                       :label="item.gunName"
                       :value="item.id">
-              <span style="float: left">{{ item.oilName }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.gunName }}</span>
            </el-option>
          </el-select>
        </el-form-item>
@ -49,8 +63,6 @@
                       :label="item.dictLabel"
                       :value="item.dictValue">
            </el-option>
-            <el-option label="囤油卡" value="oilCard"/>
-            <el-option label="储值卡" value="balance"/>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="staffId">
@ -138,17 +150,14 @@
          <el-table-column prop="payType" label="付款方式" align="center">
            <template slot-scope="scope">
              <span>{{getType(payList,scope.row.payType)}}</span>
-              <span v-if="scope.row.payType=='oilCard'">囤油卡</span>
-              <span v-if="scope.row.payType=='balance'">储值卡</span>
-              <span v-if="scope.row.payType=='credit'">挂账</span>
            </template>
          </el-table-column>
          <el-table-column prop="orderStatus" label="订单状态" align="center">
            <template slot-scope="scope">
-              <el-tag v-if="scope.row.orderStatus === 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.orderStatus === 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.orderStatus === 'refund'">已退款</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
+              <div v-if="scope.row.orderStatus === 'unpaid'" style="color: #F44522">未支付</div>
+              <div v-else-if="scope.row.orderStatus === 'paid'" style="color: #0DC291">支付成功</div>
+              <div v-else-if="scope.row.orderStatus === 'refund'" style="color: #F44522">已退款</div>
+              <div v-else style="color: #F44522">支付失败</div>
            </template>
          </el-table-column>
 <!--          <el-table-column prop="orderType" label="订单类型" align="center" > </el-table-column>-->
@ -270,7 +279,7 @@
 <script>
  import {queryStaffs} from "@/api/order/staff";
  import {getDicts} from "@/api/order/data";
-  import {getOilNameList, getOilNumGun, oilNumbers} from "@/api/order/oilnumgun";
+  import {getOilNameList, getOilNumGun, oilNumberList1, oilNumbers} from "@/api/order/oilnumgun";
  import {listOilOrder, oilOrderInfo, orderStatisticsApi} from "@/api/order/oilorder";
  import {getUser, queryUsers} from "@/api/order/user";
  import {exportExcelOilOrderApi} from "@/api/order/exportExcel";
@ -314,6 +323,8 @@
          pageSize: 10,
        },
        total:0,
+        // 油品油号列表
+        oilTypeList:[],
        // 油枪列表
        oilGunList:[],
        // 用户列表
@ -432,6 +443,10 @@

      },
      exportExcelOilOrder() {
+        this.$confirm('是否导出列表中的数据！', '提示', {
+          confirmButtonText: '导出',
+          cancelButtonText: '取消'
+        }).then(() => {
          let dateRange = []
          if (this.beginTime && this.endTime) {
            dateRange.push(this.beginTime.toLocaleDateString())
@ -441,6 +456,10 @@
            const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
            this.$download.saveAs(blob,'油品订单统计.xLsx')
          })
+        }).catch(() => {
+
+        });
+
      },


@ -462,6 +481,10 @@
            }
          })
        })
+        // 油品油号信息
+        oilNumberList1().then(res => {
+          this.oilTypeList = res.data.records
+        })
      },
      getPayType(){
        getDicts("payment_type").then(res => {
@ -758,13 +781,15 @@
  }
  .table-box{
    width: 100%;
+    height: 70vh;
+    overflow: auto;
  }
  .pagination-box{
    width: 100%;
    margin: 10px auto;
    display: flex;
-    align-items: center;
-    justify-content: center;
+    align-items: end;
+    justify-content: end;
  }
  .top-app-sou{
    width: 20%;
--- a/fuintAdmin/src/views/power/banner.vue
+++ b/fuintAdmin/src/views/power/banner.vue
@ -44,6 +44,7 @@
            type="primary"
            icon="el-icon-plus"
            @click="handleAdd"
+            v-hasPermi="['setting:banner:add']"
          >新增banner图</el-button>
        </el-form-item>
      </el-form>
--- a/fuintAdmin/src/views/power/operateLog.vue
+++ b/fuintAdmin/src/views/power/operateLog.vue
@ -32,12 +32,13 @@

          <el-form-item label="" prop="systemName">
            <el-select
-              v-model="queryParams.systemName"
+              v-model="systemName"
              placeholder="请选择系统终端"
              clearable
+              @change="chooseSystemName"
              style="width: 240px"
            >
-              <el-option label="中台端" value="1"></el-option>
+<!--              <el-option label=" " value="1"></el-option>-->
              <el-option label="油站端" value="2"></el-option>
              <el-option label="收银端" value="3"></el-option>
            </el-select>
@ -153,7 +154,7 @@

 <script>

-import {deleteApi, getListApi, saveApi, updateApi} from "../../api/sys/sysLog";
+import {deleteApi, getList1Api, getListApi, saveApi, updateApi} from "../../api/sys/sysLog";
 import {getToken} from '../../utils/auth'
 import {selectChildByDeptId} from "../../api/system/Site/site";

@ -194,7 +195,9 @@ export default {
        bannerName: '',
        systemPosition: '',
        bannerStatus: '',
+        systemName: '1'
      },
+      systemName:"",

      // 上传地址
      uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
@ -234,6 +237,9 @@ export default {
    this.selectChildByDeptIdApi()
  },
  methods: {
+    chooseSystemName(){
+      this.queryParams.systemName = this.systemName
+    },
    selectChildByDeptIdApi() {
      selectChildByDeptId().then(res => {
        this.deptListSelect = res.data
@ -270,7 +276,7 @@ export default {
    },
    getList() {
      this.queryParams.current = this.queryParams.page
-      getListApi(this.queryParams).then(res => {
+      getList1Api(this.queryParams).then(res => {
        this.tableData = res.data.records;
        this.total = res.data.total
      })
@ -331,7 +337,9 @@ export default {
        page: 1,
        pageSize: 10,
        deviceName: '',
-      },
+        systemName: "1"
+      }
+      this.systemName = ""
      this.getList()
    },
    handleAdd(e) {
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@ -18,6 +18,9 @@
            <if test="order.terminal != null and order.terminal != ''">
                and terminal = #{order.terminal}
            </if>
+            <if test="order.oils != null and order.oils != ''">
+                and oils = #{order.oils}
+            </if>
            <if test="order.oilGunNum != null and order.oilGunNum != ''">
                and oil_gun_num = #{order.oilGunNum}
            </if>
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java
@ -68,6 +68,44 @@ public class SysLogController extends BaseController {
        return getSuccessResult(this.sysLogService.page(page, sysLogLambdaQueryWrapper));
    }

+    /**
+     * 分页查询所有数据（油站端）
+     *
+     * @param page 分页对象
+     * @param sysLog 查询实体
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public ResponseObject selectAll1(@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                    @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, SysLog sysLog) {
+        LambdaQueryWrapper<SysLog> sysLogLambdaQueryWrapper = new LambdaQueryWrapper();
+        Page page =new Page(pageNo,pageSize);
+        if (!StringUtils.isEmpty(sysLog.getCreateName())){
+            sysLogLambdaQueryWrapper.like(SysLog::getCreateName,sysLog.getCreateName());
+        }
+        if (!StringUtils.isEmpty(sysLog.getDeptId())){
+            sysLogLambdaQueryWrapper.eq(SysLog::getDeptId,sysLog.getDeptId());
+        }
+        if (!StringUtils.isEmpty(sysLog.getMoudle())){
+            sysLogLambdaQueryWrapper.like(SysLog::getMoudle,sysLog.getMoudle());
+        }
+        if (!StringUtils.isEmpty(sysLog.getSystemName())){
+            if (sysLog.getSystemName().equals("1")){
+                sysLogLambdaQueryWrapper.ne(SysLog::getSystemName,sysLog.getSystemName());
+            }else {
+                sysLogLambdaQueryWrapper.eq(SysLog::getSystemName,sysLog.getSystemName());
+            }
+        }
+        if (!ObjectUtils.isEmpty(sysLog.getStartTime())){
+            sysLogLambdaQueryWrapper.ge(SysLog::getCreateTime,sysLog.getStartTime());
+        }
+        if (!ObjectUtils.isEmpty(sysLog.getEndTime())){
+            sysLogLambdaQueryWrapper.le(SysLog::getCreateTime, DateUtil.format(sysLog.getEndTime(),"yyyy-MM-dd")+" 23:59:59");
+        }
+        sysLogLambdaQueryWrapper.orderByDesc(SysLog::getCreateTime);
+        return getSuccessResult(this.sysLogService.page(page, sysLogLambdaQueryWrapper));
+    }
+
    /**
     * 通过主键查询单条数据
     *