Merge remote-tracking branch 'origin/master'

fuintAdmin/src/views/convenienceStore/damage/index.vue

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

fuintAdmin/src/views/convenienceStore/returns/index.vue

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

fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue

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

fuintAdmin_zt/src/views/system/menu/index.vue

@@ -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">

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

@@ -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());

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

@@ -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;

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

@@ -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>