更新

fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue

@@ -311,7 +311,7 @@
       :visible.sync="showDialogVisible"
       width="60%">
       <el-form :model="ruleForm1" :rules="rules" ref="ruleForm1" label-width="120px" class="demo-ruleForm">
-        <div style="display: flex;width: 100%;margin: 20px 0;">
+        <div style="display: flex;width: 100%; margin-bottom: 20px">
           <div style="width: 50%">
             <el-form-item label="分时优惠名称" prop="activeId">
               <el-select v-model="ruleForm1.activeId" placeholder="请选择优惠名称">
@@ -400,7 +400,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="1">
-                <div style="margin-left: 5px">至</div>
+                <div style="margin:0px, 6px">至</div>
               </el-col>
               <el-col :span="11">
                 <el-form-item prop="activeEndTime">
@@ -413,13 +413,13 @@
             <el-form-item label="适用时间段" prop="timeType">
               <div>
                 <div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
-                     :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
+                     :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)" style="margin-bottom: 20px">
                   <img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
                   <img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
                   {{ item }}
                   <el-select v-model="weekDay" v-if="item=='每周'" placeholder="请选择每月固定日期" multiple
                              :disabled="tindex3!=0"
-                             style="margin-left: 20px;margin-bottom: 20px">
+                             style="margin-left: 20px;">
                     <el-option
                       v-for="(item,index) in weekList"
                       :key="index"

fuintAdmin/src/views/handover/HandoverDetails.vue

@@ -22,6 +22,7 @@
               :key="option.id"
               :label="option.realName"
               :value="option.id"
+              :disabled="queryParams.status === '统一交班'"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -29,7 +30,7 @@
 
 
         <el-form-item class="flex-container" style="float: right">
-          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" :disabled="!queryParams.staffId" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -436,6 +437,9 @@ export default {
     this.getStatus();
     this.getStaffList();
   },
+  mounted() {
+    this.queryParams.status = '统一交班';
+  },
   methods: {
     getHandover() {
       getHandoverApi2(this.queryParams).then(res=>{
@@ -546,6 +550,7 @@ export default {
         this.dateRange = []
       this.beginTime = "";
       this.endTime = ""
+      this.queryParams.status = '统一交班';
       this.getList();
     },
     printLocally(data) {

fuintAdmin/src/views/member/analysis.vue

@@ -7,7 +7,7 @@
         {{ item.name }}
       </div>
     </div>
-    <div v-show="tabindex == 0" >
+    <div v-show="tabindex == 0"  style="margin-top: -6px">
       <div class="top-box">
         <div class="crad-box" id="d1">
           <div class="number_">会员人数</div>
@@ -122,7 +122,7 @@
         </div>
       </div>
     </div>
-    <div v-show="tabindex == 1" >
+    <div v-show="tabindex == 1" style="margin-top: -6px">
       <div class="bottom-box">
         <div class="b-box-r">
           <div class="d-s">
@@ -275,6 +275,8 @@ export default {
       })
       getUserSex().then(res => {
         this.sexSpread = res.data
+        this.sexSpread.maleProportion = Math.round(this.sexSpread.maleProportion)
+        this.sexSpread.femaleProportion = Math.round(this.sexSpread.femaleProportion)
       })
       await getStoredValue().then(res => {
         this.storedValue = res.data;
@@ -1035,6 +1037,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   background: #fff;
+  width:49.5%;
 
 }
 .hx{

fuintAdmin/src/views/setting/print/index.vue

@@ -79,7 +79,7 @@
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="deviceInfo"  label-width="80px">
-        <el-form :model="deviceInfo" ref="deviceForm" label-width="120px">
+        <el-form :model="deviceInfo" :rules="rules" ref="deviceForm" label-width="120px">
           <el-form-item label="设备名称" prop="deviceName"  >
             <el-input v-model="deviceInfo.deviceName" style="width: 300px"></el-input>
           </el-form-item>
@@ -184,6 +184,26 @@ export default {
         staffName: '',   // 设备员工名字
         acquiesce: false      // token
       },
+      rules: {
+        deviceName: [
+          { required: true, message: '设备名称不能为空', trigger: 'blur' }
+        ],
+        deviceSi: [
+            { required: true, message: '设备品牌不能为空', trigger: 'blur' }
+        ],
+        deviceAb: [
+          { required: true, message: '设备功能不能为空', trigger: 'change' }
+        ],
+        machineCode: [
+          { required: true, message: '设备终端号不能为空', trigger: 'blur' }
+        ],
+        msign: [
+          { required: true, message: '设备密钥不能为空', trigger: 'blur' }
+        ],
+        staffId: [
+          { required: false, message: '请选择员工', trigger: 'change' }
+        ]
+      },
       // 是否显示弹出层
       open: false,
       title:"",

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java

@@ -32,7 +32,12 @@ import com.fuint.business.marketingActivity.cardValue.vo.CardValueVOs;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.service.LJUserGradeService;
+import com.fuint.common.service.StaffService;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.repository.mapper.MtStaffMapper;
+import com.fuint.repository.mapper.NewMtStaffMapper;
+import com.fuint.repository.model.MtStaff;
+import com.fuint.repository.model.NewMtStaff;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +79,9 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
 
     @Resource
     private ILJStoreService ljStoreService;
+
+    @Autowired
+    private NewMtStaffMapper mtStaffMapper;
     /**
      * 分页查询所有数据
      * @param page
@@ -177,8 +185,14 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
                 cardValueVOs.add(cardValueVO);
             }
         }
+        //查询状态为启用的本店员工
+        LambdaQueryWrapper<NewMtStaff> staffQueryWrapper = new LambdaQueryWrapper<>();
+        staffQueryWrapper.eq(NewMtStaff::getStatus, "qy");
+        staffQueryWrapper.eq(NewMtStaff::getStoreId, cardValue.getStoreId());
+        List<NewMtStaff> newMtStaffs = mtStaffMapper.selectList(staffQueryWrapper);
         //page1.setRecords(cardValueVOs);
         cardValueUniVo.setCardValueList(cardValueVOs);
+        cardValueUniVo.setStaffList(newMtStaffs);
         cardValueUniVo.setStoreName(ljStoreService.queryStoreById(cardValue.getStoreId()).getName());
         return cardValueUniVo;
     }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueUniVo.java

@@ -1,5 +1,7 @@
 package com.fuint.business.marketingActivity.cardValue.vo;
 
+import com.fuint.repository.model.MtStaff;
+import com.fuint.repository.model.NewMtStaff;
 import lombok.Data;
 
 import java.util.List;
@@ -10,4 +12,6 @@ public class CardValueUniVo {
     private String storeName;
     //卡券列表
     private List<CardValueVOs> cardValueList;
+    //可以选择的员工
+    private List<NewMtStaff> staffList;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java

@@ -1,6 +1,8 @@
 package com.fuint.business.printer.entity;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuint.repository.model.base.BaseEntity;
 import lombok.Data;
 
@@ -61,8 +63,9 @@ public class PrintDeviceInfo extends BaseEntity {
      * 店铺id
      */
     private Integer storeId;
-
+    @TableField(exist = false)
     private Integer deptId;
+    @TableField(exist = false)
     private String deptName;
 
     private String deviceSi; // 设备品牌

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java

@@ -1,5 +1,6 @@
 package com.fuint.business.printer.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.printer.entity.PrintDeviceInfo;
@@ -13,7 +14,7 @@ import java.util.List;
  * @author wangh
  * @since 2024-04-29 17:31:02
  */
-public interface PrintDeviceInfoMapper {
+public interface PrintDeviceInfoMapper extends BaseMapper<PrintDeviceInfo> {
 
     /**
      * 通过ID查询单条数据

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java

@@ -1,17 +1,18 @@
 package com.fuint.business.printer.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.printer.entity.PrintDeviceInfo;
 import com.fuint.business.printer.mapper.PrintDeviceInfoMapper;
 import com.fuint.business.printer.service.PrintDeviceInfoService;
+import com.fuint.framework.exception.BusinessCheckException;
 import org.springframework.stereotype.Service;
 import com.fuint.common.util.TokenUtil;
 import io.lettuce.core.dynamic.annotation.Param;
 import com.fuint.common.dto.AccountInfo;
 
 
-
 import javax.annotation.Resource;
 
 /**
@@ -63,6 +64,12 @@ public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService {
         if (printDeviceInfo.getAcquiesce()) {
             printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId());
         }
+        //查询设备终端号是否存在
+        PrintDeviceInfo printDeviceInfo1 = printDeviceInfoMapper.selectOne(new LambdaQueryWrapper<PrintDeviceInfo>()
+                .eq(PrintDeviceInfo::getMachineCode, printDeviceInfo.getMachineCode()));
+        if (printDeviceInfo1 != null) {
+            throw new RuntimeException("设备终端号已存在");
+        }
         this.printDeviceInfoMapper.insert(printDeviceInfo);
         return printDeviceInfo;
     }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/NewMtStaffMapper.java

@@ -0,0 +1,19 @@
+package com.fuint.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.repository.model.MtStaff;
+import com.fuint.repository.model.NewMtStaff;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * 店铺员工表 Mapper 接口
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Mapper
+public interface NewMtStaffMapper extends BaseMapper<NewMtStaff> {
+}

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/NewMtStaff.java

@@ -0,0 +1,65 @@
+package com.fuint.repository.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 店铺员工表
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+@TableName("mt_staff")
+@ApiModel(value = "MtStaff对象", description = "店铺员工表")
+public class NewMtStaff implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;                // 自增ID
+    private Integer storeId;           // 店铺ID
+    private Integer userId;            // 用户ID
+    private String mobile;             // 手机号码
+    private String realName;           // 真实姓名
+    private Date createTime;           // 创建时间
+    private Date updateTime;           // 更新时间
+    private String description;        // 备注
+    private String createBy;           // 创建用户
+    private String updateBy;           // 修改用户
+    private String isRefuel;           // 一键加油，显示、隐藏
+    private String handoverMode;       // 交班模式
+    private String handoverPrem;       // 交班权限
+    private String handoverOut;        // 交班退出
+    private String record;             // 交班记录
+    private String merchantStatus;     // 交班商户号，启用；禁用
+    private String screen;             // 员工筛选，启用；禁用
+    private String posPrem;            // POS权限，存放json数据
+    private String appletPrem;         // 小程序权限，存放json数据
+    private String notice;             // 收款通知
+    private String oilGunId;           // 模板油枪号
+    private String timeFrame;          // 时间范围
+    private String refund;             // 退款权限
+    private String transaction;        // 交易统计
+    private String auditPrem;          // 审核权限
+    private String writeOff;           // 核销权限
+    private String specialPrem;        // 特殊权限
+    private String official;           // 公众号状态
+    private String status;             // 员工状态
+    private String pos;                // POS加油员状态
+    private String roleId;             // 角色ID
+    private String refundPassword;     // 退款密码
+    private String writeOffCode;       // 核销码
+    private String staffCode;          // 员工码
+    private String ifDelete;           // 是否删除
+
+}