dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-15 17:56:15 +08:00
parent 24c476cb57
commit 3e77c29858
13 changed files with 75 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
View File

@ -69,8 +69,8 @@
</div> </div>
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<!-- <div class="wgang">--> <!-- <div class="wgang">-->
<!-- <div></div>--> <!-- <div></div>-->
<!-- </div>--> <!-- </div>-->

4
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -98,8 +98,8 @@
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<!-- <div class="wgang">--> <!-- <div class="wgang">-->
<!-- <div>机构流水分析列表</div>--> <!-- <div>机构流水分析列表</div>-->
<!-- </div>--> <!-- </div>-->

4
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -166,8 +166,8 @@
</div> </div>
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<!-- <div class="wgang">--> <!-- <div class="wgang">-->
<!-- <div></div>--> <!-- <div></div>-->
<!-- </div>--> <!-- </div>-->

6
fuintAdmin/src/views/handover/HandoverDetails.vue
View File

@ -51,7 +51,8 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card style="margin-top: 20px" class="box-card"> <el-card style="margin-top: 20px; height: 100vh
" class="box-card">
<el-table <el-table
ref="tables" ref="tables"
v-loading="loading" v-loading="loading"
@ -241,7 +242,8 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.app-container { .app-container {
width: 100%; width: 100%;
height: 100%; height: 100vh
;
background: #f6f8f9; background: #f6f8f9;
//padding-top: 0px; //padding-top: 0px;
//padding: 0px //padding: 0px

11
fuintAdmin/src/views/oilConfig/oilInventory/list.vue
View File

@ -30,7 +30,7 @@
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>--> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
@ -204,6 +204,15 @@ export default {
this.queryParams.page = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
resetQuery() {
this.queryParams = {
inventoryNumber:'',
status: '',
page:null,
pageSize:null
};
this.getList();
},
} }
} }
</script> </script>

12
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -42,7 +42,7 @@
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>--> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
@ -213,6 +213,16 @@ export default {
this.queryParams.page = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
resetQuery() {
this.queryParams = {
supplierId: '',
tankName: '',
status: '',
page:null,
pageSize:null
};
this.getList();
},
} }
} }
</script> </script>

6
fuintAdmin/src/views/order/order_Added.vue
View File

@ -140,9 +140,9 @@
</div> </div>
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<!-- 列表--> <!-- &lt;!&ndash; 列表&ndash;&gt;-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<div class="wgang"> <div class="wgang">
<div></div> <div></div>
<div style="display: flex "> <div style="display: flex ">

6
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -119,8 +119,8 @@
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<div class="wgang"> <div class="wgang">
<!-- <div>收银台订单列表</div>--> <!-- <div>收银台订单列表</div>-->
<div></div> <div></div>
@ -692,6 +692,8 @@ import {refundApi} from "@/api/order/refund";
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
} }
.box{ .box{
//box-sizing: border-box; //box-sizing: border-box;

7
fuintAdmin/src/views/order/order_Goods.vue
View File

@ -152,8 +152,8 @@
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<div class="wgang"> <div class="wgang">
<div></div> <div></div>
<div style="display: flex "> <div style="display: flex ">
@ -610,6 +610,8 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
} }
.box{ .box{
//box-sizing: border-box; //box-sizing: border-box;
@ -624,6 +626,7 @@ export default {
background: rgba(64,158,255,0.05); background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
border: 1px solid #409EFF; border: 1px solid #409EFF;
} }
.el-form--inline .el-form-item { .el-form--inline .el-form-item {
margin-right: 44px; margin-right: 44px;

4
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -184,8 +184,8 @@
</div> </div>
</el-card> <!-- </el-card>-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<div class="wgang"> <div class="wgang">
<!-- 油品订单列表--> <!-- 油品订单列表-->
<div></div> <div></div>

6
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -145,9 +145,9 @@
</div> </div>
</div> </div>
</div> </div>
</el-card> <!-- </el-card>-->
<!-- 表格--> <!-- &lt;!&ndash; 表格&ndash;&gt;-->
<el-card class="box-card"> <!-- <el-card class="box-card">-->
<div class="wgang"> <div class="wgang">
<!-- 会员充值列表--> <!-- 会员充值列表-->
<div></div> <div></div>

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/entity/FavorableRecords.java
View File

@ -3,12 +3,15 @@ package com.fuint.business.marketingActivity.favorableRecords.entity;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Map;
/** /**
* 优惠记录表(FavorableRecords)表实体类 * 优惠记录表(FavorableRecords)表实体类
@ -48,5 +51,10 @@ public class FavorableRecords extends Model<FavorableRecords> {
private Date updateTime; private Date updateTime;
/** 请求参数 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params;
} }

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/favorableRecords/service/impl/FavorableRecordsServiceImpl.java
View File

@ -60,10 +60,28 @@ public class FavorableRecordsServiceImpl extends ServiceImpl<FavorableRecordsMap
LambdaQueryWrapper<FavorableRecords> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<FavorableRecords> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(FavorableRecords::getStoreId, nowAccountInfo.getStoreId()); queryWrapper.eq(FavorableRecords::getStoreId, nowAccountInfo.getStoreId());
queryWrapper.eq(FavorableRecords::getChainStoreId, nowAccountInfo.getChainStoreId()); queryWrapper.eq(FavorableRecords::getChainStoreId, nowAccountInfo.getChainStoreId());
if (ObjectUtil.isEmpty(favorableRecords) && ObjectUtil.isEmpty(favorableRecords.getParams())){
if (ObjectUtil.isEmpty(favorableRecords.getParams().get("beginTime")) && ObjectUtil.isEmpty(favorableRecords.getParams().get("endTime"))) {
queryWrapper.between(FavorableRecords::getCreateTime, favorableRecords.getParams().get("beginTime"), favorableRecords.getParams().get("endTime"));
} else if (favorableRecords.getParams().get("beginTime") != null) {
queryWrapper.ge(FavorableRecords::getCreateTime, favorableRecords.getParams().get("beginTime"));
} else if (favorableRecords.getParams().get("endTime") != null) {
queryWrapper.le(FavorableRecords::getCreateTime, favorableRecords.getParams().get("endTime"));
}
}
if (ObjectUtil.isNotEmpty(favorableRecords.getOrderNo())) {
queryWrapper.like(FavorableRecords::getOrderNo, favorableRecords.getOrderNo());
}
if (ObjectUtil.isNotEmpty(favorableRecords.getFavFrom())) if (ObjectUtil.isNotEmpty(favorableRecords.getFavFrom()))
queryWrapper.eq(FavorableRecords::getFavFrom, favorableRecords.getFavFrom()); queryWrapper.eq(FavorableRecords::getFavFrom, favorableRecords.getFavFrom());
if (ObjectUtil.isNotEmpty(favorableRecords.getFavType())) if (ObjectUtil.isNotEmpty(favorableRecords.getFavType()))
queryWrapper.eq(FavorableRecords::getFavType, favorableRecords.getFavType()); queryWrapper.like(FavorableRecords::getFavType, favorableRecords.getFavType());
if (ObjectUtil.isNotEmpty(favorableRecords.getFavConsumptionType())) if (ObjectUtil.isNotEmpty(favorableRecords.getFavConsumptionType()))
queryWrapper.eq(FavorableRecords::getFavConsumptionType, favorableRecords.getFavConsumptionType()); queryWrapper.eq(FavorableRecords::getFavConsumptionType, favorableRecords.getFavConsumptionType());
IPage page1 = page(page, queryWrapper); IPage page1 = page(page, queryWrapper);