收银台

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HandoverRecordMapper.java

@@ -6,6 +6,7 @@ import com.fuint.business.order.entity.HandoverRecord;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 交班记录表(HandoverRecord)表数据库访问层
@@ -30,7 +31,7 @@ public interface HandoverRecordMapper {
      * @param page         分页对象
      * @return 对象列表
      */
-    IPage<HandoverRecord> queryAllByLimit(@Param("page") Page page, HandoverRecord handoverRecord);
+    IPage<HandoverRecord> queryAllByLimit(@Param("page") Page page, @Param("handoverRecord") HandoverRecord handoverRecord);
 
     HandoverRecord selectByTime(HandoverRecord handoverRecord);
 
@@ -83,5 +84,16 @@ public interface HandoverRecordMapper {
      */
     int deleteById(Integer id);
 
+//    油品交易信息
+    Map<String, String> oilOrderStatistics(@Param("startTime") String startTime, @Param("endTime")  String endTime, @Param("storeId")  Integer storeId);
+//    会员储值交易信息
+    Map<String, String> cardOrderStatistics(@Param("startTime") String startTime, @Param("endTime")  String endTime, @Param("storeId")  Integer storeId);
+//    油卡交易信息
+    Map<String, String> fuelOrderStatistics(@Param("startTime") String startTime, @Param("endTime")  String endTime, @Param("storeId")  Integer storeId);
+//    普通交易
+    Map<String, String> goodsOrderStatistics(@Param("startTime") String startTime, @Param("endTime")  String endTime, @Param("storeId")  Integer storeId);
+
+    List<Map<String, String>>  paymentAggregation(@Param("startTime") String startTime, @Param("endTime")  String endTime, @Param("storeId")  Integer storeId);
+
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HandoverRecordMapper.xml

@@ -13,53 +13,29 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="createBy" column="create_by" jdbcType="INTEGER"/>
         <result property="updateBy" column="update_by" jdbcType="INTEGER"/>
+<!--        <result property="staffName" column="real_name" jdbcType="VARCHAR"/>-->
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="status" column="real_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="HandoverRecordMap">
         select
-          id, staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by
+            hr.id, hr.staff_id, hr.record_data, hr.start_time, hr.end_time, hr.store_id, hr.create_time, hr.update_time, hr.create_by, hr.update_by,ms.real_name staffName,hr.type,hr.status
-        from handover_record
+        from handover_record hr
-        where id = #{id}
+        left join mt_staff ms ON hr.staff_id = ms.id
+        where hr.id = #{id}
     </select>
 
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="HandoverRecordMap">
         select
-          id, staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by
+            hr.id, hr.staff_id, hr.record_data, hr.start_time, hr.end_time, hr.store_id, hr.create_time, hr.update_time, hr.create_by, hr.update_by,ms.real_name as staffName,hr.type,hr.status
-        from handover_record
+        from handover_record hr
-        <where>
+         left join mt_staff ms ON hr.staff_id = ms.id
-            <if test="id != null">
+        where
-                and id = #{id}
+            hr.store_id = #{handoverRecord.storeId}
-            </if>
+
-            <if test="staffId != null">
-                and staff_id = #{staffId}
-            </if>
-            <if test="recordData != null and recordData != ''">
-                and record_data = #{recordData}
-            </if>
-            <if test="startTime != null">
-                and start_time = #{startTime}
-            </if>
-            <if test="endTime != null">
-                and end_time = #{endTime}
-            </if>
-            <if test="storeId != null">
-                and store_id = #{storeId}
-            </if>
-            <if test="createTime != null">
-                and create_time = #{createTime}
-            </if>
-            <if test="updateTime != null">
-                and update_time = #{updateTime}
-            </if>
-            <if test="createBy != null">
-                and create_by = #{createBy}
-            </if>
-            <if test="updateBy != null">
-                and update_by = #{updateBy}
-            </if>
-        </where>
     </select>
 
     <select id="selectByTime" resultMap="HandoverRecordMap">
@@ -139,10 +115,11 @@ limit 1
         </where>
     </select>
 
+
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into handover_record(staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by)
+        insert into handover_record(staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by,status,type)
-        values (#{staffId}, #{recordData}, #{startTime}, #{endTime}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
+        values (#{staffId}, #{recordData}, #{startTime}, #{createTime}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{status},{type})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@@ -211,5 +188,93 @@ limit 1
         delete from handover_record where id = #{id}
     </delete>
 
+<!--    // 油品订单(订单)-->
+<!--    // 油品订单(退款)-->
+<!--    // 油品订单(实收)-->
+<!--    // 油品优惠(实收)-->
+<!--    // 油品交易(实收)-->
+    <select id="oilOrderStatistics" resultType="java.util.Map">
+        select
+            sum(order_amount) oilOrder,-- 油品订单
+            sum(if(order_status='refund',discount_amount,0)) oilRefund, -- 退款
+            sum(if(order_status='paid',pay_amount,0)) oilPaid,
+            sum(if(order_status='paid',discount_amount,0)) oilDiacount
+        from oil_order
+        where store_id = #{storeId}
+          and  create_time BETWEEN #{startTime} AND #{endTime};
+    </select>
+    <select id="cardOrderStatistics" resultType="java.util.Map">
+        select
+            sum(recharge_balance) cardOrder,
+            sum(if(pay_status='refund',recharge_balance,0)) cardRefund,
+            sum(if(pay_status='paid',recharge_balance,0)) cardPaid,
+            sum(gift_balance) cardGiftOrder,
+            sum(if(pay_status='refund',gift_balance,0)) cardGiftRefund,
+            sum(if(pay_status='paid',gift_balance,0)) cardGiftPaid
+        from card_value_record
+        where store_id = #{storeId}
+          and  create_time BETWEEN #{startTime} AND #{endTime};
+    </select>
+    <select id="fuelOrderStatistics" resultType="java.util.Map">
+        select
+            sum(recharge_balance) fuelOrder,
+            sum(if(pay_status='refund',recharge_balance,0)) fuelRefund,
+            sum(if(pay_status='paid',recharge_balance,0)) fuelPaid
+        from card_fuel_record
+        where store_id = #{storeId}
+          and  create_time BETWEEN #{startTime} AND #{endTime};
+    </select>
+
+    <select id="goodsOrderStatistics" resultType="java.util.Map">
+        SELECT
+            SUM(amount) AS goodsOrder ,
+            SUM(IF(`status`='refund', pay_amount, 0)) AS goodsRefund,
+            SUM(IF(`status`='paid', pay_amount, 0)) AS goodsPaid
+        FROM mt_order
+        where store_id = #{storeId}
+          and  create_time BETWEEN #{startTime} AND #{endTime};
+    </select>
+    <select id="paymentAggregation" resultType="java.util.Map">
+        SELECT
+            'oil' AS flag,
+            pay_type AS payType,
+            SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
+            SUM(IF(order_status='refund', pay_amount, 0)) AS refundAmount
+        FROM oil_order
+        GROUP BY pay_type
+
+        UNION ALL
+
+        SELECT
+            'card' AS flag,
+            payment_type AS payType,
+            SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
+            SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
+        FROM card_value_record
+        GROUP BY payment_type
+
+        UNION ALL
+
+        SELECT
+            'fuel' AS flag,
+            payment_type AS payType,
+            SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
+            SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
+        FROM card_fuel_record
+        GROUP BY payment_type
+
+        UNION ALL
+
+        SELECT
+            'goods' AS flag,
+            pay_type AS payType,
+            SUM(IF(status='paid', pay_amount, 0)) AS paidAmount,
+            SUM(IF(status='refund', pay_amount, 0)) AS refundAmount
+        FROM mt_order
+        GROUP BY pay_type;
+    </select>
+
+
+
 </mapper>
 

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

@@ -31,7 +31,7 @@ public interface HandoverRecordService {
      * @param page      分页对象
      * @return 查询结果
      */
-    IPage<HandoverRecord> queryByPage(@Param("page") Page page, HandoverRecord handoverRecord);
+    IPage<HandoverRecord> queryByPage(@Param("page") Page page, @Param("handoverRecord") HandoverRecord handoverRecord);
 
     HandoverRecord selectByTime();
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.HandoverRecord;
 import com.fuint.business.order.mapper.HandoverRecordMapper;
+import com.fuint.business.order.mapper.OilOrderMapper;
 import com.fuint.business.order.service.HandoverRecordService;
 import com.fuint.business.store.entity.MtStore;
 import com.fuint.business.store.mapper.MtStoreMapper;
@@ -17,10 +18,13 @@ import com.fuint.common.dto.AccountInfo;
 
 import javax.annotation.Resource;
 import javax.xml.crypto.Data;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,6 +39,8 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
     private HandoverRecordMapper handoverRecordMapper;
     @Resource
     private MtStoreMapper mtStoreMapper;
+    @Resource
+    private OilOrderMapper oilOrderMapper;
 
     /**
      * 通过ID查询单条数据
@@ -55,7 +61,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
      * @return 查询结果
      */
     @Override
-    public IPage<HandoverRecord> queryByPage(@Param("page") Page page, HandoverRecord handoverRecord) {
+    public IPage<HandoverRecord> queryByPage(@Param("page") Page page,@Param("handoverRecord")  HandoverRecord handoverRecord) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         handoverRecord.setStoreId(nowAccountInfo.getStoreId());
         return this.handoverRecordMapper.queryAllByLimit(page, handoverRecord);
@@ -79,6 +85,8 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
     public HandoverRecord insert(HandoverRecord handoverRecord) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         handoverRecord.setStoreId(nowAccountInfo.getStoreId());
+        handoverRecord.setStaffId(nowAccountInfo.getStaffId());
+
         this.handoverRecordMapper.insert(handoverRecord);
         return handoverRecord;
     }
@@ -109,7 +117,7 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
     @Override
     public Map<String, Map<String,String>> handover() {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        MtStore mtStore = mtStoreMapper.queryStoreById(nowAccountInfo.getStoreId());
+//        MtStore mtStore = mtStoreMapper.queryStoreById(nowAccountInfo.getStoreId());
         // 获取当前日期
         LocalDate today = LocalDate.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -121,16 +129,17 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
 
         Map<String, Map<String,String>> handoverMap = new HashMap<>();
 
-        String startTime = midnight.format(formatter);
+        String startTime = "2023-01-01 12:12:12";
         HandoverRecord handoverRecord = selectByTime();
         if (!ObjectUtil.isEmpty(handoverRecord) && !ObjectUtil.isEmpty(handoverRecord.getEndTime())) {
-            startTime = handoverRecord.getEndTime().toString();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            startTime = sdf.format(handoverRecord.getEndTime());
         }
 
 
         // 填充 baseInfo
         Map<String, String> baseInfo = new HashMap<>();
-        baseInfo.put("storeName", mtStore.getName());
+//        baseInfo.put("storeName", mtStore.getName());
         baseInfo.put("realName", nowAccountInfo.getRealName());
         baseInfo.put("handoverType", "门店统一交班");
         baseInfo.put("startTime", startTime);
@@ -138,6 +147,11 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
         handoverMap.put("baseInfo",baseInfo);
         // 获取订单汇总
         Map<String, String> orderSummaryMap = orderSummary(startTime, formattedEndTime);
+        handoverMap.put("orderSummary",orderSummaryMap);
+        // 支付方式汇总
+        Map<String, String> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime);
+        handoverMap.put("paymentAggregation",paymentAggregationMap);
+
         // 退款汇总
         // 实收汇总
         // 油品订单
@@ -152,23 +166,68 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
         return handoverMap;
     }
     public Map<String, String> orderSummary(String startTime, String endTime) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        // 油品订单(订单)  油品订单(退款)  油品订单(实收)  油品优惠(实收)  油品交易(实收)
+        Map<String, String> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+        // 会员储值(订单) 会员储值(退款) 会员储值(实收) 储值赠送(订单) 储值赠送(退款) 储值赠送(实际)
+        Map<String, String> cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+        Map<String, String> fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
+        // 普通收款(订单) 普通收款(退款) 普通收款(实收)
+        Map<String, String> goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
 
-        // 油品订单(订单)
+        if(!ObjectUtil.isEmpty(cardOrderStatistics)) {
-        // 油品订单(退款)
+            oilOrderStatistics.putAll(cardOrderStatistics);
-        // 油品订单(实收)
+        }
-        // 油品优惠(实收)
+        if(!ObjectUtil.isEmpty(fuelOrderStatistics)) {
-        // 油品交易(实收)
+            oilOrderStatistics.putAll(fuelOrderStatistics);
+        }
+        if(!ObjectUtil.isEmpty(goodsOrderStatistics)) {
+            oilOrderStatistics.putAll(goodsOrderStatistics);
+        }
+        return oilOrderStatistics;
+    }
+
+    public Map<String, String> paymentAggregation(String startTime, String endTime) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        List<Map<String, String>> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
+        // 共有四个 转为普通map
+        Map<String, String> allAggreMap = new HashMap<>();
+        Map<String, String> allRefundMap = new HashMap<>();
+        Map<String, String> oilMap = new HashMap<>();
+        Map<String, String> goodsMap = new HashMap<>();
+        Map<String, String> cardMap = new HashMap<>();
+        if (!ObjectUtil.isEmpty(paymentAggregation)) {
+            for (Map<String, String> stringStringMap : paymentAggregation) {
+
+                // 计算退款汇总
+//                if ( allRefundMap.containsKey("refALl"+stringStringMap.get("payType"))) {
+//                    allRefundMap.put("refALl"+stringStringMap.get("payType"),
+//                            (new BigDecimal( stringStringMap.get("refundAmount")).add(new BigDecimal(stringStringMap.get("refundAmount")))).toString());
+//                }else {
+//                    allAggreMap.put("refALl"+stringStringMap.get("payType"), allRefundMap.get(stringStringMap.get("refundAmount")));
+//                }
+
+                // 总汇总
+//                if ( allAggreMap.containsKey("agreALL"+stringStringMap.get("payType"))) {
+//                    allAggreMap.put("agreALL"+stringStringMap.get("payType"),
+//                            (new BigDecimal( stringStringMap.get("paidAmount")).add(new BigDecimal(stringStringMap.get("paidAmount")))).toString());
+//                }else {
+//                    allAggreMap.put("agreALL"+stringStringMap.get("payType"), allAggreMap.get(stringStringMap.get("paidAmount")));
+//                }
 
 
-        // 会员储值(订单)
+                if ("oil".equals(stringStringMap.get("flag"))){
-        // 会员储值(退款)
+                    // 油品订单汇总
-        // 会员储值(实收)
+
-        // 储值赠送(订单)
+
-        // 储值赠送(退款)
+                }else if ("card".equals(stringStringMap.get("flag"))) {
-        // 储值赠送(实际)
+                    // 商品订单汇总
-        // 普通收款(订单)
+                }else if ("fuel".equals(stringStringMap.get("flag")) || "goods".equals(stringStringMap.get("flag")) ) {
-        // 普通收款(退款)
+                    // 会员储值汇总
-        // 普通收款(实收)
+                }
+            }
+        }
         return null;
+
     }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java

@@ -17,8 +17,7 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
 
     MtStore queryStoreByName(@Param("name") String name);
 
-    MtStore queryStoreById(@Param("id") Integer id);
+    public MtStore queryStoreById(@Param("id") Integer id);
-
 
     List<MtStore> findStoresByIds(@Param("ids") List<Integer> ids);
 

fuintCashierWeb/src/api/cashier/handover.js

@@ -7,3 +7,19 @@ export function getHandoverApi() {
     // params: query
   })
 }
+
+export function getHandoverListApi(query) {
+  return request({
+    url: '/business/handoverRecord/queryByPage',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addHandoverApi(data) {
+  return request({
+    url: '/business/handoverRecord',
+    method: 'post',
+    data: data
+  })
+}

fuintCashierWeb/src/router/index.js

@@ -56,6 +56,12 @@ export const constantRoutes = [
         name: 'Index',
         meta: { title: '系统首页', icon: 'dashboard', affix: true }
       },
+      // {
+      //   path: 'HandoverDetails',
+      //   component: () => import('@/views/cashier/NewComponents/HandoverDetails'),
+      //   name: 'HandoverDetails',
+      //   meta: { title: '交班明细', icon: 'dashboard', affix: true }
+      // },
       {
         path: 'cashier',
         component: () => import('@/views/cashier/index'),
@@ -107,6 +113,11 @@ export const constantRoutes = [
             name: 'details',
             component: () => import('@/views/details/index'),
           },
+          {
+            path: '/HandoverDetails',
+            name: 'HandoverDetails',
+            component: () => import('@/views/cashier/NewComponents/HandoverDetails?id=8'),
+          },
         ]
       }
     ]

fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue

@@ -6,11 +6,12 @@
       <div class="box-ge">
         <div class="input-box">
           <div>油站名称:</div>
-          <div>{{ handoverList.baseInfo.storeName }}</div>
+          <div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.storeName : '未知油站' }}</div>
         </div>
         <div class="input-box">
           <div>收银员:</div>
-          <div>{{ handoverList.baseInfo.realName }}</div>
+<!--          <div>{{ handoverList.baseInfo.realName }}</div>-->
+          <div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.realName : '未知姓名' }}</div>
         </div>
         <div class="input-box">
           <div>交班方式:</div>
@@ -18,11 +19,15 @@
         </div>
         <div class="input-box">
           <div>开始时间:</div>
-          <div>{{ handoverList.baseInfo.startTime }}</div>
+<!--          <div>{{ handoverList.baseInfo.startTime }}</div>-->
+          <div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '/--/' }}</div>
+
         </div>
         <div class="input-box">
           <div>结束时间:</div>
-          <div>{{ handoverList.baseInfo.endTime }}</div>
+<!--          <div>{{ handoverList.baseInfo.endTime }}</div>-->
+          <div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '/--/' }}</div>
+
         </div>
       </div>
       <div class="box-ge">
@@ -39,66 +44,93 @@
         </div>
         <div class="input-box">
           <div>油品订单(订单)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilOrder : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>油品订单(退款)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilRefund : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>油品订单(实收)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilPaid : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>油品优惠(实收)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilDiacount : '0' }}</div>
+
         </div>
 <!--        <div class="input-box">-->
 <!--          <div>抹零总额(实收)</div>-->
 <!--          <div>￥2164.55</div>-->
 <!--        </div>-->
-        <div class="input-box">
+
-          <div>油品交易(实收)</div>
-          <div>￥2164.55</div>
-        </div>
         <el-divider></el-divider>
 <!--       六个一条线 -->
         <div class="input-box">
           <div>会员储值(订单)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardOrder : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>会员储值(退款)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>会员储值(实收)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardPaid : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>储值赠送(订单)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftOrder : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>储值赠送(退款)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>储值赠送(实际)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftPaid : '0' }}</div>
+
         </div>
+
+        <el-divider></el-divider>
+        <div class="input-box">
+          <div>存油储值(订单)</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelOrder : '0' }}</div>
+
+        </div>
+        <div class="input-box">
+          <div>存油储值(退款)</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>
+
+        </div>
+        <div class="input-box">
+          <div>存油储值(实收)</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelPaid : '0' }}</div>
+
+        </div>
+
         <el-divider></el-divider>
         <div class="input-box">
           <div>普通收款(订单)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsOrder : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>普通收款(退款)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsRefund : '0' }}</div>
+
         </div>
         <div class="input-box">
           <div>普通收款(实收)</div>
-          <div>￥2164.55</div>
+          <div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsPaid : '0' }}</div>
         </div>
       </div>
       <div class="box-ge">
@@ -315,10 +347,10 @@
     <div class="app-bottom">
       <el-card >
         <div class="bottom-xz">
-          <div class="anniu">交班</div>
+          <div class="anniu" @click="shift">交班</div>
           <div class="anniu-lv">云打印</div>
           <div class="anniu-lv">本地打印</div>
-          <div ><el-link type="primary">交班记录</el-link></div>
+          <div ><el-link type="primary" @click="recording">交班记录</el-link></div>
         </div>
       </el-card>
     </div>
@@ -327,13 +359,13 @@
 </template>
 
 <script>
-    import {getHandoverApi} from "@/api/cashier/handover";
+import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
 
     export default {
         name: "Handover",
         data() {
           return {
-            handoverList : '',
+            handoverList : {},
           }
         },
       created() {
@@ -345,6 +377,45 @@
             this.handoverList = res.data;
             console.log("this.handoverList",this.handoverList)
           })
+        },
+
+        // 交班记录
+        recording() {
+          this.$router.push({
+            path:'/HandoverDetails',
+            query:{
+              id:9
+            }
+          });
+        },
+        shift() {
+          this.$confirm('交班并退出系统, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let recordData = this.handoverList
+            let handoverRecord = {
+              startTime:this.handoverList.baseInfo.endTime,
+              recordData:JSON.stringify(recordData),
+              type:0,
+              status:0,
+            }
+            addHandoverApi(handoverRecord).then(res=>{
+
+              console.log("")
+            })
+            //
+            // this.$message({
+            //   type: 'success',
+            //   message: '删除成功!'
+            // });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消交班'
+            });
+          });
         }
       }
 

fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue

@@ -1,485 +1,237 @@
-<!--发票-->
 <template>
-  <div class="app-center">
+  <div class="app-container">
-    <div class="box-center">
-      <div class="box-title">交班统计</div>
-      <div class="box-ge">
-        <div class="input-box">
-          <div>油站名称:</div>
-<!--          <div>{{ handoverList.baseInfo.storeName }}</div>-->
-        </div>
-        <div class="input-box">
-          <div>收银员:</div>
-          <div>{{ handoverList.baseInfo.realName }}</div>
-        </div>
-        <div class="input-box">
-          <div>交班方式:</div>
-          <div>门店统一交班</div>
-        </div>
-        <div class="input-box">
-          <div>开始时间:</div>
-          <div>{{ handoverList.baseInfo.startTime }}</div>
-        </div>
-        <div class="input-box">
-          <div>结束时间:</div>
-          <div>{{ handoverList.baseInfo.endTime }}</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="input-box">
-          <div>当前版本:</div>
-          <div>V1.0.1</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">订单汇总</div>
-        <div class="input-hui">
-          <div>类型</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(订单)</div>
-          <div>￥{{ handoverList.orderSummary.oilOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(退款)</div>
-          <div>￥-{{ handoverList.orderSummary.oilRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(实收)</div>
-          <div>￥{{ handoverList.orderSummary.oilPaid }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品优惠(实收)</div>
-          <div>￥{{ handoverList.orderSummary.oilDiacount }}</div>
-        </div>
-<!--        <div class="input-box">-->
-<!--          <div>抹零总额(实收)</div>-->
-<!--          <div>￥2164.55</div>-->
-<!--        </div>-->
-        <div class="input-box">
-          <div>油品交易(实收)????</div>
-          <div>￥2164.55</div>
-        </div>
-        <el-divider></el-divider>
-<!--       六个一条线 -->
-        <div class="input-box">
-          <div>会员储值(订单)</div>
-          <div>￥{{ handoverList.orderSummary.cardOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>会员储值(退款)</div>
-          <div>￥-{{ handoverList.orderSummary.cardRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>会员储值(实收)</div>
-          <div>￥{{ handoverList.orderSummary.cardPaid }}</div>
-        </div>
-        <div class="input-box">
-          <div>储值赠送(订单)</div>
-          <div>￥{{ handoverList.orderSummary.cardGiftOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>储值赠送(退款)</div>
-          <div>￥{{ handoverList.orderSummary.cardGiftRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>储值赠送(实际)</div>
-          <div>￥{{ handoverList.orderSummary.cardGiftPaid }}</div>
-        </div>
-
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>存油储值(订单)</div>
-          <div>￥{{ handoverList.orderSummary.fuelOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>存油储值(退款)</div>
-          <div>￥{{ handoverList.orderSummary.fuelRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>存油储值(实收)</div>
-          <div>￥{{ handoverList.orderSummary.fuelPaid }}</div>
-        </div>
-
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>普通收款(订单)</div>
-          <div>￥{{ handoverList.orderSummary.goodsOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>普通收款(退款)</div>
-          <div>￥-{{ handoverList.orderSummary.goodsRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>普通收款(实收)</div>
-          <div>￥{{ handoverList.orderSummary.goodsPaid }}</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">退款汇总</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>退款金额</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥2164.55</div>
-        </div>
-      </div>
-
-      <div class="box-ge">
-        <div class="boloicon">实收汇总</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>现金</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>储值卡</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>加油金</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>银行转1</div>
-          <div>￥2164.55</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥2164.55</div>
-        </div>
-      </div>
-
-      <div class="box-ge">
-        <div class="boloicon">油品订单</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>现金</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>储值卡</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>加油金</div>
-          <div>￥2164.55</div>
-        </div>
-        <div class="input-box">
-          <div>银行转1</div>
-          <div>￥2164.55</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥2164.55</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">商品订单</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>金额</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥0.00</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">普通订单</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>金额</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥0.00</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">会员储值</div>
-        <div class="input-hui">
-          <div>支付方式</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>现金</div>
-          <div>￥888.88</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥888.88</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">油号统计</div>
-        <div class="input-hui-frou">
-          <div>油号</div>
-          <div>笔数</div>
-          <div>升数</div>
-          <div style="text-align: right">金额</div>
-        </div>
-        <div class="input-box-frou">
-          <div>92#</div>
-          <div>9</div>
-          <div>1447.03</div>
-          <div style="text-align: right">￥888.88</div>
-        </div>
-        <div class="input-box-frou">
-          <div>92#</div>
-          <div>9</div>
-          <div>1447.03</div>
-          <div style="text-align: right">￥888.88</div>
-        </div>
-
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥888.88</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">优惠统计</div>
-        <div class="input-hui">
-          <div>油品</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>92#</div>
-          <div>￥888.88</div>
-        </div>
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥888.88</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">油枪统计</div>
-        <div class="input-hui-frou">
-          <div>油号</div>
-          <div>笔数</div>
-          <div>升数</div>
-          <div style="text-align: right">金额</div>
-        </div>
-        <div class="input-box-frou">
-          <div>一号枪</div>
-          <div>9</div>
-          <div>1447.03</div>
-          <div style="text-align: right">￥888.88</div>
-        </div>
-        <div class="input-box-frou">
-          <div>二号枪</div>
-          <div>9</div>
-          <div>1447.03</div>
-          <div style="text-align: right">￥888.88</div>
-        </div>
-
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥888.88</div>
-        </div>
-      </div>
-
-      <div class="box-ge">
-        <div class="boloicon">员工统计</div>
-        <div class="input-hui-frou">
-          <div>员工姓名</div>
-          <div>笔数</div>
-
-          <div style="text-align: right">金额</div>
-        </div>
-        <div class="input-box-frou">
-          <div>一号员工</div>
-          <div>9</div>
-
-          <div style="text-align: right">￥888.88</div>
-        </div>
-        <div class="input-box-frou">
-          <div>二号员工</div>
-          <div>9</div>
-
-          <div style="text-align: right">￥888.88</div>
-        </div>
-
-        <el-divider></el-divider>
-        <div class="input-box">
-          <div>合计</div>
-          <div>￥888.88</div>
-        </div>
-      </div>
-
-    </div>
-    <div style="width: 100%; height: 100px"></div>
-    <div class="app-bottom">
     <el-card >
-        <div class="bottom-xz">
+      <div slot="header" class="clearfix">
-          <div class="anniu">交班</div>
+        <i class="el-icon-back" @click="goToAbout">返回  |  </i>
-          <div class="anniu-lv">云打印</div>
+        <!--        <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
-          <div class="anniu-lv">本地打印</div>
+        <span>交班详情</span>
-          <div ><el-link type="primary">交班记录</el-link></div>
       </div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item label="交班方式" prop="giftName">
+          <el-select v-model="queryParams.status" style="width: 150px" placeholder="交班状态" clearable>
+<!--            <el-option  label="未支付" value="0">交班</el-option>-->
+<!--            <el-option  label="付款成功" value="1">未交班</el-option>-->
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交班状态">
+          <el-select v-model="queryParams.type" style="width: 150px" placeholder="交班状态" clearable>
+            <el-option  label="未支付" value="0">交班</el-option>
+            <el-option  label="付款成功" value="1">未交班</el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="交班时间">-->
+<!--          <el-date-picker-->
+<!--            v-model="dateRange"-->
+<!--            style="width: 240px"-->
+<!--            size="medium"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            type="daterange"-->
+<!--            range-separator="-"-->
+<!--            clearable-->
+<!--            start-placeholder="开始日期"-->
+<!--            end-placeholder="结束日期"-->
+<!--          ></el-date-picker>-->
+<!--        </el-form-item>-->
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
     </el-card>
-    </div>
+
+    <el-card style="margin-top: 20px"   class="box-card">
+      <el-table
+        style="width: 1500px"
+        ref="tables"
+                v-loading="loading"
+                :data="dataList"
+                :default-sort="defaultSort">
+        <el-table-column label="班次员工" align="center" prop="staffName"/>
+        <el-table-column label="开始时间" align="center" prop="startTime"/>
+        <el-table-column label="结束时间" align="center" prop="endTime" />
+        <el-table-column label="交班状态" align="center" prop="status" width="">
+          <template slot-scope="scope">
+            <el-tag  effect="plain" v-if="scope.row.type =='0'"> 已交班</el-tag>
+            <el-tag type="success" effect="plain" v-else-if="scope.row.type =='1'">未交班</el-tag>
+          </template>
+        </el-table-column>
+
+<!--        <el-table-column label="创建时间" align="center" prop="createTime" width=""/>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+            >交班数据</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+            >补打交班单</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog title="订单详情" :visible.sync="openDetail" width="600px" append-to-body :close-on-click-modal="false">
+<!--      <detail :dataForm = "recordData"></detail>-->
+      <HandoverOnly :recordData = "recordData"></HandoverOnly>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-    import {getHandoverApi} from "@/api/cashier/handover";
+import {getHandoverListApi} from "@/api/cashier/handover";
+
+import {getOrderApi,getStatisticsApi } from "@/api/cashier/integralOrder/order";
+import Detail  from '@/views/cashier/NewComponents/integralOrder/detail'
+import {getDicts} from "@/api/dict/data";
+import HandoverOnly from "@/views/cashier/NewComponents/HandoverOnly";
 
 export default {
-        name: "Handover",
+  name: "pointsCashier",
+  components: {HandoverOnly, Detail },
+
+  // dicts: ['zhzt'],
+
   data() {
     return {
-            handoverList : '',
+      openDetail:false,
+      dataForm:{},
+      dataList:[],
+      recordData:'',
+      zhztList:'',
+      queryParams: {
+
+        status: '',
+        type: '',
+
+        page:null,
+        pageSize:null
+      },
+      loading: false,
+      dateRange: [],
+      defaultSort: {prop: 'createTime', order: 'descending'},
+
+      total: 0,
+
+      statisticsForm: {
+        num:0,
+        exchangeQuantity:0,
+        integral:0,
+        amount:0
+      }
     }
   },
   created() {
-          this.getHandover();
+    this.getList();
+    this.getStatistics();
+
   },
   methods: {
-        getHandover() {
+    getList(){
-          getHandoverApi().then(res=>{
+      getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
-            this.handoverList = res.data;
+        this.dataList = res.data.records
-            console.log("this.handoverList",this.handoverList)
+        this.total = res.data.total
-          })
-        }
-      }
 
+      })
+    },
+    getStatistics() {
+      getStatisticsApi().then(res=>{
+        this.statisticsForm = res.data
+      })
+      console.log("123123123",this.statisticsForm)
+    },
+
+    // 获取支付方式
+    getZhzt() {
+      getDicts("zhzt").then(response => {
+        this.zhztList = response.data;
+      })
+    },
+
+    handleUpdate(){},
+    handleQuery(){
+      this.getList();
+
+    },
+    resetQuery(){
+      this.queryParams = {
+        giftName: '',
+        status: '',
+        mobile: '',
+        orderNumber: '',
+        page:1,
+        pageSize:10
+      },
+        this.dateRange = []
+    },
+    handleDetail(data){
+      this.openDetail = true
+      this.recordData = data.recordData;
+      // JSON.parse(this.recordData )
+      console.log("data.recordData;",this.recordData)
+
+    },
+    goToAbout() {
+      this.$router.push({
+        path:'/Handover',
+        query:{
+          id:9
+        }
+      });
+    }
+  }
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped>
-  .app-center{
+.app-container {
   width: 100%;
-
+  height: 100%;
-    box-sizing: border-box;
+  background: #f6f8f9;
+  padding-top: 0px;
+  padding: 0px
+}
+.box {
   padding: 10px;
-  }
+  height: 80px;
-  .box-center{
+  width: 150px;
-    width: 508px;
+  margin-right: 0px;
-    height: 85vh;
+  background-color: rgba(204, 204, 204, 0.3);
-    background-color: white;
+  border-radius: 8px;
-    margin: 10px auto;
-    box-sizing: border-box;
-    overflow: auto;
-  }
-  .box-ge{
-    border-bottom: 1px solid #ececec ;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .box-title{
-    font-size: 18px;
-    text-align: center;
-    align-items: center;
-    margin-top: 15px;
-  }
-  .input-box{
-    width: 100%;
   display: flex;
-    align-items: center;
+  flex-direction: column;
-    justify-content: space-between;
+  justify-content: center;
-    font-size: 14px;
+  align-items: left;
-    margin: 5px 0px;
-  }
-  .input-box-frou{
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    margin: 5px 0px;
-    div{
-      width: 25%;
   text-align: left;
 }
-  }
+.box-card{
-  .input-hui{
   width: 100%;
-    display: flex;
+  margin-bottom: 15px;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    margin: 15px 0px;
-    background: #f7f7f7;
-    box-sizing: border-box;
-    padding: 5px 0px;
 }
-  .input-hui-frou{
+.font-chinese {
-    width: 100%;
+  font-size: 15px;
-    display: flex;
+  font-family:Microsoft YaHei;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    margin: 15px 0px;
-    background: #f7f7f7;
-    box-sizing: border-box;
-    padding: 5px 0px;
-    div{
-      width: 25%;
-      text-align: left;
-    }
-  }
-  .boloicon{
   font-weight: bold;
-    margin: 10px 0px;
+  line-height:1.5
 }
-  .app-bottom{
+.font-number {
-    position: fixed;
+  font-size: 20px;
-    bottom: 0px;
+  font-family: PingFang SC,sans-serif;
-    height: 100px;
+  font-weight: bold;
-    width: 90%;
+  line-height:1.3
 }
-  .bottom-xz{
+.table-box{
   width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
 }
-  .anniu{
-    width: 100px;
-    height: 40px;
-    background: #00afff;
-    color: white;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
-    border-radius: 50px;
-    margin: 0px 15px;
-    cursor: pointer;
-  }
-  .anniu-lv{
-    background: #1ab394;
-    width: 100px;
-    height: 40px;
-
-    color: white;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
-    border-radius: 50px;
-    margin: 0px 15px;
-    cursor: pointer;
-  }
-
 </style>

fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue

@@ -2,120 +2,124 @@
 <template>
   <div class="app-center">
     <div class="box-center">
-      <div class="box-title">交班统计</div>
+      <div class="box-title">
-      <div class="box-ge">
+        交班统计
-        <div class="input-box">
+        <el-button style="float: right ;margin-left: 5px"  size="mini"  type="primary" plain>打印交班单</el-button>
-          <div>油站名称:</div>
+
-<!--          <div>{{ handoverList.baseInfo.storeName }}</div>-->
-        </div>
-        <div class="input-box">
-          <div>收银员:</div>
-          <div>{{ handoverList.baseInfo.realName }}</div>
-        </div>
-        <div class="input-box">
-          <div>交班方式:</div>
-          <div>门店统一交班</div>
-        </div>
-        <div class="input-box">
-          <div>开始时间:</div>
-          <div>{{ handoverList.baseInfo.startTime }}</div>
-        </div>
-        <div class="input-box">
-          <div>结束时间:</div>
-          <div>{{ handoverList.baseInfo.endTime }}</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="input-box">
-          <div>当前版本:</div>
-          <div>V1.0.1</div>
-        </div>
-      </div>
-      <div class="box-ge">
-        <div class="boloicon">订单汇总</div>
-        <div class="input-hui">
-          <div>类型</div>
-          <div>金额</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(订单)</div>
-          <div>￥{{ handoverList.orderSummary.oilOrder }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(退款)</div>
-          <div>￥-{{ handoverList.orderSummary.oilRefund }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品订单(实收)</div>
-          <div>￥{{ handoverList.orderSummary.oilPaid }}</div>
-        </div>
-        <div class="input-box">
-          <div>油品优惠(实收)</div>
-          <div>￥{{ handoverList.orderSummary.oilDiacount }}</div>
       </div>
+<!--      <div class="box-ge">-->
 <!--        <div class="input-box">-->
-<!--          <div>抹零总额(实收)</div>-->
+<!--          <div>油站名称:</div>-->
+<!--          <div>{{ handoverList.baseInfo.storeName }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>收银员:</div>-->
+<!--          <div>{{ handoverList.baseInfo.realName }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>交班方式:</div>-->
+<!--          <div>门店统一交班</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>开始时间:</div>-->
+<!--          <div>{{ handoverList.baseInfo.startTime }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>结束时间:</div>-->
+<!--          <div>{{ handoverList.baseInfo.endTime }}</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="box-ge">-->
+<!--        <div class="input-box">-->
+<!--          <div>当前版本:</div>-->
+<!--          <div>V1.0.1</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="box-ge">-->
+<!--        <div class="boloicon">订单汇总</div>-->
+<!--        <div class="input-hui">-->
+<!--          <div>类型</div>-->
+<!--          <div>金额</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>油品订单(订单)</div>-->
+<!--          <div>￥{{ handoverList.orderSummary.oilOrder }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>油品订单(退款)</div>-->
+<!--          <div>￥-{{ handoverList.orderSummary.oilRefund }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>油品订单(实收)</div>-->
+<!--          <div>￥{{ handoverList.orderSummary.oilPaid }}</div>-->
+<!--        </div>-->
+<!--        <div class="input-box">-->
+<!--          <div>油品优惠(实收)</div>-->
+<!--          <div>￥{{ handoverList.orderSummary.oilDiacount }}</div>-->
+<!--        </div>-->
+<!--&lt;!&ndash;        <div class="input-box">&ndash;&gt;-->
+<!--&lt;!&ndash;          <div>抹零总额(实收)</div>&ndash;&gt;-->
+<!--&lt;!&ndash;          <div>￥2164.55</div>&ndash;&gt;-->
+<!--&lt;!&ndash;        </div>&ndash;&gt;-->
+<!--        <div class="input-box">-->
+<!--          <div>油品交易(实收)????</div>-->
 <!--          <div>￥2164.55</div>-->
 <!--        </div>-->
-        <div class="input-box">
+<!--        <el-divider></el-divider>-->
-          <div>油品交易(实收)????</div>
+<!--&lt;!&ndash;       六个一条线 &ndash;&gt;-->
-          <div>￥2164.55</div>
+<!--        <div class="input-box">-->
-        </div>
+<!--          <div>会员储值(订单)</div>-->
-        <el-divider></el-divider>
+<!--          <div>￥{{ handoverList.orderSummary.cardOrder }}</div>-->
-<!--       六个一条线 -->
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>会员储值(订单)</div>
+<!--          <div>会员储值(退款)</div>-->
-          <div>￥{{ handoverList.orderSummary.cardOrder }}</div>
+<!--          <div>￥-{{ handoverList.orderSummary.cardRefund }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>会员储值(退款)</div>
+<!--          <div>会员储值(实收)</div>-->
-          <div>￥-{{ handoverList.orderSummary.cardRefund }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.cardPaid }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>会员储值(实收)</div>
+<!--          <div>储值赠送(订单)</div>-->
-          <div>￥{{ handoverList.orderSummary.cardPaid }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.cardGiftOrder }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>储值赠送(订单)</div>
+<!--          <div>储值赠送(退款)</div>-->
-          <div>￥{{ handoverList.orderSummary.cardGiftOrder }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.cardGiftRefund }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>储值赠送(退款)</div>
+<!--          <div>储值赠送(实际)</div>-->
-          <div>￥{{ handoverList.orderSummary.cardGiftRefund }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.cardGiftPaid }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
-          <div>储值赠送(实际)</div>
-          <div>￥{{ handoverList.orderSummary.cardGiftPaid }}</div>
-        </div>
 
-        <el-divider></el-divider>
+<!--        <el-divider></el-divider>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>存油储值(订单)</div>
+<!--          <div>存油储值(订单)</div>-->
-          <div>￥{{ handoverList.orderSummary.fuelOrder }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.fuelOrder }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>存油储值(退款)</div>
+<!--          <div>存油储值(退款)</div>-->
-          <div>￥{{ handoverList.orderSummary.fuelRefund }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.fuelRefund }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>存油储值(实收)</div>
+<!--          <div>存油储值(实收)</div>-->
-          <div>￥{{ handoverList.orderSummary.fuelPaid }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.fuelPaid }}</div>-->
-        </div>
+<!--        </div>-->
 
-        <el-divider></el-divider>
+<!--        <el-divider></el-divider>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>普通收款(订单)</div>
+<!--          <div>普通收款(订单)</div>-->
-          <div>￥{{ handoverList.orderSummary.goodsOrder }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.goodsOrder }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>普通收款(退款)</div>
+<!--          <div>普通收款(退款)</div>-->
-          <div>￥-{{ handoverList.orderSummary.goodsRefund }}</div>
+<!--          <div>￥-{{ handoverList.orderSummary.goodsRefund }}</div>-->
-        </div>
+<!--        </div>-->
-        <div class="input-box">
+<!--        <div class="input-box">-->
-          <div>普通收款(实收)</div>
+<!--          <div>普通收款(实收)</div>-->
-          <div>￥{{ handoverList.orderSummary.goodsPaid }}</div>
+<!--          <div>￥{{ handoverList.orderSummary.goodsPaid }}</div>-->
-        </div>
+<!--        </div>-->
-      </div>
+<!--      </div>-->
       <div class="box-ge">
         <div class="boloicon">退款汇总</div>
         <div class="input-hui">
@@ -327,16 +331,16 @@
 
     </div>
     <div style="width: 100%; height: 100px"></div>
-    <div class="app-bottom">
+<!--    <div class="app-bottom">-->
-      <el-card >
+<!--      <el-card >-->
-        <div class="bottom-xz">
+<!--        <div class="bottom-xz">-->
-          <div class="anniu" @click="shift">交班</div>
+<!--          <div class="anniu" @click="shift">交班</div>-->
-          <div class="anniu-lv">云打印</div>
+<!--          <div class="anniu-lv">云打印</div>-->
-          <div class="anniu-lv">本地打印</div>
+<!--          <div class="anniu-lv">本地打印</div>-->
-          <div ><el-link type="primary" @click="recording">交班记录</el-link></div>
+<!--          <div ><el-link type="primary" @click="recording">交班记录</el-link></div>-->
-        </div>
+<!--        </div>-->
-      </el-card>
+<!--      </el-card>-->
-    </div>
+<!--    </div>-->
 
   </div>
 </template>
@@ -345,22 +349,27 @@
 import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
 
     export default {
-        name: "Handover",
+      name: "HandoverOnly",
+      props: {
+        recordData:''
+      },
       data() {
         return {
-            handoverList : '',
+          handoverList : {},
         }
       },
       created() {
-          this.getHandover();
+        console.log("12312231",this.recordData)
+        this.handoverList = this.recordData
+          // this.getHandover();
       },
       methods: {
-        getHandover() {
+        // getHandover() {
-          getHandoverApi().then(res=>{
+        //   getHandoverApi().then(res=>{
-            this.handoverList = res.data;
+        //     this.handoverList = res.data;
-            console.log("this.handoverList",this.handoverList)
+        //     console.log("this.handoverList",this.handoverList)
-          })
+        //   })
-        },
+        // },
 
         // 交班记录
         recording() {

fuintCashierWeb/src/views/cashier/index.vue

@@ -203,7 +203,7 @@
 <!--    <Handover v-if="leftindex == 7"></Handover>-->
     <router-view/>
 
-    <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7">
+    <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7  && leftindex != 9">
       <el-empty  description="暂未开发"></el-empty>
     </div>