异常工时统计

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 生产异常信息统计单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours")
+@Slf4j
+public class FbsAbnormalWorkingHoursController {
+	@Autowired
+	private IFbsAbnormalWorkingHoursService fbsAbnormalWorkingHoursService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsAbnormalWorkingHours
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsAbnormalWorkingHours>> queryPageList(FbsAbnormalWorkingHours fbsAbnormalWorkingHours,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsAbnormalWorkingHours>> result = new Result<IPage<FbsAbnormalWorkingHours>>();
+		QueryWrapper<FbsAbnormalWorkingHours> queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHours, req.getParameterMap());
+		Page<FbsAbnormalWorkingHours> page = new Page<FbsAbnormalWorkingHours>(pageNo, pageSize);
+		IPage<FbsAbnormalWorkingHours> pageList = fbsAbnormalWorkingHoursService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsAbnormalWorkingHours
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsAbnormalWorkingHours> add(@RequestBody FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+		Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		try {
+			fbsAbnormalWorkingHoursService.save(fbsAbnormalWorkingHours);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsAbnormalWorkingHours
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsAbnormalWorkingHours> edit(@RequestBody FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
+		Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		FbsAbnormalWorkingHours fbsAbnormalWorkingHoursEntity = fbsAbnormalWorkingHoursService.getById(fbsAbnormalWorkingHours.getId());
+		if(fbsAbnormalWorkingHoursEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursService.updateById(fbsAbnormalWorkingHours);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsAbnormalWorkingHours> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		FbsAbnormalWorkingHours fbsAbnormalWorkingHours = fbsAbnormalWorkingHoursService.getById(id);
+		if(fbsAbnormalWorkingHours==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsAbnormalWorkingHoursService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsAbnormalWorkingHours> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsAbnormalWorkingHoursService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsAbnormalWorkingHours> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsAbnormalWorkingHours> result = new Result<FbsAbnormalWorkingHours>();
+		FbsAbnormalWorkingHours fbsAbnormalWorkingHours = fbsAbnormalWorkingHoursService.getById(id);
+		if(fbsAbnormalWorkingHours==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsAbnormalWorkingHours);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsAbnormalWorkingHours> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsAbnormalWorkingHours fbsAbnormalWorkingHours = JSON.parseObject(deString, FbsAbnormalWorkingHours.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsAbnormalWorkingHours, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsAbnormalWorkingHours> pageList = fbsAbnormalWorkingHoursService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "生产异常信息统计单列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsAbnormalWorkingHours.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("生产异常信息统计单列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsAbnormalWorkingHours> listFbsAbnormalWorkingHourss = ExcelImportUtil.importExcel(file.getInputStream(), FbsAbnormalWorkingHours.class, params);
+              for (FbsAbnormalWorkingHours fbsAbnormalWorkingHoursExcel : listFbsAbnormalWorkingHourss) {
+                  fbsAbnormalWorkingHoursService.save(fbsAbnormalWorkingHoursExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsAbnormalWorkingHourss.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -0,0 +1,138 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 生产异常信息统计单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_abnormal_working_hours")
+public class FbsAbnormalWorkingHours implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**异常工时统计表主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+	private String name;
+	/**u8人员id*/
+	@Excel(name = "u8人员id", width = 15)
+	private String personnelIdU8;
+	/**u8人员名称*/
+	@Excel(name = "u8人员名称", width = 15)
+	private String personnelNameU8;
+	/**日期*/
+	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date date;
+	/**加班工时*/
+	@Excel(name = "加班工时", width = 15)
+	private String overtimeHours;
+	/**加班原因*/
+	@Excel(name = "加班原因", width = 15)
+	private String overtimeReason;
+	/**培训*/
+	@Excel(name = "培训", width = 15)
+	private String train;
+	/**会议*/
+	@Excel(name = "会议", width = 15)
+	private String meeting;
+	/**5s*/
+	@Excel(name = "5s", width = 15)
+	private String fiveS;
+	/**研发*/
+	@Excel(name = "研发", width = 15)
+	private String researchAndDevelopment;
+	/**质量*/
+	@Excel(name = "质量", width = 15)
+	private String quality;
+	/**设计*/
+	@Excel(name = "设计", width = 15)
+	private String design;
+	/**返工*/
+	@Excel(name = "返工", width = 15)
+	private String rework;
+	/**物料*/
+	@Excel(name = "物料", width = 15)
+	private String materiel;
+	/**能源*/
+	@Excel(name = "能源", width = 15)
+	private String energy;
+	/**其他*/
+	@Excel(name = "其他", width = 15)
+	private String other;
+	/**设备*/
+	@Excel(name = "设备", width = 15)
+	private String equipment;
+	/**计划*/
+	@Excel(name = "计划", width = 15)
+	private String plan;
+	/**异常原因描述*/
+	@Excel(name = "异常原因描述", width = 15)
+	private String descriptionAbnormalCause;
+	/**异常类别id*/
+	@Excel(name = "异常类别id", width = 15)
+	private String exceptionCategoryId;
+	/**异常类被名称*/
+	@Excel(name = "异常类被名称", width = 15)
+	private String exceptionCategoryName;
+	/**改善措施*/
+	@Excel(name = "改善措施", width = 15)
+	private String improvementMeasures;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	private String updateBy;
+	/**最后修改时间*/
+	@Excel(name = "最后修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+	/**生产线名称*/
+	@Excel(name = "生产线名称", width = 15)
+	private String productionLineName;
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 生产异常信息统计单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+public interface FbsAbnormalWorkingHoursMapper extends BaseMapper<FbsAbnormalWorkingHours> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 生产异常信息统计单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWorkingHours> {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsAbnormalWorkingHours.service.impl;
+
+import org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours;
+import org.jeecg.modules.fbsAbnormalWorkingHours.mapper.FbsAbnormalWorkingHoursMapper;
+import org.jeecg.modules.fbsAbnormalWorkingHours.service.IFbsAbnormalWorkingHoursService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 生产异常信息统计单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@Service
+public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalWorkingHoursMapper, FbsAbnormalWorkingHours> implements IFbsAbnormalWorkingHoursService {
+
+}

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/vue/FbsAbnormalWorkingHoursList.vue

@@ -0,0 +1,324 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="姓名">
+              <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="u8人员id">
+              <a-input placeholder="请输入u8人员id" v-model="queryParam.personnelIdU8"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="u8人员名称">
+              <a-input placeholder="请输入u8人员名称" v-model="queryParam.personnelNameU8"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="日期">
+              <a-input placeholder="请输入日期" v-model="queryParam.date"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="加班工时">
+              <a-input placeholder="请输入加班工时" v-model="queryParam.overtimeHours"></a-input>
+            </a-form-item>
+          </a-col>
+        </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <fbsAbnormalWorkingHours-modal ref="modalForm" @ok="modalFormOk"></fbsAbnormalWorkingHours-modal>
+  </a-card>
+</template>
+
+<script>
+  import FbsAbnormalWorkingHoursModal from './modules/FbsAbnormalWorkingHoursModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "FbsAbnormalWorkingHoursList",
+    mixins:[JeecgListMixin],
+    components: {
+      FbsAbnormalWorkingHoursModal
+    },
+    data () {
+      return {
+        description: '生产异常信息统计单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '姓名',
+            align:"center",
+            dataIndex: 'name'
+           },
+		   {
+            title: 'u8人员id',
+            align:"center",
+            dataIndex: 'personnelIdU8'
+           },
+		   {
+            title: 'u8人员名称',
+            align:"center",
+            dataIndex: 'personnelNameU8'
+           },
+		   {
+            title: '日期',
+            align:"center",
+            dataIndex: 'date'
+           },
+		   {
+            title: '加班工时',
+            align:"center",
+            dataIndex: 'overtimeHours'
+           },
+		   {
+            title: '加班原因',
+            align:"center",
+            dataIndex: 'overtimeReason'
+           },
+		   {
+            title: '培训',
+            align:"center",
+            dataIndex: 'train'
+           },
+		   {
+            title: '会议',
+            align:"center",
+            dataIndex: 'meeting'
+           },
+		   {
+            title: '5s',
+            align:"center",
+            dataIndex: '5s'
+           },
+		   {
+            title: '质量',
+            align:"center",
+            dataIndex: 'quality'
+           },
+		   {
+            title: '设计',
+            align:"center",
+            dataIndex: 'design'
+           },
+		   {
+            title: '返工',
+            align:"center",
+            dataIndex: 'rework'
+           },
+		   {
+            title: '物料',
+            align:"center",
+            dataIndex: 'materiel'
+           },
+		   {
+            title: '能源',
+            align:"center",
+            dataIndex: 'energy'
+           },
+		   {
+            title: '其他',
+            align:"center",
+            dataIndex: 'other'
+           },
+		   {
+            title: '设备',
+            align:"center",
+            dataIndex: 'equipment'
+           },
+		   {
+            title: '计划',
+            align:"center",
+            dataIndex: 'plan'
+           },
+		   {
+            title: '异常原因描述',
+            align:"center",
+            dataIndex: 'descriptionAbnormalCause'
+           },
+		   {
+            title: '异常类别id',
+            align:"center",
+            dataIndex: 'exceptionCategoryId'
+           },
+		   {
+            title: '异常类被名称',
+            align:"center",
+            dataIndex: 'exceptionCategoryName'
+           },
+		   {
+            title: '改善措施',
+            align:"center",
+            dataIndex: 'improvementMeasures'
+           },
+		   {
+            title: '备注',
+            align:"center",
+            dataIndex: 'memo'
+           },
+		   {
+            title: '删除标记0正常1删除',
+            align:"center",
+            dataIndex: 'delFlag'
+           },
+		   {
+            title: '自定义字段1',
+            align:"center",
+            dataIndex: 'def1'
+           },
+		   {
+            title: '自定义字段2',
+            align:"center",
+            dataIndex: 'def2'
+           },
+		   {
+            title: '自定义字段3',
+            align:"center",
+            dataIndex: 'def3'
+           },
+		   {
+            title: '自定义字段4',
+            align:"center",
+            dataIndex: 'def4'
+           },
+		   {
+            title: '自定义字段5',
+            align:"center",
+            dataIndex: 'def5'
+           },
+		   {
+            title: '排序',
+            align:"center",
+            dataIndex: 'sort'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/list",
+          delete: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/delete",
+          deleteBatch: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/deleteBatch",
+          exportXlsUrl: "fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/exportXls",
+          importExcelUrl: "fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/vue/modules/FbsAbnormalWorkingHoursModal.vue

@@ -0,0 +1,295 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="姓名">
+          <a-input placeholder="请输入姓名" v-decorator="['name', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="u8人员id">
+          <a-input placeholder="请输入u8人员id" v-decorator="['personnelIdU8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="u8人员名称">
+          <a-input placeholder="请输入u8人员名称" v-decorator="['personnelNameU8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="日期">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'date', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="加班工时">
+          <a-input placeholder="请输入加班工时" v-decorator="['overtimeHours', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="加班原因">
+          <a-input placeholder="请输入加班原因" v-decorator="['overtimeReason', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="培训">
+          <a-input placeholder="请输入培训" v-decorator="['train', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="会议">
+          <a-input placeholder="请输入会议" v-decorator="['meeting', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="5s">
+          <a-input placeholder="请输入5s" v-decorator="['5s', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="质量">
+          <a-input placeholder="请输入质量" v-decorator="['quality', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设计">
+          <a-input placeholder="请输入设计" v-decorator="['design', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="返工">
+          <a-input placeholder="请输入返工" v-decorator="['rework', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="物料">
+          <a-input placeholder="请输入物料" v-decorator="['materiel', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="能源">
+          <a-input placeholder="请输入能源" v-decorator="['energy', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="其他">
+          <a-input placeholder="请输入其他" v-decorator="['other', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设备">
+          <a-input placeholder="请输入设备" v-decorator="['equipment', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="计划">
+          <a-input placeholder="请输入计划" v-decorator="['plan', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常原因描述">
+          <a-input placeholder="请输入异常原因描述" v-decorator="['descriptionAbnormalCause', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常类别id">
+          <a-input placeholder="请输入异常类别id" v-decorator="['exceptionCategoryId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常类被名称">
+          <a-input placeholder="请输入异常类被名称" v-decorator="['exceptionCategoryName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="改善措施">
+          <a-input placeholder="请输入改善措施" v-decorator="['improvementMeasures', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-input placeholder="请输入备注" v-decorator="['memo', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="删除标记0正常1删除">
+          <a-input placeholder="请输入删除标记0正常1删除" v-decorator="['delFlag', validatorRules.delFlag ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段1">
+          <a-input placeholder="请输入自定义字段1" v-decorator="['def1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段2">
+          <a-input placeholder="请输入自定义字段2" v-decorator="['def2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段3">
+          <a-input placeholder="请输入自定义字段3" v-decorator="['def3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段4">
+          <a-input placeholder="请输入自定义字段4" v-decorator="['def4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段5">
+          <a-input placeholder="请输入自定义字段5" v-decorator="['def5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number v-decorator="[ 'sort', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsAbnormalWorkingHoursModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        delFlag:{rules: [{ required: true, message: '请输入删除标记0正常1删除!' }]},
+        },
+        url: {
+          add: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/add",
+          edit: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name','personnelIdU8','personnelNameU8','overtimeHours','overtimeReason','train','meeting','5s','quality','design','rework','materiel','energy','other','equipment','plan','descriptionAbnormalCause','exceptionCategoryId','exceptionCategoryName','improvementMeasures','memo','delFlag','def1','def2','def3','def4','def5','sort'))
+		  //时间格式化
+          this.form.setFieldsValue({date:this.model.date?moment(this.model.date):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.date = formData.date?formData.date.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/vue/modules/FbsAbnormalWorkingHoursModal__Style#Drawer.vue

@@ -0,0 +1,302 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="姓名">
+          <a-input placeholder="请输入姓名" v-decorator="['name', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="u8人员id">
+          <a-input placeholder="请输入u8人员id" v-decorator="['personnelIdU8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="u8人员名称">
+          <a-input placeholder="请输入u8人员名称" v-decorator="['personnelNameU8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="日期">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'date', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="加班工时">
+          <a-input placeholder="请输入加班工时" v-decorator="['overtimeHours', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="加班原因">
+          <a-input placeholder="请输入加班原因" v-decorator="['overtimeReason', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="培训">
+          <a-input placeholder="请输入培训" v-decorator="['train', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="会议">
+          <a-input placeholder="请输入会议" v-decorator="['meeting', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="5s">
+          <a-input placeholder="请输入5s" v-decorator="['5s', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="质量">
+          <a-input placeholder="请输入质量" v-decorator="['quality', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设计">
+          <a-input placeholder="请输入设计" v-decorator="['design', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="返工">
+          <a-input placeholder="请输入返工" v-decorator="['rework', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="物料">
+          <a-input placeholder="请输入物料" v-decorator="['materiel', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="能源">
+          <a-input placeholder="请输入能源" v-decorator="['energy', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="其他">
+          <a-input placeholder="请输入其他" v-decorator="['other', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设备">
+          <a-input placeholder="请输入设备" v-decorator="['equipment', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="计划">
+          <a-input placeholder="请输入计划" v-decorator="['plan', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常原因描述">
+          <a-input placeholder="请输入异常原因描述" v-decorator="['descriptionAbnormalCause', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常类别id">
+          <a-input placeholder="请输入异常类别id" v-decorator="['exceptionCategoryId', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="异常类被名称">
+          <a-input placeholder="请输入异常类被名称" v-decorator="['exceptionCategoryName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="改善措施">
+          <a-input placeholder="请输入改善措施" v-decorator="['improvementMeasures', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-input placeholder="请输入备注" v-decorator="['memo', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="删除标记0正常1删除">
+          <a-input placeholder="请输入删除标记0正常1删除" v-decorator="['delFlag', validatorRules.delFlag ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段1">
+          <a-input placeholder="请输入自定义字段1" v-decorator="['def1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段2">
+          <a-input placeholder="请输入自定义字段2" v-decorator="['def2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段3">
+          <a-input placeholder="请输入自定义字段3" v-decorator="['def3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段4">
+          <a-input placeholder="请输入自定义字段4" v-decorator="['def4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段5">
+          <a-input placeholder="请输入自定义字段5" v-decorator="['def5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number v-decorator="[ 'sort', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsAbnormalWorkingHoursModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        delFlag:{rules: [{ required: true, message: '请输入删除标记0正常1删除!' }]},
+        },
+        url: {
+          add: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/add",
+          edit: "/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name','personnelIdU8','personnelNameU8','overtimeHours','overtimeReason','train','meeting','5s','quality','design','rework','materiel','energy','other','equipment','plan','descriptionAbnormalCause','exceptionCategoryId','exceptionCategoryName','improvementMeasures','memo','delFlag','def1','def2','def3','def4','def5','sort'))
+		  //时间格式化
+          this.form.setFieldsValue({date:this.model.date?moment(this.model.date):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.date = formData.date?formData.date.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -29,10 +29,10 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private String name;
 	/**U8获取*/
 	@Excel(name = "U8获取", width = 15)
-	private String idU8;
+	private String personnelIdU8;
 	/**U8获取*/
 	@Excel(name = "U8获取", width = 15)
-	private String nameU8;
+	private String personnelNameU8;
 	/**日期*/
 	@Excel(name = "日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -103,4 +103,8 @@ public class FbsWorkshopDispatchList implements Serializable {
 	/**排序*/
 	@Excel(name = "排序", width = 15)
 	private Integer sort;
+
+	/**生产线名称*/
+	@Excel(name = "生产线名称", width = 15)
+	private String productionLineName;
 }