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

Compare commits

base: dianliang:7b32e910c4fc07a06033b1a447db3ffd390ac369
Branches Tags
dianliang:main
dianliang:master
...
compare: dianliang:bff22a19d5bfa9d9c9278f46be4799d3d71e456e
Branches Tags
dianliang:main
dianliang:master

3 Commits
7b32e910c4 ... bff22a19d5

Author SHA1 Message Date
zhaotianfeng
bff22a19d5 Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station 2024-09-14 10:12:32 +08:00
zhaotianfeng
50d71f8e5a 收银台 后台接口 油品列表 商品列表 2024-09-14 10:12:04 +08:00
zhaotianfeng
5c77701eca 收银台 前端页面 商品油品订单挂单 2024-09-14 10:09:23 +08:00
15 changed files with 1263 additions and 279 deletions
Show Stats Expand all files Collapse all files

119
fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/entity/MtGoods.java Normal file
View File

@ -0,0 +1,119 @@
package com.fuint.business.cashierGoods.entity;
import com.fuint.framework.entity.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
/**
* 商品表(MtGoods)实体类
*
* @author makejava
* @since 2024-09-13 11:10:23
*/
@Data
public class MtGoods extends BaseEntity {
private static final long serialVersionUID = 253041736189731537L;
/**
* 自增ID
*/
private Integer id;
/**
* 所属店铺ID
*/
private Integer storeId;
/**
* 商品名称
*/
private String name;
/**
* 商品分类ID
*/
private Integer cvsGoodId;
/**
* 商品编码（条码）
*/
private String goodsNo;
/**
* 商品拼音码
*/
private String pinyinCode;
/**
* 货架号
*/
private String shelfNumber;
/**
* 进货价
*/
private BigDecimal buyingPrice;
/**
* 零售价
*/
private BigDecimal retailPrice;
/**
* 会员价
*/
private Double memberPrice;
/**
* 库存
*/
private Long stock;
/**
* 单位
*/
private String unit;
/**
* 供应商id
*/
private String supplierId;
/**
* 可否使用积分抵扣
*/
private String canUsePoint;
/**
* 排序
*/
private Integer sort;
/**
* 是否在回收站：0不在回收站，1在回收站
*/
private Integer isRecovery;
/**
* 商品描述
*/
private String description;
/**
* 状态：启用、禁用
*/
private String status;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private String createBy;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private String updateBy;
/**
* 0未删除 1 删除
*/
private String ifDelete;
/**
* 可否使用兑换券兑换；0可以，1不可以
*/
private String canUseExchange;
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/mapper/CashRegisterGoodsMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.fuint.business.cashierGoods.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.cashierGoods.entity.MtGoods;
import org.apache.ibatis.annotations.Param;
import java.util.List;
// 如何集成mybatis plus 通用mapper
public interface CashRegisterGoodsMapper extends BaseMapper<MtGoods> {
}

316
fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/mapper/xml/MtGoodsMapper.xml Normal file
View File

@ -0,0 +1,316 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.cashierGoods.mapper.CashRegisterGoodsMapper">
<!-- &lt;!&ndash;查询单个&ndash;&gt;-->
<!-- <select id="queryById" resultMap="MtGoodsMap">-->
<!-- select-->
<!-- id, store_id, name, cvs_good_id, goods_no, pinyin_code, shelf_number, buying_price, retail_price, member_price, stock, unit, supplier_id, can_use_point, sort, is_recovery, description, status, create_time, create_by, update_time, update_by, if_delete, can_use_exchange-->
<!-- from mt_goods-->
<!-- where id = #{id}-->
<!-- </select>-->
<!-- &lt;!&ndash;查询指定行数据&ndash;&gt;-->
<!-- <select id="queryAllByLimit" resultMap="MtGoodsMap">-->
<!-- select-->
<!-- id, store_id, name, cvs_good_id, goods_no, pinyin_code, shelf_number, buying_price, retail_price, member_price, stock, unit, supplier_id, can_use_point, sort, is_recovery, description, status, create_time, create_by, update_time, update_by, if_delete, can_use_exchange-->
<!-- from mt_goods-->
<!-- <where>-->
<!-- <if test="id != null">-->
<!-- and id = #{id}-->
<!-- </if>-->
<!-- <if test="storeId != null">-->
<!-- and store_id = #{storeId}-->
<!-- </if>-->
<!-- <if test="name != null and name != ''">-->
<!-- and name = #{name}-->
<!-- </if>-->
<!-- <if test="cvsGoodId != null">-->
<!-- and cvs_good_id = #{cvsGoodId}-->
<!-- </if>-->
<!-- <if test="goodsNo != null and goodsNo != ''">-->
<!-- and goods_no = #{goodsNo}-->
<!-- </if>-->
<!-- <if test="pinyinCode != null and pinyinCode != ''">-->
<!-- and pinyin_code = #{pinyinCode}-->
<!-- </if>-->
<!-- <if test="shelfNumber != null and shelfNumber != ''">-->
<!-- and shelf_number = #{shelfNumber}-->
<!-- </if>-->
<!-- <if test="buyingPrice != null">-->
<!-- and buying_price = #{buyingPrice}-->
<!-- </if>-->
<!-- <if test="retailPrice != null">-->
<!-- and retail_price = #{retailPrice}-->
<!-- </if>-->
<!-- <if test="memberPrice != null">-->
<!-- and member_price = #{memberPrice}-->
<!-- </if>-->
<!-- <if test="stock != null">-->
<!-- and stock = #{stock}-->
<!-- </if>-->
<!-- <if test="unit != null and unit != ''">-->
<!-- and unit = #{unit}-->
<!-- </if>-->
<!-- <if test="supplierId != null and supplierId != ''">-->
<!-- and supplier_id = #{supplierId}-->
<!-- </if>-->
<!-- <if test="canUsePoint != null and canUsePoint != ''">-->
<!-- and can_use_point = #{canUsePoint}-->
<!-- </if>-->
<!-- <if test="sort != null">-->
<!-- and sort = #{sort}-->
<!-- </if>-->
<!-- <if test="isRecovery != null">-->
<!-- and is_recovery = #{isRecovery}-->
<!-- </if>-->
<!-- <if test="description != null and description != ''">-->
<!-- and description = #{description}-->
<!-- </if>-->
<!-- <if test="status != null and status != ''">-->
<!-- and status = #{status}-->
<!-- </if>-->
<!-- <if test="createTime != null">-->
<!-- and create_time = #{createTime}-->
<!-- </if>-->
<!-- <if test="createBy != null and createBy != ''">-->
<!-- and create_by = #{createBy}-->
<!-- </if>-->
<!-- <if test="updateTime != null">-->
<!-- and update_time = #{updateTime}-->
<!-- </if>-->
<!-- <if test="updateBy != null and updateBy != ''">-->
<!-- and update_by = #{updateBy}-->
<!-- </if>-->
<!-- <if test="ifDelete != null and ifDelete != ''">-->
<!-- and if_delete = #{ifDelete}-->
<!-- </if>-->
<!-- <if test="canUseExchange != null and canUseExchange != ''">-->
<!-- and can_use_exchange = #{canUseExchange}-->
<!-- </if>-->
<!-- </where>-->
<!-- limit #{pageable.offset}, #{pageable.pageSize}-->
<!-- </select>-->
<!-- &lt;!&ndash;统计总行数&ndash;&gt;-->
<!-- <select id="count" resultType="java.lang.Long">-->
<!-- select count(1)-->
<!-- from mt_goods-->
<!-- <where>-->
<!-- <if test="id != null">-->
<!-- and id = #{id}-->
<!-- </if>-->
<!-- <if test="storeId != null">-->
<!-- and store_id = #{storeId}-->
<!-- </if>-->
<!-- <if test="name != null and name != ''">-->
<!-- and name = #{name}-->
<!-- </if>-->
<!-- <if test="cvsGoodId != null">-->
<!-- and cvs_good_id = #{cvsGoodId}-->
<!-- </if>-->
<!-- <if test="goodsNo != null and goodsNo != ''">-->
<!-- and goods_no = #{goodsNo}-->
<!-- </if>-->
<!-- <if test="pinyinCode != null and pinyinCode != ''">-->
<!-- and pinyin_code = #{pinyinCode}-->
<!-- </if>-->
<!-- <if test="shelfNumber != null and shelfNumber != ''">-->
<!-- and shelf_number = #{shelfNumber}-->
<!-- </if>-->
<!-- <if test="buyingPrice != null">-->
<!-- and buying_price = #{buyingPrice}-->
<!-- </if>-->
<!-- <if test="retailPrice != null">-->
<!-- and retail_price = #{retailPrice}-->
<!-- </if>-->
<!-- <if test="memberPrice != null">-->
<!-- and member_price = #{memberPrice}-->
<!-- </if>-->
<!-- <if test="stock != null">-->
<!-- and stock = #{stock}-->
<!-- </if>-->
<!-- <if test="unit != null and unit != ''">-->
<!-- and unit = #{unit}-->
<!-- </if>-->
<!-- <if test="supplierId != null and supplierId != ''">-->
<!-- and supplier_id = #{supplierId}-->
<!-- </if>-->
<!-- <if test="canUsePoint != null and canUsePoint != ''">-->
<!-- and can_use_point = #{canUsePoint}-->
<!-- </if>-->
<!-- <if test="sort != null">-->
<!-- and sort = #{sort}-->
<!-- </if>-->
<!-- <if test="isRecovery != null">-->
<!-- and is_recovery = #{isRecovery}-->
<!-- </if>-->
<!-- <if test="description != null and description != ''">-->
<!-- and description = #{description}-->
<!-- </if>-->
<!-- <if test="status != null and status != ''">-->
<!-- and status = #{status}-->
<!-- </if>-->
<!-- <if test="createTime != null">-->
<!-- and create_time = #{createTime}-->
<!-- </if>-->
<!-- <if test="createBy != null and createBy != ''">-->
<!-- and create_by = #{createBy}-->
<!-- </if>-->
<!-- <if test="updateTime != null">-->
<!-- and update_time = #{updateTime}-->
<!-- </if>-->
<!-- <if test="updateBy != null and updateBy != ''">-->
<!-- and update_by = #{updateBy}-->
<!-- </if>-->
<!-- <if test="ifDelete != null and ifDelete != ''">-->
<!-- and if_delete = #{ifDelete}-->
<!-- </if>-->
<!-- <if test="canUseExchange != null and canUseExchange != ''">-->
<!-- and can_use_exchange = #{canUseExchange}-->
<!-- </if>-->
<!-- </where>-->
<!-- </select>-->
<!-- &lt;!&ndash;新增所有列&ndash;&gt;-->
<!-- <insert id="insert" keyProperty="id" useGeneratedKeys="true">-->
<!-- insert into mt_goods(store_id, name, cvs_good_id, goods_no, pinyin_code, shelf_number, buying_price, retail_price, member_price, stock, unit, supplier_id, can_use_point, sort, is_recovery, description, status, create_time, create_by, update_time, update_by, if_delete, can_use_exchange)-->
<!-- values (#{storeId}, #{name}, #{cvsGoodId}, #{goodsNo}, #{pinyinCode}, #{shelfNumber}, #{buyingPrice}, #{retailPrice}, #{memberPrice}, #{stock}, #{unit}, #{supplierId}, #{canUsePoint}, #{sort}, #{isRecovery}, #{description}, #{status}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, #{ifDelete}, #{canUseExchange})-->
<!-- </insert>-->
<!-- <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">-->
<!-- insert into mt_goods(store_id, name, cvs_good_id, goods_no, pinyin_code, shelf_number, buying_price, retail_price, member_price, stock, unit, supplier_id, can_use_point, sort, is_recovery, description, status, create_time, create_by, update_time, update_by, if_delete, can_use_exchange)-->
<!-- values-->
<!-- <foreach collection="entities" item="entity" separator=",">-->
<!-- (#{entity.storeId}, #{entity.name}, #{entity.cvsGoodId}, #{entity.goodsNo}, #{entity.pinyinCode}, #{entity.shelfNumber}, #{entity.buyingPrice}, #{entity.retailPrice}, #{entity.memberPrice}, #{entity.stock}, #{entity.unit}, #{entity.supplierId}, #{entity.canUsePoint}, #{entity.sort}, #{entity.isRecovery}, #{entity.description}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}, #{entity.ifDelete}, #{entity.canUseExchange})-->
<!-- </foreach>-->
<!-- </insert>-->
<!-- <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">-->
<!-- insert into mt_goods(store_id, name, cvs_good_id, goods_no, pinyin_code, shelf_number, buying_price, retail_price, member_price, stock, unit, supplier_id, can_use_point, sort, is_recovery, description, status, create_time, create_by, update_time, update_by, if_delete, can_use_exchange)-->
<!-- values-->
<!-- <foreach collection="entities" item="entity" separator=",">-->
<!-- (#{entity.storeId}, #{entity.name}, #{entity.cvsGoodId}, #{entity.goodsNo}, #{entity.pinyinCode}, #{entity.shelfNumber}, #{entity.buyingPrice}, #{entity.retailPrice}, #{entity.memberPrice}, #{entity.stock}, #{entity.unit}, #{entity.supplierId}, #{entity.canUsePoint}, #{entity.sort}, #{entity.isRecovery}, #{entity.description}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}, #{entity.ifDelete}, #{entity.canUseExchange})-->
<!-- </foreach>-->
<!-- on duplicate key update-->
<!-- store_id = values(store_id),-->
<!-- name = values(name),-->
<!-- cvs_good_id = values(cvs_good_id),-->
<!-- goods_no = values(goods_no),-->
<!-- pinyin_code = values(pinyin_code),-->
<!-- shelf_number = values(shelf_number),-->
<!-- buying_price = values(buying_price),-->
<!-- retail_price = values(retail_price),-->
<!-- member_price = values(member_price),-->
<!-- stock = values(stock),-->
<!-- unit = values(unit),-->
<!-- supplier_id = values(supplier_id),-->
<!-- can_use_point = values(can_use_point),-->
<!-- sort = values(sort),-->
<!-- is_recovery = values(is_recovery),-->
<!-- description = values(description),-->
<!-- status = values(status),-->
<!-- create_time = values(create_time),-->
<!-- create_by = values(create_by),-->
<!-- update_time = values(update_time),-->
<!-- update_by = values(update_by),-->
<!-- if_delete = values(if_delete),-->
<!-- can_use_exchange = values(can_use_exchange)-->
<!-- </insert>-->
<!-- &lt;!&ndash;通过主键修改数据&ndash;&gt;-->
<!-- <update id="update">-->
<!-- update mt_goods-->
<!-- <set>-->
<!-- <if test="storeId != null">-->
<!-- store_id = #{storeId},-->
<!-- </if>-->
<!-- <if test="name != null and name != ''">-->
<!-- name = #{name},-->
<!-- </if>-->
<!-- <if test="cvsGoodId != null">-->
<!-- cvs_good_id = #{cvsGoodId},-->
<!-- </if>-->
<!-- <if test="goodsNo != null and goodsNo != ''">-->
<!-- goods_no = #{goodsNo},-->
<!-- </if>-->
<!-- <if test="pinyinCode != null and pinyinCode != ''">-->
<!-- pinyin_code = #{pinyinCode},-->
<!-- </if>-->
<!-- <if test="shelfNumber != null and shelfNumber != ''">-->
<!-- shelf_number = #{shelfNumber},-->
<!-- </if>-->
<!-- <if test="buyingPrice != null">-->
<!-- buying_price = #{buyingPrice},-->
<!-- </if>-->
<!-- <if test="retailPrice != null">-->
<!-- retail_price = #{retailPrice},-->
<!-- </if>-->
<!-- <if test="memberPrice != null">-->
<!-- member_price = #{memberPrice},-->
<!-- </if>-->
<!-- <if test="stock != null">-->
<!-- stock = #{stock},-->
<!-- </if>-->
<!-- <if test="unit != null and unit != ''">-->
<!-- unit = #{unit},-->
<!-- </if>-->
<!-- <if test="supplierId != null and supplierId != ''">-->
<!-- supplier_id = #{supplierId},-->
<!-- </if>-->
<!-- <if test="canUsePoint != null and canUsePoint != ''">-->
<!-- can_use_point = #{canUsePoint},-->
<!-- </if>-->
<!-- <if test="sort != null">-->
<!-- sort = #{sort},-->
<!-- </if>-->
<!-- <if test="isRecovery != null">-->
<!-- is_recovery = #{isRecovery},-->
<!-- </if>-->
<!-- <if test="description != null and description != ''">-->
<!-- description = #{description},-->
<!-- </if>-->
<!-- <if test="status != null and status != ''">-->
<!-- status = #{status},-->
<!-- </if>-->
<!-- <if test="createTime != null">-->
<!-- create_time = #{createTime},-->
<!-- </if>-->
<!-- <if test="createBy != null and createBy != ''">-->
<!-- create_by = #{createBy},-->
<!-- </if>-->
<!-- <if test="updateTime != null">-->
<!-- update_time = #{updateTime},-->
<!-- </if>-->
<!-- <if test="updateBy != null and updateBy != ''">-->
<!-- update_by = #{updateBy},-->
<!-- </if>-->
<!-- <if test="ifDelete != null and ifDelete != ''">-->
<!-- if_delete = #{ifDelete},-->
<!-- </if>-->
<!-- <if test="canUseExchange != null and canUseExchange != ''">-->
<!-- can_use_exchange = #{canUseExchange},-->
<!-- </if>-->
<!-- </set>-->
<!-- where id = #{id}-->
<!-- </update>-->
<!-- &lt;!&ndash;通过主键删除&ndash;&gt;-->
<!-- <delete id="deleteById">-->
<!-- delete from mt_goods where id = #{id}-->
<!-- </delete>-->
<select id="selectListByStoreId" resultType="com.fuint.business.cashierGoods.entity.MtGoods">
SELECT
*
FROM
mt_goods
where
store_id = #{storeId}
</select>
</mapper>

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/service/CashRegisterGoodsService.java Normal file
View File

@ -0,0 +1,17 @@
package com.fuint.business.cashierGoods.service;
import com.fuint.business.cashierGoods.entity.MtGoods;
import java.util.List;
import java.util.Map;
public interface CashRegisterGoodsService {
// 通用mapper条件查询
List<MtGoods> selectListByMap(Map<String, Object> columnMap);
}

23
fuintBackend/fuint-application/src/main/java/com/fuint/business/cashierGoods/service/impl/CashRegisterGoodsServiceImpl.java Normal file
View File

@ -0,0 +1,23 @@
package com.fuint.business.cashierGoods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.cashierGoods.entity.MtGoods;
import com.fuint.business.cashierGoods.mapper.CashRegisterGoodsMapper;
import com.fuint.business.cashierGoods.service.CashRegisterGoodsService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class CashRegisterGoodsServiceImpl extends ServiceImpl<CashRegisterGoodsMapper, MtGoods> implements CashRegisterGoodsService {
@Override
public List<MtGoods> selectListByMap(Map<String, Object> columnMap) {
List<MtGoods> mtGoods = super.baseMapper.selectByMap(columnMap);
return mtGoods;
}
}

51
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java
View File

@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilGun; import com.fuint.business.petrolStationManagement.entity.OilGun;
import com.fuint.business.petrolStationManagement.service.OilGunService; import com.fuint.business.petrolStationManagement.service.OilGunService;
import com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo;
import com.fuint.business.petrolStationManagement.vo.OilGunVO; import com.fuint.business.petrolStationManagement.vo.OilGunVO;
import com.fuint.business.setting.entity.SysLog; import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService; import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController; import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject; import com.fuint.framework.web.ResponseObject;
import io.swagger.annotations.Authorization;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.aspectj.lang.annotation.AdviceName;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -17,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* 油枪表(OilGun)表控制层 * 油枪表(OilGun)表控制层
@ -64,6 +69,15 @@ public class OilGunController extends BaseController {
} }
//根据当前店铺 获取油枪 分组油号
@GetMapping("/cashRegisterList")
public ResponseObject cashRegisterList() {
Map<String, List<OilCashRegisterVo>> integerSetMap = this.oilGunService.cashRegisterList();
return getSuccessResult(integerSetMap);
}
/** /**
* 通过主键查询单条数据 * 通过主键查询单条数据
@ -86,15 +100,16 @@ public class OilGunController extends BaseController {
public ResponseObject add(@RequestBody OilGun oilGun) { public ResponseObject add(@RequestBody OilGun oilGun) {
if (this.oilGunService.insert(oilGun)) { if (this.oilGunService.insert(oilGun)) {
try { try {
SysLog sysLog =new SysLog(); SysLog sysLog = new SysLog();
sysLog.setSystemName("2"); sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理"); sysLog.setMoudle("油枪管理");
sysLog.setContent("新增名称为"+oilGun.getGunName()+"的油枪信息"); sysLog.setContent("新增名称为" + oilGun.getGunName() + "的油枪信息");
sysLogService.saveVo(sysLog); sysLogService.saveVo(sysLog);
}catch (Exception ignored){} } catch (Exception ignored) {
}
return getSuccessResult(true); return getSuccessResult(true);
}else { } else {
return getSuccessResult(201,"存在重复的油枪名称，请修改",null); return getSuccessResult(201, "存在重复的油枪名称，请修改", null);
} }
} }
@ -106,17 +121,18 @@ public class OilGunController extends BaseController {
*/ */
@PutMapping @PutMapping
public ResponseObject edit(@RequestBody OilGun oilGun) { public ResponseObject edit(@RequestBody OilGun oilGun) {
if (this.oilGunService.update(oilGun)){ if (this.oilGunService.update(oilGun)) {
try { try {
SysLog sysLog =new SysLog(); SysLog sysLog = new SysLog();
sysLog.setSystemName("2"); sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理"); sysLog.setMoudle("油枪管理");
sysLog.setContent("更新名称为"+oilGun.getGunName()+"的油枪信息"); sysLog.setContent("更新名称为" + oilGun.getGunName() + "的油枪信息");
sysLogService.saveVo(sysLog); sysLogService.saveVo(sysLog);
}catch (Exception ignored){} } catch (Exception ignored) {
}
return getSuccessResult(this.oilGunService.update(oilGun)); return getSuccessResult(this.oilGunService.update(oilGun));
}else { } else {
return getSuccessResult(201,"存在重复的油枪名称，请修改",null); return getSuccessResult(201, "存在重复的油枪名称，请修改", null);
} }
} }
@ -129,31 +145,34 @@ public class OilGunController extends BaseController {
@DeleteMapping @DeleteMapping
public ResponseObject deleteById(Integer id) { public ResponseObject deleteById(Integer id) {
try { try {
SysLog sysLog =new SysLog(); SysLog sysLog = new SysLog();
sysLog.setSystemName("2"); sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理"); sysLog.setMoudle("油枪管理");
sysLog.setContent("删除编号为"+id+"的油枪信息"); sysLog.setContent("删除编号为" + id + "的油枪信息");
sysLogService.saveVo(sysLog); sysLogService.saveVo(sysLog);
}catch (Exception ignored){} } catch (Exception ignored) {
}
return getSuccessResult(this.oilGunService.deleteById(id)); return getSuccessResult(this.oilGunService.deleteById(id));
} }
/** /**
* 根据油号id查询油枪列表信息 * 根据油号id查询油枪列表信息
*
* @param numberId * @param numberId
* @return * @return
*/ */
@GetMapping("/queryGunList/{numberId}") @GetMapping("/queryGunList/{numberId}")
public ResponseObject queryGunList(@PathVariable Integer numberId){ public ResponseObject queryGunList(@PathVariable Integer numberId) {
return getSuccessResult(oilGunService.selectOilGunByNumberId(numberId)); return getSuccessResult(oilGunService.selectOilGunByNumberId(numberId));
} }
/** /**
* 查询当前店铺所有油枪列表信息 * 查询当前店铺所有油枪列表信息
*
* @return * @return
*/ */
@GetMapping("/queryOilGunList") @GetMapping("/queryOilGunList")
public ResponseObject selectGunList(){ public ResponseObject selectGunList() {
return getSuccessResult(oilGunService.selectOilGuns()); return getSuccessResult(oilGunService.selectOilGuns());
} }
} }

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilGunMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilGun; import com.fuint.business.petrolStationManagement.entity.OilGun;
import com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo;
import com.fuint.business.petrolStationManagement.vo.OilGunVO; import com.fuint.business.petrolStationManagement.vo.OilGunVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -17,6 +18,9 @@ import java.util.List;
*/ */
public interface OilGunMapper extends BaseMapper<OilGun> { public interface OilGunMapper extends BaseMapper<OilGun> {
List<OilCashRegisterVo> cashRegisterList(@Param("storeId") Integer storeId);
/** /**
* 通过ID查询单条数据 * 通过ID查询单条数据
* *

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

@ -20,8 +20,15 @@
<!--查询单个--> <!--查询单个-->
<select id="queryById" resultMap="OilGunMap"> <select id="queryById" resultMap="OilGunMap">
select select id,
id, gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by gun_name,
tank_id,
status,
store_id,
create_time,
update_time,
create_by,
update_by
from oil_gun from oil_gun
where id = #{id} where id = #{id}
</select> </select>
@ -46,7 +53,8 @@
<select id="queryAllByLimit2" resultMap="OilGunMap"> <select id="queryAllByLimit2" resultMap="OilGunMap">
select select
og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time,og.update_time, og.create_by, og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time,og.update_time, og.create_by,
og.update_by, ot.oil_number, ot.number_id, ot.tank_name,og.staff_status,og.staff_list,og.device_id,og.device_name og.update_by, ot.oil_number, ot.number_id,
ot.tank_name,og.staff_status,og.staff_list,og.device_id,og.device_name
from oil_gun og from oil_gun og
left join oil_tank ot on og.tank_id = ot.id left join oil_tank ot on og.tank_id = ot.id
<where> <where>
@ -94,8 +102,9 @@
</select> </select>
<select id="getAllList" resultMap="OilGunMap"> <select id="getAllList" resultMap="OilGunMap">
select select
og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time, og.update_time, og.create_by, og.update_by, og.number_id, ot.tank_name, og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time, og.update_time, og.create_by,
og.oil_machine_gun_number og.update_by, og.number_id, ot.tank_name,
og.oil_machine_gun_number
from oil_gun og left join oil_tank ot on og.tank_id = ot.id from oil_gun og left join oil_tank ot on og.tank_id = ot.id
<where> <where>
<if test="oilGun.id != null"> <if test="oilGun.id != null">
@ -119,32 +128,47 @@
</where> </where>
</select> </select>
<select id="getOilName" resultType="com.fuint.business.petrolStationManagement.vo.OilGunVO"> <select id="getOilName" resultType="com.fuint.business.petrolStationManagement.vo.OilGunVO">
select onm.number_id numberId,name.oil_name oilName, name.oil_type oilType,onm.oil_price oilPrice ,onm.gb_price gbPrice, select onm.number_id numberId,name.oil_name oilName, name.oil_type oilType,onm.oil_price oilPrice ,onm.gb_price
name.oil_density oilDensity,onm.unit unit,name.id oilNameId gbPrice,
name.oil_density oilDensity,onm.unit unit,name.id oilNameId
from oil_number onm from oil_number onm
left join oil_name name on onm.oil_name = name.id left join oil_name name on onm.oil_name = name.id
<where> <where>
onm.state = '启用' onm.state = '启用'
<if test="storeId != null"> <if test="storeId != null">
and onm.store_id = #{storeId} and onm.store_id = #{storeId}
</if> </if>
</where> </where>
</select> </select>
<select id="checkData" resultType="com.fuint.business.petrolStationManagement.entity.OilGun"> <select id="checkData" resultType="com.fuint.business.petrolStationManagement.entity.OilGun">
select id select id
from oil_gun from oil_gun
where where gun_name = #{oilGun.gunName}
gun_name = #{oilGun.gunName} and store_id = #{oilGun.storeId}
and store_id = #{oilGun.storeId}
</select> </select>
<select id="selectListByStoreId" resultType="com.fuint.business.petrolStationManagement.vo.OilGunVO"> <select id="selectListByStoreId" resultType="com.fuint.business.petrolStationManagement.vo.OilGunVO">
SELECT og.*,onu.oil_name,onu.oil_Price FROM oil_gun og SELECT og.*,onu.oil_name,onu.oil_Price FROM oil_gun og
LEFT JOIN oil_number onu on og.number_id = onu.number_id LEFT JOIN oil_number onu on og.number_id = onu.number_id
where og.status = '启用' where og.status = '启用'
<if test="storeId != null"> <if test="storeId != null">
and og.store_id = #{storeId} and og.store_id = #{storeId}
</if> </if>
</select>
<select id="cashRegisterList" resultType="com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo">
select zong.*, o2.oil_name
FROM (SELECT o1.*,
o2.oil_name as oil_name_id,
o2.oil_type as oilType,
o2.oil_price as oilPrice
FROM oil_gun o1
LEFT JOIN oil_number o2 ON o1.number_id = o2.number_id
WHERE o1.store_id = #{storeId} and o1.status = '启用' ) as zong
LEFT JOIN oil_name as o2 on zong.oil_name_id = o2.id
</select> </select>
<!-- &#45;&#45; and tank_id = #{oilGun.tankId}--> <!-- &#45;&#45; and tank_id = #{oilGun.tankId}-->
@ -155,26 +179,24 @@
create_by, update_by, number_id, create_by, update_by, number_id,
oil_machine_gun_number, oil_machine_gun_number,
staff_status, staff_status,
staff_list, staff_list,
device_id, device_id,
device_name device_name)
)
values (#{gunName}, #{tankId}, #{status}, #{storeId}, values (#{gunName}, #{tankId}, #{status}, #{storeId},
#{createTime}, #{createTime}, #{createBy}, #{createTime}, #{createTime}, #{createBy},
#{updateBy}, #{numberId}, #{oilMachineGunNumber}, #{updateBy}, #{numberId}, #{oilMachineGunNumber},
#{staffStatus} #{staffStatus}
#{staffList} #{staffList}
#{deviceId} #{deviceId}
#{deviceName} #{deviceName})
)
</insert> </insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into oil_gun(gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by) insert into oil_gun(gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by)
values values
<foreach collection="entities" item="entity" separator=","> <foreach collection="entities" item="entity" separator=",">
(#{entity.gunName}, #{entity.tankId}, #{entity.status}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) (#{entity.gunName}, #{entity.tankId}, #{entity.status}, #{entity.storeId}, #{entity.createTime},
#{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach> </foreach>
</insert> </insert>
@ -182,7 +204,8 @@ device_name
insert into oil_gun(gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by) insert into oil_gun(gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by)
values values
<foreach collection="entities" item="entity" separator=","> <foreach collection="entities" item="entity" separator=",">
(#{entity.gunName}, #{entity.tankId}, #{entity.status}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy}) (#{entity.gunName}, #{entity.tankId}, #{entity.status}, #{entity.storeId}, #{entity.createTime},
#{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
</foreach> </foreach>
on duplicate key update on duplicate key update
gun_name = values(gun_name), gun_name = values(gun_name),
@ -251,7 +274,9 @@ device_name
<!--通过主键删除--> <!--通过主键删除-->
<delete id="deleteById"> <delete id="deleteById">
delete from oil_gun where id = #{id} delete
from oil_gun
where id = #{id}
</delete> </delete>
</mapper> </mapper>

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java
View File

@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilGun; import com.fuint.business.petrolStationManagement.entity.OilGun;
import com.fuint.business.petrolStationManagement.entity.OilTank; import com.fuint.business.petrolStationManagement.entity.OilTank;
import com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo;
import com.fuint.business.petrolStationManagement.vo.OilGunVO; import com.fuint.business.petrolStationManagement.vo.OilGunVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* 油枪表(OilGun)表服务接口 * 油枪表(OilGun)表服务接口
@ -48,6 +51,8 @@ public interface OilGunService {
*/ */
boolean insert(OilGun oilGun); boolean insert(OilGun oilGun);
Map<String, List<OilCashRegisterVo>> cashRegisterList();
/** /**
* 修改数据 * 修改数据
* *

42
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java
View File

@ -9,17 +9,22 @@ import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.mapper.OilGunMapper; import com.fuint.business.petrolStationManagement.mapper.OilGunMapper;
import com.fuint.business.petrolStationManagement.mapper.OilNumberMapper; import com.fuint.business.petrolStationManagement.mapper.OilNumberMapper;
import com.fuint.business.petrolStationManagement.service.OilGunService; import com.fuint.business.petrolStationManagement.service.OilGunService;
import com.fuint.business.petrolStationManagement.vo.OilCashRegisterVo;
import com.fuint.business.petrolStationManagement.vo.OilGunVO; import com.fuint.business.petrolStationManagement.vo.OilGunVO;
import com.fuint.business.petrolStationManagement.vo.OilNumberVO; import com.fuint.business.petrolStationManagement.vo.OilNumberVO;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil; import com.fuint.common.util.TokenUtil;
import com.fuint.quartz.util.BeanUtils; import com.fuint.quartz.util.BeanUtils;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 油枪表(OilGun)表服务实现类 * 油枪表(OilGun)表服务实现类
@ -60,7 +65,9 @@ public class OilGunServiceImpl implements OilGunService {
// IPage<OilGunVO> oilGunIPage = oilGunDao.queryAllByLimit(page, oilGun); // IPage<OilGunVO> oilGunIPage = oilGunDao.queryAllByLimit(page, oilGun);
return oilGunDao.queryAllByLimit(page, oilGun); return oilGunDao.queryAllByLimit(page, oilGun);
} @Override }
@Override
public IPage<OilGunVO> queryByPage2(@Param("page") Page page, @Param("oilGun") OilGun oilGun) { public IPage<OilGunVO> queryByPage2(@Param("page") Page page, @Param("oilGun") OilGun oilGun) {
if (ObjectUtil.isEmpty(oilGun.getStoreId())) { if (ObjectUtil.isEmpty(oilGun.getStoreId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@ -80,7 +87,7 @@ public class OilGunServiceImpl implements OilGunService {
List<OilGunVO> oilName = oilGunDao.getOilName(nowAccountInfo.getStoreId()); List<OilGunVO> oilName = oilGunDao.getOilName(nowAccountInfo.getStoreId());
// 根据店铺id查询所有油枪 // 根据店铺id查询所有油枪
List<OilGun> allList = oilGunDao.getAllList(oilGun); List<OilGun> allList = oilGunDao.getAllList(oilGun);
if (oilName.size() <= 0 || allList.size() <= 0){ if (oilName.size() <= 0 || allList.size() <= 0) {
return oilName; return oilName;
} }
for (OilGunVO oilNumber : oilName) { for (OilGunVO oilNumber : oilName) {
@ -104,7 +111,7 @@ public class OilGunServiceImpl implements OilGunService {
oilGun.setStatus("启用"); oilGun.setStatus("启用");
// 根据店铺id查询所有油枪 // 根据店铺id查询所有油枪
List<OilGun> allList = oilGunDao.getAllList(oilGun); List<OilGun> allList = oilGunDao.getAllList(oilGun);
if (oilName.size() <= 0 || allList.size() <= 0){ if (oilName.size() <= 0 || allList.size() <= 0) {
return oilName; return oilName;
} }
for (OilGunVO oilNumber : oilName) { for (OilGunVO oilNumber : oilName) {
@ -131,12 +138,25 @@ public class OilGunServiceImpl implements OilGunService {
oilGun.setStoreId(accountInfo.getStoreId()); oilGun.setStoreId(accountInfo.getStoreId());
oilGun.setCreateBy(accountInfo.getStaffId().toString()); oilGun.setCreateBy(accountInfo.getStaffId().toString());
int i = checkData(oilGun); int i = checkData(oilGun);
if (i>0) { if (i > 0) {
return false; return false;
} }
oilGun.setCreateBy(accountInfo.getId().toString()); oilGun.setCreateBy(accountInfo.getId().toString());
return oilGunDao.insert(oilGun)>0; return oilGunDao.insert(oilGun) > 0;
}
@Override
public Map<String, List<OilCashRegisterVo>> cashRegisterList() {
AccountInfo accountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = accountInfo.getStoreId();
List<OilCashRegisterVo> oilCashRegisterVos = oilGunDao.cashRegisterList(storeId);
Map<String, List<OilCashRegisterVo>> groupedByOilName = oilCashRegisterVos.stream()
.collect(Collectors.groupingBy(OilCashRegisterVo::getOilName));
return groupedByOilName;
} }
// 判断是否有同一名称的数据 // 判断是否有同一名称的数据
@ -162,7 +182,7 @@ public class OilGunServiceImpl implements OilGunService {
oilGun.setStoreId(accountInfo.getStoreId()); oilGun.setStoreId(accountInfo.getStoreId());
List<OilGun> oilGuns = checkData2(oilGun); List<OilGun> oilGuns = checkData2(oilGun);
if (ObjectUtil.isNotEmpty(oilGuns)) { if (ObjectUtil.isNotEmpty(oilGuns)) {
if (oilGuns.size()>1) { if (oilGuns.size() > 1) {
return false; return false;
} }
if (!oilGuns.get(0).getId().equals(oilGun.getId())) { if (!oilGuns.get(0).getId().equals(oilGun.getId())) {
@ -171,7 +191,7 @@ public class OilGunServiceImpl implements OilGunService {
} }
oilGun.setUpdateBy(accountInfo.getId().toString()); oilGun.setUpdateBy(accountInfo.getId().toString());
return this.oilGunDao.update(oilGun)>0; return this.oilGunDao.update(oilGun) > 0;
} }
/** /**
@ -188,8 +208,8 @@ public class OilGunServiceImpl implements OilGunService {
@Override @Override
public List<OilGun> selectOilGunByNumberId(Integer numberId) { public List<OilGun> selectOilGunByNumberId(Integer numberId) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("number_id",numberId); queryWrapper.eq("number_id", numberId);
queryWrapper.eq("status","启用"); queryWrapper.eq("status", "启用");
List<OilGun> list = oilGunDao.selectList(queryWrapper); List<OilGun> list = oilGunDao.selectList(queryWrapper);
return list; return list;
} }
@ -197,8 +217,8 @@ public class OilGunServiceImpl implements OilGunService {
@Override @Override
public List<OilGun> selectOilGunByTankId(Integer tankId) { public List<OilGun> selectOilGunByTankId(Integer tankId) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("tank_id",tankId); queryWrapper.eq("tank_id", tankId);
queryWrapper.eq("status","启用"); queryWrapper.eq("status", "启用");
List<OilGun> list = oilGunDao.selectList(queryWrapper); List<OilGun> list = oilGunDao.selectList(queryWrapper);
return list; return list;
} }

24
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/vo/OilCashRegisterVo.java Normal file
View File

@ -0,0 +1,24 @@
package com.fuint.business.petrolStationManagement.vo;
import com.fuint.business.petrolStationManagement.entity.OilGun;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class OilCashRegisterVo extends OilGun {
/**
* 关联表 油号名称
*/
private String oilName;
/**
* 关联表 油品类型
*/
private String oilType;
/**
* 关联表 挂牌价
*/
private BigDecimal oilPrice;
}

17
fuintCashierWeb/src/api/newHome/newHome.js Normal file
View File

@ -0,0 +1,17 @@
import request from '@/utils/request'
//根据当前店铺id获取 按照油号分组油枪
export function cashRegisterList() {
return request({
url: '/business/petrolStationManagement/oilGun/cashRegisterList',
method: 'get',
})
}
//根据当前店铺id获取商品列表
export function cashRegisterGoodsList() {
return request({
url: '/cashRegisterGoods/list',
method: 'get',
})
}

624
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -2,7 +2,7 @@
<div class="new-contoner"> <div class="new-contoner">
<div class="left-box"> <div class="left-box">
<div class="box-top"> <div class="box-top">
<div class="o-top" v-if="userInfo" > <div class="o-top" v-if="userInfo">
<div class="d-s"> <div class="d-s">
<img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px"> <img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
<div> <div>
@ -15,18 +15,18 @@
</div> </div>
</div> </div>
<div class="d-s"> <div class="d-s">
<div class="an_bor" @click="addMemberRecharge()" >会员充值</div> <div class="an_bor" @click="addMemberRecharge()">会员充值</div>
<div class="an_bor">重置会员</div> <div class="an_bor">重置会员</div>
<div class="an_bor">赠送优惠券</div> <div class="an_bor">赠送优惠券</div>
</div> </div>
</div> </div>
<div class="o-top" v-if="!userInfo" > <div class="o-top" v-if="!userInfo">
<div class="left_input"> <div class="left_input">
<input type="text" placeholder="请输入会员手机号" > <input type="text" placeholder="请输入会员手机号">
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
</div> </div>
<div class="d-s"> <div class="d-s">
<div class="an_bor" @click="addVip()" >新增会员</div> <div class="an_bor" @click="addVip()">新增会员</div>
</div> </div>
</div> </div>
<div class="t-top"> <div class="t-top">
@ -85,7 +85,10 @@
</div> </div>
<div class="er-box"></div> <div class="er-box"></div>
<div class="wrap-box"> <div class="wrap-box">
<div class="f-box" v-for="(item,index) in cardList" :class="{'f-acvite' : index == ruleIndex }" @click="setindex(index)" :key="index">{{ item.name }}</div> <div class="f-box" v-for="(item,index) in cardList" :class="{'f-acvite' : index == ruleIndex }"
@click="setindex(index)" :key="index"
>{{ item.name }}
</div>
</div> </div>
</div> </div>
<div class="box-bottom"> <div class="box-bottom">
@ -99,57 +102,57 @@
<div class="cont-box"> <div class="cont-box">
<div class="box-top"> <div class="box-top">
<div class="cont-tab"> <div class="cont-tab">
<div class="tab-box" v-for="(item,index) in tabList" :key="index" @click="setTabindex(index)"> <div class="tab-box" v-for="(value,key,index) in tabList" :key="index" @click="setTabindex(key,index)">
<div class="tab-name" :class="{ 'active_name' : tabIndex == index }">{{ item.name }}</div> <div class="tab-name" :class="{ 'active_name' : tabIndex == index }">{{ key }}</div>
<div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div> <div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div>
</div> </div>
</div> </div>
<div class="tab-kuang" style="flex-wrap: wrap"> <div class="tab-kuang" style="flex-wrap: wrap">
<div class="card92" v-for="(item,index) in 3" @click="setRefuelingAmount()" > <!-- <div class="card92" v-for="(item,index) in 3" @click="setRefuelingAmount()">-->
<div>汽油 92#</div> <!-- <div>汽油 92#</div>-->
<div class="card-title">1号枪</div> <!-- <div class="card-title">1号枪</div>-->
<!-- <div class="c-b-d">-->
<!-- <img src="./imgs/92oil.png" style="width: 16px;height: 16px">-->
<!-- <div>92号汽油罐</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="card95" v-for="(item,index) in 3">-->
<!-- <div>汽油 95#</div>-->
<!-- <div class="card-title">1号枪</div>-->
<!-- <div class="c-b-d">-->
<!-- <img src="./imgs/95oil.png" style="width: 16px;height: 16px">-->
<!-- <div>95号汽油罐</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="card98" v-for="(item,index) in 3">-->
<!-- <div>汽油 98#</div>-->
<!-- <div class="card-title">1号枪</div>-->
<!-- <div class="c-b-d">-->
<!-- <img src="./imgs/98oil.png" style="width: 16px;height: 16px">-->
<!-- <div>98号汽油罐</div>-->
<!-- </div>-->
<!-- </div>-->
<div :class=item.classStyle v-for="(item,index) in dataList" @click="setRefuelingAmount(item)">
<div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
<div class="card-title">{{ item.gunName }}</div>
<div class="c-b-d"> <div class="c-b-d">
<img src="./imgs/92oil.png" style="width: 16px;height: 16px"> <img :src=item.img style="width: 16px;height: 16px">
<div>92号汽油罐</div> <div>{{ item.oilName }}&nbsp;{{ item.oilType + '罐' }}</div>
</div>
</div>
<div class="card95" v-for="(item,index) in 3">
<div>汽油 95#</div>
<div class="card-title">1号枪</div>
<div class="c-b-d">
<img src="./imgs/95oil.png" style="width: 16px;height: 16px">
<div>95号汽油罐</div>
</div>
</div>
<div class="card98" v-for="(item,index) in 3">
<div>汽油 98#</div>
<div class="card-title">1号枪</div>
<div class="c-b-d">
<img src="./imgs/98oil.png" style="width: 16px;height: 16px">
<div>98号汽油罐</div>
</div>
</div>
<div class="card0" v-for="(item,index) in 3">
<div>柴油 0#</div>
<div class="card-title">1号枪</div>
<div class="c-b-d">
<img src="./imgs/0oil.png" style="width: 16px;height: 16px">
<div>0#柴油罐</div>
</div> </div>
</div> </div>
</div> </div>
<div class="c-bottom"> <div class="c-bottom">
8号枪（21.03L/191.7936元）；10号枪（45.03L/300.2852元） {{ getGoodsItem }}
</div> </div>
<div class="bottom-b-d"> <div class="bottom-b-d">
<div>订单笔数 <span style="color: #FF9655">0件</span></div> <!-- <div>订单笔数 <span style="color: #FF9655">0件</span></div>-->
<div>订单金额 <span style="color: #FF9655">￥0.00</span></div> <div>油品金额 <span style="color: #FF9655">￥{{ oilGunClearing.amount || 0.00 }}</span></div>
</div> </div>
</div> </div>
<div class="box-bottom"> <div class="box-bottom">
<div class="anniu-c"> <div class="anniu-c" @click="oilGunReset()">
重置 重置
</div> </div>
</div> </div>
@ -157,13 +160,21 @@
<div class="right-box"> <div class="right-box">
<div class="box-top"> <div class="box-top">
<div class="r-top">非油商品</div> <div class="r-top">非油商品</div>
<el-autocomplete <el-autocomplete
style="width: 95%;margin: 15px " style="width: 95%;margin: 15px "
popper-class="my-autocomplete"
v-model="state" v-model="state"
:fetch-suggestions="querySearchAsync" :fetch-suggestions="querySearchAsync"
placeholder="请输入内容" placeholder="请输入内容"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> >
<template slot-scope="{ item }">
<div class="name">{{ item.name }}</div>
</template>
</el-autocomplete>
<div class="taber-top"> <div class="taber-top">
<div class="goods_name">商品</div> <div class="goods_name">商品</div>
<div class="stock_name">库存</div> <div class="stock_name">库存</div>
@ -171,29 +182,31 @@
<div class="num_name">数量</div> <div class="num_name">数量</div>
<div class="orerate_name">操作</div> <div class="orerate_name">操作</div>
</div> </div>
<div class="taber-box" v-for="(item,index) in 5" :key="index"> <!-- 渲染商品列表 -->
<div class="taber-box" v-for="(item,index) in goodsList" :key="index">
<div class="goods_name"> <div class="goods_name">
<img src="../../../assets/images/goods.png" style="width: 30px;height: 30px"> <!-- <img src="../../../assets/images/goods.png" style="width: 30px;height: 30px">-->
{{ item.name }}
</div> </div>
<div class="stock_name">60</div> <div class="stock_name">{{ item.stock }}</div>
<div class="u-price_name">6.8</div> <div class="u-price_name">{{ item.retailPrice }}</div>
<div class="num_name">1</div> <div class="num_name">{{ item.num }}</div>
<div class="orerate_name"> <div class="orerate_name">
<span style="color: red;cursor: pointer">删除</span> <span style="color: red;cursor: pointer" @click="deleteGoods(item.id)">删除</span>
</div> </div>
</div> </div>
<div class="bottom-b-d"> <div class="bottom-b-d">
<div>订单笔数 <span style="color: #FF9655">0件</span></div> <div>商品总数 <span style="color: #FF9655">{{ getGoodsListNum }}件</span></div>
<div>订单金额 <span style="color: #FF9655">￥27.00</span></div> <div>商品总金额 <span style="color: #FF9655">￥{{ getGoodsNum }}</span></div>
</div> </div>
</div> </div>
<div class="box-bottom"> <div class="box-bottom">
<div class="anniu-c"> <div class="anniu-c" @click="goodsReset()">
重置 重置
</div> </div>
<div class="d-s"> <div class="d-s">
<div class="anniu-lv" @click="invokePickUpTheOrder" >取单</div> <div class="anniu-lv" @click="invokePickUpTheOrder">取单</div>
<div class="anniu-lan" @click="invokeHangingAnOrder" >挂单</div> <div class="anniu-lan" @click="invokeHangingAnOrder">挂单</div>
</div> </div>
</div> </div>
</div> </div>
@ -258,11 +271,10 @@
center center
> >
<div class="tc-box"> <div class="tc-box">
<el-form :model="ruleForms" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForms" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="挂单名称" prop="name"> <el-form-item label="挂单名称" prop="name">
<el-input v-model="ruleForms.name"> <el-input v-model="ruleForms.name">
<template slot="append">元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<div class="h-size"> <div class="h-size">
@ -273,7 +285,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="hangingAnOrder = false">取 消</el-button> <el-button @click="hangingAnOrder = false">取 消</el-button>
<el-button type="primary" @click="hangingAnOrder = false">确 定</el-button> <el-button type="primary" @click="pendingOrders()">确定挂单</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
@ -309,11 +321,15 @@
width="910px" width="910px"
center center
> >
<pickUp></pickUp> <!-- 商品挂单 子组件 -->
<pickUp :pendingOrdersList="pendingOrdersList" @fatherPendingOrdersList="fatherPendingOrdersList"
@fatherPendingOrdersName="fatherPendingOrdersName"
></pickUp>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="pickUpTheOrder = false">取消</el-button> <el-button type="primary" @click="pickUpTheOrder = false">取消</el-button>
<el-button type="primary" @click="pickUpTheOrder = false">作废</el-button> <!-- pendingOrdersList pickUpTheOrder = false pickUpTheOrder = false -->
<el-button type="primary" @click="pickUpTheOrder = false">取单</el-button> <el-button type="primary" @click="deletePendingOrdersList">作废</el-button>
<el-button type="primary" @click="getPendingOrdersList">取单</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
@ -347,11 +363,11 @@
center center
> >
<div class="tc-box"> <div class="tc-box">
<refuelingAmount></refuelingAmount> <refuelingAmount :goodsItem="oilGun" ref="refuelingAmount" @fatherMethod="fatherMethod"></refuelingAmount>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="refuelingAmount = false">取 消</el-button> <el-button @click="refuelingAmount = false">取 消</el-button>
<el-button type="primary" @click="refuelingAmount = false">确 定</el-button> <el-button type="primary" @click="sonButton()">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -362,12 +378,26 @@ import pickUp from './newHomeComponents/pickUpTheOrder.vue'
import accountPending from './newHomeComponents/accountPending.vue' import accountPending from './newHomeComponents/accountPending.vue'
import memberRecharge from './newHomeComponents/memberRecharge.vue' import memberRecharge from './newHomeComponents/memberRecharge.vue'
import refuelingAmount from './newHomeComponents/refuelingAmount.vue' import refuelingAmount from './newHomeComponents/refuelingAmount.vue'
import { cashRegisterList, cashRegisterGoodsList } from '@/api/newHome/newHome.js'
export default { export default {
data() { data() {
return { return {
//
value: '',
//商品子组件选中时 容器
sonGoodsList: [],
//油枪 父传子
oilGun: '',
//油枪结算 容器
oilGunClearing: '',
//商品列表
goodsList: [],
restaurants: [], restaurants: [],
state: '', state: '',
timeout: null, //挂单数据容器
pendingOrdersList: [],
timeout: null,
boxShow: true, boxShow: true,
boxShow1: true, boxShow1: true,
boxShow2: true, boxShow2: true,
@ -411,75 +441,220 @@ export default {
num: '0' num: '0'
} }
], ],
tabList: [ //油枪数据 初始化容器
{ tabList: {
name: '全部', '01': [],
id: '' '02': [],
}, '03': [],
{ '04': []
name: '92#', },
id: '1' //油枪列表数据
}, dataList: {},
{ userInfo: true,//判断登录状态
name: '95#', ruleIndex: 0,
id: '2'
},
{
name: '98#',
id: '3'
},
{
name: '0#',
id: '4'
},
],
userInfo:true,//判断登录状态
ruleIndex:0,
tabIndex: 0, tabIndex: 0,
newMember: false, newMember: false,
ScanCodePayment: false, ScanCodePayment: false,
cashPayment: false, cashPayment: false,
ruleForm: { ruleForm: {
name: '', name: ''
}, },
ruleForms: { ruleForms: {
name: '', name: ''
}, },
rules: { rules: {
name: [ name: [
{required: true, message: '请输入活动名称', trigger: 'blur'}, { required: true, message: '请输入挂单名称', trigger: 'blur' }
{min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur'} ]
],
}, },
refuelingAmount: false, refuelingAmount: false,
hangingAnOrder: false, hangingAnOrder: false,
paymentResults: false, paymentResults: false,
pickUpTheOrder: false, pickUpTheOrder: false,
accountPending: false, accountPending: false,
memberRecharge: false, memberRecharge: false
} }
}, },
components:{ watch: {
//监听子弹窗成功 提交了 然后再隐藏子元素标签
oilGunClearing: {
immediate: true,
deep: true,
handler(newValue, oldValue) {
this.refuelingAmount = false
}
}
},
components: {
pickUp, pickUp,
accountPending, accountPending,
memberRecharge, memberRecharge,
refuelingAmount refuelingAmount
}, },
created() {
//初始化 油枪 商品
this.getOilList()
this.getGoodsList()
},
mounted() { mounted() {
this.restaurants = this.loadAll();
},
computed: {
getGoodsItem() {
if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) {
// 保留两位小数
let l = this.oilGunClearing.amount / this.oilGunClearing.oilPrice
// 8号枪（21.03L/191.7936元）
return `${this.oilGunClearing.gunName}（${l.toFixed(2)}L/${this.oilGunClearing.amount}元）`
} else {
return ''
}
},
//总金额
getGoodsNum() {
let total = 0
this.goodsList.forEach(item => {
total += item.retailPrice * item.num
})
return total
},
//总数量
getGoodsListNum() {
let total = 0
this.goodsList.forEach(item => {
total += item.num
})
return total
}
}, },
methods: { methods: {
invokePickUpTheOrder(){
//油枪初始化
getOilList() {
cashRegisterList().then(res => {
this.tabList = res.data
//加上全部选项
this.tabList = {
'全部': 'all',
...this.tabList
}
for (const key in this.tabList) {
// 循环为 不同油号 赋值不同图片样式
if (key == '0#') {
this.tabList[key].forEach(item => {
item.img = './imgs/0oil.png'
item.classStyle = 'card0'
})
}
if (key == '98#') {
this.tabList[key].forEach(item => {
item.img = './imgs/98oil.png'
item.classStyle = 'card98'
})
}
if (key == '95#') {
this.tabList[key].forEach(item => {
item.img = './imgs/95oil.png'
item.classStyle = 'card95'
})
}
if (key == '92#') {
this.tabList[key].forEach(item => {
item.img = './imgs/92oil.png'
item.classStyle = 'card92'
})
}
}
// 调用一下油枪数据列表 初始化
this.setTabindex('全部', 0)
})
},
//商品初始化
async getGoodsList() {
const res = await cashRegisterGoodsList()
this.restaurants = res.data
},
invokePickUpTheOrder() {
//获取存储数据
this.pendingOrdersList = JSON.parse(window.sessionStorage.getItem('pendingOrders')) || []
this.pickUpTheOrder = true this.pickUpTheOrder = true
}, },
invokeHangingAnOrder(){ //确定挂单
this.hangingAnOrder = true pendingOrders() {
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
// 1.先取出之前的转 json 然后追加 将 JSON 字符串解析回对象
this.pendingOrdersList = JSON.parse(window.sessionStorage.getItem('pendingOrders')) || []
// 2.商品列表没有数据不允许添加
if (!this.goodsList.length) {
this.$message.error('商品列表为空，请添加商品')
return
}
// 3.如果名称重复则不允许添加
let bo1 = true
this.pendingOrdersList.forEach(item => {
if (item.name == this.ruleForms.name) {
this.$message.error('名称重复，请重新输入')
bo1 = false
return
}
})
// 4.追加数据
if (bo1) {
this.pendingOrdersList.push(
{
name: this.ruleForms.name,
list: this.goodsList
}
)
// 将当前 商品订单表 放入 sessionStorage
window.sessionStorage.setItem('pendingOrders', JSON.stringify(this.pendingOrdersList))
// 清空当前商品
this.goodsList = []
//重置表单 关闭弹窗
this.ruleForms = {
name: ''
}
this.hangingAnOrder = false
}
} else {
console.log('error submit!!')
return false
}
})
}, },
addVip(){ //挂单
invokeHangingAnOrder() {
this.hangingAnOrder = true
//必须 输入 挂单名称 将数据临时存储在 sessionStorage 刷新自动取消
},
addVip() {
this.newMember = true this.newMember = true
}, },
addMemberRecharge(){ addMemberRecharge() {
this.memberRecharge = true this.memberRecharge = true
}, },
changeBox() { changeBox() {
@ -491,83 +666,203 @@ export default {
changeBox2() { changeBox2() {
this.boxShow2 = !this.boxShow2 this.boxShow2 = !this.boxShow2
}, },
setTabindex(index) { setTabindex(key, index) {
//列表选中样式
this.tabIndex = index this.tabIndex = index
if (key == '全部') {
this.dataList = []
for (const tabKey in this.tabList) {
this.dataList = this.dataList.concat(this.tabList[tabKey])
}
//因为 页面展示多加了一个 全部 要删掉第一个元素
this.dataList.shift()
} else {
for (const tabKey in this.tabList) {
if (key == tabKey) {
this.dataList = this.tabList[tabKey]
}
}
}
}, },
setindex(index){ setindex(index) {
this.ruleIndex = index this.ruleIndex = index
}, },
setRefuelingAmount(){ setRefuelingAmount(item) {
this.refuelingAmount = true this.refuelingAmount = true
//赋值 传给子组件的油枪对象
this.oilGun = item
}, },
loadAll() { loadAll() {
return [ return [
{ "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" }, { 'value': '三全鲜食（北新泾店）', 'address': '长宁区新渔路144号' },
{ "value": "Hot honey 首尔炸鸡（仙霞路）", "address": "上海市长宁区淞虹路661号" }, { 'value': 'Hot honey 首尔炸鸡（仙霞路）', 'address': '上海市长宁区淞虹路661号' },
{ "value": "新旺角茶餐厅", "address": "上海市普陀区真北路988号创邑金沙谷6号楼113" }, { 'value': '新旺角茶餐厅', 'address': '上海市普陀区真北路988号创邑金沙谷6号楼113' },
{ "value": "泷千家(天山西路店)", "address": "天山西路438号" }, { 'value': '泷千家(天山西路店)', 'address': '天山西路438号' },
{ "value": "胖仙女纸杯蛋糕（上海凌空店）", "address": "上海市长宁区金钟路968号1幢18号楼一层商铺18-101" }, { 'value': '胖仙女纸杯蛋糕（上海凌空店）', 'address': '上海市长宁区金钟路968号1幢18号楼一层商铺18-101' },
{ "value": "贡茶", "address": "上海市长宁区金钟路633号" }, { 'value': '贡茶', 'address': '上海市长宁区金钟路633号' },
{ "value": "豪大大香鸡排超级奶爸", "address": "上海市嘉定区曹安公路曹安路1685号" }, { 'value': '豪大大香鸡排超级奶爸', 'address': '上海市嘉定区曹安公路曹安路1685号' },
{ "value": "茶芝兰（奶茶，手抓饼）", "address": "上海市普陀区同普路1435号" }, { 'value': '茶芝兰（奶茶，手抓饼）', 'address': '上海市普陀区同普路1435号' },
{ "value": "十二泷町", "address": "上海市北翟路1444弄81号B幢-107" }, { 'value': '十二泷町', 'address': '上海市北翟路1444弄81号B幢-107' },
{ "value": "星移浓缩咖啡", "address": "上海市嘉定区新郁路817号" }, { 'value': '星移浓缩咖啡', 'address': '上海市嘉定区新郁路817号' },
{ "value": "阿姨奶茶/豪大大", "address": "嘉定区曹安路1611号" }, { 'value': '阿姨奶茶/豪大大', 'address': '嘉定区曹安路1611号' },
{ "value": "新麦甜四季甜品炸鸡", "address": "嘉定区曹安公路2383弄55号" }, { 'value': '新麦甜四季甜品炸鸡', 'address': '嘉定区曹安公路2383弄55号' },
{ "value": "Monica摩托主题咖啡店", "address": "嘉定区江桥镇曹安公路2409号1F，2383弄62号1F" }, { 'value': 'Monica摩托主题咖啡店', 'address': '嘉定区江桥镇曹安公路2409号1F，2383弄62号1F' },
{ "value": "浮生若茶（凌空soho店）", "address": "上海长宁区金钟路968号9号楼地下一层" }, { 'value': '浮生若茶（凌空soho店）', 'address': '上海长宁区金钟路968号9号楼地下一层' },
{ "value": "NONO JUICE 鲜榨果汁", "address": "上海市长宁区天山西路119号" }, { 'value': 'NONO JUICE 鲜榨果汁', 'address': '上海市长宁区天山西路119号' },
{ "value": "CoCo都可(北新泾店）", "address": "上海市长宁区仙霞西路" }, { 'value': 'CoCo都可(北新泾店）', 'address': '上海市长宁区仙霞西路' },
{ "value": "快乐柠檬（神州智慧店）", "address": "上海市长宁区天山西路567号1层R117号店铺" }, { 'value': '快乐柠檬（神州智慧店）', 'address': '上海市长宁区天山西路567号1层R117号店铺' },
{ "value": "Merci Paul cafe", "address": "上海市普陀区光复西路丹巴路28弄6号楼819" }, { 'value': 'Merci Paul cafe', 'address': '上海市普陀区光复西路丹巴路28弄6号楼819' },
{ "value": "猫山王（西郊百联店）", "address": "上海市长宁区仙霞西路88号第一层G05-F01-1-306" }, { 'value': '猫山王（西郊百联店）', 'address': '上海市长宁区仙霞西路88号第一层G05-F01-1-306' },
{ "value": "枪会山", "address": "上海市普陀区棕榈路" }, { 'value': '枪会山', 'address': '上海市普陀区棕榈路' },
{ "value": "纵食", "address": "元丰天山花园(东门) 双流路267号" }, { 'value': '纵食', 'address': '元丰天山花园(东门) 双流路267号' },
{ "value": "钱记", "address": "上海市长宁区天山西路" }, { 'value': '钱记', 'address': '上海市长宁区天山西路' },
{ "value": "壹杯加", "address": "上海市长宁区通协路" }, { 'value': '壹杯加', 'address': '上海市长宁区通协路' },
{ "value": "唦哇嘀咖", "address": "上海市长宁区新泾镇金钟路999号2幢（B幢）第01层第1-02A单元" }, { 'value': '唦哇嘀咖', 'address': '上海市长宁区新泾镇金钟路999号2幢（B幢）第01层第1-02A单元' },
{ "value": "爱茜茜里(西郊百联)", "address": "长宁区仙霞西路88号1305室" }, { 'value': '爱茜茜里(西郊百联)', 'address': '长宁区仙霞西路88号1305室' },
{ "value": "爱茜茜里(近铁广场)", "address": "上海市普陀区真北路818号近铁城市广场北区地下二楼N-B2-O2-C商铺" }, { 'value': '爱茜茜里(近铁广场)', 'address': '上海市普陀区真北路818号近铁城市广场北区地下二楼N-B2-O2-C商铺' },
{ "value": "鲜果榨汁（金沙江路和美广店）", "address": "普陀区金沙江路2239号金沙和美广场B1-10-6" }, { 'value': '鲜果榨汁（金沙江路和美广店）', 'address': '普陀区金沙江路2239号金沙和美广场B1-10-6' },
{ "value": "开心丽果（缤谷店）", "address": "上海市长宁区威宁路天山路341号" }, { 'value': '开心丽果（缤谷店）', 'address': '上海市长宁区威宁路天山路341号' },
{ "value": "超级鸡车（丰庄路店）", "address": "上海市嘉定区丰庄路240号" }, { 'value': '超级鸡车（丰庄路店）', 'address': '上海市嘉定区丰庄路240号' },
{ "value": "妙生活果园（北新泾店）", "address": "长宁区新渔路144号" }, { 'value': '妙生活果园（北新泾店）', 'address': '长宁区新渔路144号' },
{ "value": "香宜度麻辣香锅", "address": "长宁区淞虹路148号" }, { 'value': '香宜度麻辣香锅', 'address': '长宁区淞虹路148号' },
{ "value": "凡仔汉堡（老真北路店）", "address": "上海市普陀区老真北路160号" }, { 'value': '凡仔汉堡（老真北路店）', 'address': '上海市普陀区老真北路160号' },
{ "value": "港式小铺", "address": "上海市长宁区金钟路968号15楼15-105室" }, { 'value': '港式小铺', 'address': '上海市长宁区金钟路968号15楼15-105室' },
{ "value": "蜀香源麻辣香锅（剑河路店）", "address": "剑河路443-1" }, { 'value': '蜀香源麻辣香锅（剑河路店）', 'address': '剑河路443-1' },
{ "value": "北京饺子馆", "address": "长宁区北新泾街道天山西路490-1号" }, { 'value': '北京饺子馆', 'address': '长宁区北新泾街道天山西路490-1号' },
{ "value": "饭典*新简餐（凌空SOHO店）", "address": "上海市长宁区金钟路968号9号楼地下一层9-83室" }, { 'value': '饭典*新简餐（凌空SOHO店）', 'address': '上海市长宁区金钟路968号9号楼地下一层9-83室' },
{ "value": "焦耳·川式快餐（金钟路店）", "address": "上海市金钟路633号地下一层甲部" }, { 'value': '焦耳·川式快餐（金钟路店）', 'address': '上海市金钟路633号地下一层甲部' },
{ "value": "动力鸡车", "address": "长宁区仙霞西路299弄3号101B" }, { 'value': '动力鸡车', 'address': '长宁区仙霞西路299弄3号101B' },
{ "value": "浏阳蒸菜", "address": "天山西路430号" }, { 'value': '浏阳蒸菜', 'address': '天山西路430号' },
{ "value": "四海游龙（天山西路店）", "address": "上海市长宁区天山西路" }, { 'value': '四海游龙（天山西路店）', 'address': '上海市长宁区天山西路' },
{ "value": "樱花食堂（凌空店）", "address": "上海市长宁区金钟路968号15楼15-105室" }, { 'value': '樱花食堂（凌空店）', 'address': '上海市长宁区金钟路968号15楼15-105室' },
{ "value": "壹分米客家传统调制米粉(天山店)", "address": "天山西路428号" }, { 'value': '壹分米客家传统调制米粉(天山店)', 'address': '天山西路428号' },
{ "value": "福荣祥烧腊（平溪路店）", "address": "上海市长宁区协和路福泉路255弄57-73号" }, { 'value': '福荣祥烧腊（平溪路店）', 'address': '上海市长宁区协和路福泉路255弄57-73号' },
{ "value": "速记黄焖鸡米饭", "address": "上海市长宁区北新泾街道金钟路180号1层01号摊位" }, { 'value': '速记黄焖鸡米饭', 'address': '上海市长宁区北新泾街道金钟路180号1层01号摊位' },
{ "value": "红辣椒麻辣烫", "address": "上海市长宁区天山西路492号" }, { 'value': '红辣椒麻辣烫', 'address': '上海市长宁区天山西路492号' },
{ "value": "(小杨生煎)西郊百联餐厅", "address": "长宁区仙霞西路88号百联2楼" }, { 'value': '(小杨生煎)西郊百联餐厅', 'address': '长宁区仙霞西路88号百联2楼' },
{ "value": "阳阳麻辣烫", "address": "天山西路389号" }, { 'value': '阳阳麻辣烫', 'address': '天山西路389号' },
{ "value": "南拳妈妈龙虾盖浇饭", "address": "普陀区金沙江路1699号鑫乐惠美食广场A13" } { 'value': '南拳妈妈龙虾盖浇饭', 'address': '普陀区金沙江路1699号鑫乐惠美食广场A13' }
]; ]
}, },
//必须是异步方法
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
var restaurants = this.restaurants; const restaurants = this.restaurants
var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants; let results
clearTimeout(this.timeout); if (queryString) {
this.timeout = setTimeout(() => { results = restaurants.filter(this.createFilter(queryString))
cb(results); } else {
}, 1000 * Math.random()); results = restaurants
}
cb(results)
}, },
createStateFilter(queryString) { createFilter(queryString) {
return (state) => { return (restaurant) => {
return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
}; }
}, },
handleSelect(item) {
console.log(item); //取单 下拉框是子组件 子组件通过数据监听 将数据发送给父组件
getPendingOrdersList() {
//并且删除 父传子数据容器 以及 重新存储sessionStorage
this.pendingOrdersList = JSON.parse(window.sessionStorage.getItem('pendingOrders')) || []
if (this.pendingOrdersList.length) {
let found = false
this.pendingOrdersList = this.pendingOrdersList.filter(item => {
if (item.name === this.value) {
if (!found) {
this.goodsList = item.list
found = true
}
return false // 不保留匹配的项
}
return true // 保留不匹配的项
})
window.sessionStorage.setItem('pendingOrders', JSON.stringify(this.pendingOrdersList))
} else {
this.$message.error('当前无存单 请存单后再作废')
}
},
//作废 下拉框是子组件 子组件通过数据监听 将数据发送给父组件
deletePendingOrdersList() {
//并且删除 父传子数据容器 以及 重新存储sessionStorage
this.pendingOrdersList = JSON.parse(window.sessionStorage.getItem('pendingOrders')) || []
if (this.pendingOrdersList.length) {
this.pendingOrdersList = this.pendingOrdersList.filter(item => {
return item.name !== this.value
})
window.sessionStorage.setItem('pendingOrders', JSON.stringify(this.pendingOrdersList))
} else {
this.$message.error('当前无存单 请存单后再作废')
}
},
// 接受子组件列表数据变化
fatherPendingOrdersList(list) {
this.sonGoodsList = list
},
// 接受子组件下拉选中名字变化
fatherPendingOrdersName(value) {
this.value = value
},
//删除商品
deleteGoods(id) {
//根据id删除数组元素
this.goodsList = this.goodsList.filter(item => item.id != id)
},
// 子组件提交调用父组件方法
fatherMethod(list) {
//将当前选中油枪 放入 油枪订单容器 (需要被数据监听)
this.oilGunClearing = { amount: list, ...this.oilGun }
},
//获取子组件数据
sonButton() {
//调用子组件方法
this.$refs.refuelingAmount.submitForm('ruleForm')
},
handleSelect(row) {
let bo1 = true
// 如果 item 存在 goodsList 则 属性+1 不存在直接添加到数组
// 使用 map 生成新数组 防止vue监听不到数组内数据变化
this.goodsList = this.goodsList.map(
item => {
if (item.id == row.id) {
bo1 = false
return { ...item, num: item.num + 1 }
} else {
return item
}
}
)
if (bo1) {
//如果没有先添加数量属性 默认1
row.num = 1
this.goodsList.push(row)
}
},
// 油枪重置
oilGunReset() {
this.oilGunClearing = {}
},
// 收银重置
goodsReset() {
this.goodsList = []
} }
} }
} }
@ -1125,7 +1420,8 @@ input {
justify-content: space-between; justify-content: space-between;
margin: 15px auto; margin: 15px auto;
} }
.left_input{
.left_input {
width: 70%; width: 70%;
border: 1px solid #fff; border: 1px solid #fff;
box-sizing: border-box; box-sizing: border-box;

122
fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/pickUpTheOrder.vue
View File

@ -1,8 +1,24 @@
<script > <script>
export default { export default {
props: {
pendingOrdersList: {
type: Array,
default: []
}
},
created() {
// 如果有数据
if (this.pendingOrdersList.length) {
this.value = this.pendingOrdersList[0].name
this.tableData = this.pendingOrdersList[0].list
} else {
this.tableData = []
this.value = ''
}
},
data() { data() {
return { return {
input:'', value: '',
tableData: [{ tableData: [{
date: '2016-05-02', date: '2016-05-02',
name: '王小虎', name: '王小虎',
@ -21,51 +37,89 @@ export default {
address: '上海市普陀区金沙江路 1516 弄' address: '上海市普陀区金沙江路 1516 弄'
}] }]
} }
},
// 监听器
watch: {
value(newValue, oldValue) {
if (this.pendingOrdersList.length) {
this.pendingOrdersList.forEach(
item => {
if (item.name == newValue) {
this.tableData = item.list
this.$emit('fatherPendingOrdersList', this.tableData)
this.$emit('fatherPendingOrdersName', newValue)
}
}
)
}
},
pendingOrdersList: {
//初始化时候不执行
immediate: false,
handler(newValue) {
if (this.pendingOrdersList.length) {
this.value = this.pendingOrdersList[0].name
this.tableData = this.pendingOrdersList[0].list
} else {
this.tableData = []
this.value = ''
}
}
}
} }
} }
</script> </script>
<template> <template>
<div class="s-"> <div class="s-">
<div> <div>
<el-input v-model="input" placeholder="请输入挂单名称备份"></el-input> <el-select v-model="value" placeholder="请选择">
<div class="xz_">挂单1</div> <el-option
<div class="xz_">挂单2</div> v-for="item in pendingOrdersList"
</div> :key="item.name"
<el-table :label="item.name"
:data="tableData" :value="item.name"
border >
style="width: 100%;margin-left: 20px"> </el-option>
<el-table-column </el-select>
prop="date" </div>
label="商品名称" <el-table
width="180"> :data="tableData"
</el-table-column> border
<el-table-column style="width: 100%;margin-left: 20px"
prop="name" >
label="零售价" <el-table-column
width="180"> prop="name"
</el-table-column> label="商品名称"
<el-table-column width="180"
prop="address" >
label="数量"> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="retailPrice"
prop="address" label="零售价"
label="金额"> width="180"
</el-table-column> >
</el-table> </el-table-column>
</div> <el-table-column
prop="num"
label="数量"
>
</el-table-column>
</el-table>
</div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.s-{ .s- {
width: 100%; width: 100%;
display: flex; display: flex;
margin-right: 20px; margin-right: 20px;
} }
.xz_{
.xz_ {
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;

95
fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue
View File

@ -1,9 +1,18 @@
<script > <script>
export default { export default {
props: {
goodsItem: {
type: Object,
default() {
return {}
}
}
},
data() { data() {
return { return {
ruleForm: { ruleForm: {
name: '', //金额
amount: 100,
region: '', region: '',
date1: '', date1: '',
date2: '', date2: '',
@ -12,17 +21,17 @@ export default {
resource: '', resource: '',
desc: '' desc: ''
}, },
findex:0, findex: 0,
priceList:[ priceList: [
"¥100", 100,
"¥150", 300,
"¥200", 500,
"¥300", 600,
800
], ],
rules: { rules: {
name: [ amount: [
{ required: true, message: '请输入活动名称', trigger: 'blur' }, { required: true, message: '请输入加油金额', trigger: 'blur' }
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
], ],
region: [ region: [
{ required: true, message: '请选择活动区域', trigger: 'change' } { required: true, message: '请选择活动区域', trigger: 'change' }
@ -43,24 +52,28 @@ export default {
{ required: true, message: '请填写活动形式', trigger: 'blur' } { required: true, message: '请填写活动形式', trigger: 'blur' }
] ]
} }
}; }
}, },
methods: { methods: {
setIndex(index){ setIndex(index) {
this.findex = index this.findex = index
//不能直接 = 赋值 vue 监听不到属性值变化
this.$set(this.ruleForm, 'amount', this.priceList[index])
}, },
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
alert('submit!'); // alert('submit!')
this.$emit('fatherMethod', this.ruleForm.amount)
} else { } else {
console.log('error submit!!'); console.log('error submit!!')
return false; return false
} }
}); })
}, },
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields()
} }
} }
} }
@ -71,34 +84,41 @@ export default {
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<div class="input-box"> <div class="input-box">
<div>已选油品</div> <div>已选油品</div>
<div>汽油92#</div> <div>{{ goodsItem.oilName }}</div>
</div> </div>
<div class="input-box"> <div class="input-box">
<div>已选油枪</div> <div>已选油枪</div>
<div>1号枪</div> <div>{{ goodsItem.gunName }}</div>
</div> </div>
<div class="input-box"> <div class="input-box">
<div>油品单价</div> <div>油品单价</div>
<div>8.5元/L</div> <div>{{ goodsItem.oilPrice }}元/L</div>
</div> </div>
<el-input v-model="ruleForm.name" style="width: 490px" placeholder="请输入加油金额"> <el-form-item prop="amount" label="" class="item10086">
<template slot="append">元</template> <el-input v-model="ruleForm.amount" placeholder="请输入加油金额">
</el-input> <template slot="append">元</template>
</el-input>
</el-form-item>
<div class="box-"> <div class="box-">
<div class="fo-box" @click="setIndex(index)" :class="{ 'active' : findex == index }" v-for="(item,index) in priceList" :key="index"> <div class="fo-box" @click="setIndex(index)" :class="{ 'active' : findex == index }"
{{item}} v-for="(item,index) in priceList" :key="index"
</div> >
{{ item }}
</div>
</div> </div>
</el-form> </el-form>
</div> </div>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.hui-size{ .hui-size {
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
} }
.input-box{
.input-box {
width: 490px; width: 490px;
height: 36px; height: 36px;
border-radius: 4px; border-radius: 4px;
@ -112,14 +132,16 @@ export default {
font-size: 14px; font-size: 14px;
color: #FF9655; color: #FF9655;
} }
.box-{
.box- {
width: 490px; width: 490px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 25px auto; margin: 25px auto;
} }
.fo-box{
.fo-box {
width: 72px; width: 72px;
height: 36px; height: 36px;
background: #D8D8D8; background: #D8D8D8;
@ -132,8 +154,17 @@ export default {
cursor: pointer; cursor: pointer;
} }
.active{
.active {
background: #FF9655 !important; background: #FF9655 !important;
color: #fff !important; color: #fff !important;
} }
</style> </style>
<style>
.item10086 .el-form-item__content {
margin-left: 0px !important;
}
</style>