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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xvv 2024-07-11 10:10:47 +08:00
commit 36cb0cbc6c
7 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/views/convenienceStore/damage/index.vue
View File

@ -192,6 +192,7 @@ export default {
// 重置
resetQuery() {
this.queryParams = {}
this.handleQuery()
},
// 删除
handleDel(data) {

1
fuintAdmin/src/views/convenienceStore/returns/index.vue
View File

@ -193,6 +193,7 @@ export default {
// 重置
resetQuery() {
this.queryParams = {}
this.handleQuery()
},
// 删除
handleDel(data) {

2
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -262,6 +262,8 @@ import {getInstituionListApi, getRunningWaterByDataApi, exportExcelOilDeptApi, g
this.queryParams = {
page: 1,
pageSize: 10,
deptType:"3",
}
this.beginTime = ""
this.endTime = ""

2
fuintAdmin_zt/src/views/system/menu/index.vue
View File

@ -77,7 +77,7 @@
</el-table>
<!-- 添加或修改菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
View File

@ -84,7 +84,7 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
cvsGoodsVo.setPid(goods.getPid());
cvsGoodsVo.setStatus(goods.getStatus());
cvsGoodsVo.setCode(goods.getCode());
cvsGoodsVo.setCreateTime(new Date());
cvsGoodsVo.setCreateTime(goods.getCreateTime());
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
cvsGoodsVo.setCreateBy(nowAccountInfo.getId().toString());
cvsGoodsVo.setSorted(goods.getSorted());

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -863,7 +863,18 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
//流水数据分析
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
// IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
IPage<SysDeptVo> sysDepts = new Page<>();
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType());
}else {
SysDeptVo sysDept = sysDeptMapper.selectDeptByIdVo(nowAccountInfo.getDeptId());
List<SysDeptVo> ssysDept = new ArrayList<>();
ssysDept.add(sysDept);
sysDepts.setRecords(ssysDept);
}
for (SysDeptVo sysDept : sysDepts.getRecords()) {
long dayNum = 0;

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilTankMapper.xml
View File

@ -89,6 +89,9 @@
<if test="oilTank.updateBy != null">
and update_by = #{oilTank.updateBy}
</if>
<if test="oilTank.inventoryStatistics != null and oilTank.inventoryStatistics != ''">
and inventory_statistics = #{oilTank.inventoryStatistics}
</if>
</where>
ORDER BY update_time DESC
</select>