From 9f2316cac72dd04d7dc485e3b63200a735839034 Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 29 May 2026 17:54:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=A0=87=E7=AD=BE=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecordBaseketChangeRfidController.java | 128 +++++++++++ .../domain/RecordBaseketChangeRfid.java | 109 +++++++++ .../mapper/RecordBaseketChangeRfidMapper.java | 61 +++++ .../IRecordBaseketChangeRfidService.java | 61 +++++ .../RecordBaseketChangeRfidServiceImpl.java | 96 ++++++++ .../manager/RecordBaseketChangeRfidMapper.xml | 84 +++++++ .../main/resources/sql/change_rfidMenu.sql | 22 ++ .../templates/manager/change_rfid/add.html | 59 +++++ .../manager/change_rfid/change_rfid.html | 127 +++++++++++ .../templates/manager/change_rfid/edit.html | 60 +++++ .../manager/delivery_task/delivery_task.html | 214 +++++++++--------- 11 files changed, 915 insertions(+), 106 deletions(-) create mode 100644 ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBaseketChangeRfidController.java create mode 100644 ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java create mode 100644 ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBaseketChangeRfidMapper.java create mode 100644 ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBaseketChangeRfidService.java create mode 100644 ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBaseketChangeRfidServiceImpl.java create mode 100644 ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml create mode 100644 ruoyi-manager/src/main/resources/sql/change_rfidMenu.sql create mode 100644 ruoyi-manager/src/main/resources/templates/manager/change_rfid/add.html create mode 100644 ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html create mode 100644 ruoyi-manager/src/main/resources/templates/manager/change_rfid/edit.html diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBaseketChangeRfidController.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBaseketChangeRfidController.java new file mode 100644 index 0000000..59b2a41 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/controller/RecordBaseketChangeRfidController.java @@ -0,0 +1,128 @@ +package com.ruoyi.manager.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manager.domain.RecordBaseketChangeRfid; +import com.ruoyi.manager.service.IRecordBaseketChangeRfidService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 资产RFID更换记录Controller + * + * @author ruoyi + * @date 2026-05-29 + */ +@Controller +@RequestMapping("/manager/change_rfid") +public class RecordBaseketChangeRfidController extends BaseController +{ + private String prefix = "manager/change_rfid"; + + @Autowired + private IRecordBaseketChangeRfidService recordBaseketChangeRfidService; + + @RequiresPermissions("manager:change_rfid:view") + @GetMapping() + public String change_rfid() + { + return prefix + "/change_rfid"; + } + + /** + * 查询资产RFID更换记录列表 + */ + @RequiresPermissions("manager:change_rfid:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + startPage(); + List list = recordBaseketChangeRfidService.selectRecordBaseketChangeRfidList(recordBaseketChangeRfid); + return getDataTable(list); + } + + /** + * 导出资产RFID更换记录列表 + */ + @RequiresPermissions("manager:change_rfid:export") + @Log(title = "资产RFID更换记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + List list = recordBaseketChangeRfidService.selectRecordBaseketChangeRfidList(recordBaseketChangeRfid); + ExcelUtil util = new ExcelUtil(RecordBaseketChangeRfid.class); + return util.exportExcel(list, "资产RFID更换记录数据"); + } + + /** + * 新增资产RFID更换记录 + */ + @RequiresPermissions("manager:change_rfid:add") + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存资产RFID更换记录 + */ + @RequiresPermissions("manager:change_rfid:add") + @Log(title = "资产RFID更换记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + return toAjax(recordBaseketChangeRfidService.insertRecordBaseketChangeRfid(recordBaseketChangeRfid)); + } + + /** + * 修改资产RFID更换记录 + */ + @RequiresPermissions("manager:change_rfid:edit") + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + { + RecordBaseketChangeRfid recordBaseketChangeRfid = recordBaseketChangeRfidService.selectRecordBaseketChangeRfidByObjid(objid); + mmap.put("recordBaseketChangeRfid", recordBaseketChangeRfid); + return prefix + "/edit"; + } + + /** + * 修改保存资产RFID更换记录 + */ + @RequiresPermissions("manager:change_rfid:edit") + @Log(title = "资产RFID更换记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + return toAjax(recordBaseketChangeRfidService.updateRecordBaseketChangeRfid(recordBaseketChangeRfid)); + } + + /** + * 删除资产RFID更换记录 + */ + @RequiresPermissions("manager:change_rfid:remove") + @Log(title = "资产RFID更换记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(recordBaseketChangeRfidService.deleteRecordBaseketChangeRfidByObjids(ids)); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java new file mode 100644 index 0000000..af49dba --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/domain/RecordBaseketChangeRfid.java @@ -0,0 +1,109 @@ +package com.ruoyi.manager.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 资产RFID更换记录对象 record_baseket_change_rfid + * + * @author ruoyi + * @date 2026-05-29 + */ +public class RecordBaseketChangeRfid extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + private Long objid; + + /** 资产ID */ + @Excel(name = "资产ID") + private Long basketId; + + /** 货筐RFID(旧) */ + @Excel(name = "货筐RFID(旧)") + private String basketEpc; + + /** 货筐RFID(新) */ + @Excel(name = "货筐RFID(新)") + private String basketEpc2; + + /** 更换情况 */ + @Excel(name = "更换情况") + private String changeType; + // @Excel(name = "gpsW") + private String gpsLocation; + + public String getGpsLocation() { + return gpsLocation; + } + + public void setGpsLocation(String gpsLocation) { + this.gpsLocation = gpsLocation; + } + + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + + public void setBasketId(Long basketId) + { + this.basketId = basketId; + } + + public Long getBasketId() + { + return basketId; + } + + public void setBasketEpc(String basketEpc) + { + this.basketEpc = basketEpc; + } + + public String getBasketEpc() + { + return basketEpc; + } + + public void setBasketEpc2(String basketEpc2) + { + this.basketEpc2 = basketEpc2; + } + + public String getBasketEpc2() + { + return basketEpc2; + } + + public void setChangeType(String changeType) + { + this.changeType = changeType; + } + + public String getChangeType() + { + return changeType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("basketId", getBasketId()) + .append("basketEpc", getBasketEpc()) + .append("basketEpc2", getBasketEpc2()) + .append("changeType", getChangeType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBaseketChangeRfidMapper.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBaseketChangeRfidMapper.java new file mode 100644 index 0000000..dd85cad --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/mapper/RecordBaseketChangeRfidMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.mapper; + +import java.util.List; +import com.ruoyi.manager.domain.RecordBaseketChangeRfid; + +/** + * 资产RFID更换记录Mapper接口 + * + * @author ruoyi + * @date 2026-05-29 + */ +public interface RecordBaseketChangeRfidMapper +{ + /** + * 查询资产RFID更换记录 + * + * @param objid 资产RFID更换记录主键 + * @return 资产RFID更换记录 + */ + public RecordBaseketChangeRfid selectRecordBaseketChangeRfidByObjid(Long objid); + + /** + * 查询资产RFID更换记录列表 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 资产RFID更换记录集合 + */ + public List selectRecordBaseketChangeRfidList(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 新增资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + public int insertRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 修改资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + public int updateRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 删除资产RFID更换记录 + * + * @param objid 资产RFID更换记录主键 + * @return 结果 + */ + public int deleteRecordBaseketChangeRfidByObjid(Long objid); + + /** + * 批量删除资产RFID更换记录 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordBaseketChangeRfidByObjids(String[] objids); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBaseketChangeRfidService.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBaseketChangeRfidService.java new file mode 100644 index 0000000..d814d70 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/IRecordBaseketChangeRfidService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manager.service; + +import java.util.List; +import com.ruoyi.manager.domain.RecordBaseketChangeRfid; + +/** + * 资产RFID更换记录Service接口 + * + * @author ruoyi + * @date 2026-05-29 + */ +public interface IRecordBaseketChangeRfidService +{ + /** + * 查询资产RFID更换记录 + * + * @param objid 资产RFID更换记录主键 + * @return 资产RFID更换记录 + */ + public RecordBaseketChangeRfid selectRecordBaseketChangeRfidByObjid(Long objid); + + /** + * 查询资产RFID更换记录列表 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 资产RFID更换记录集合 + */ + public List selectRecordBaseketChangeRfidList(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 新增资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + public int insertRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 修改资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + public int updateRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid); + + /** + * 批量删除资产RFID更换记录 + * + * @param objids 需要删除的资产RFID更换记录主键集合 + * @return 结果 + */ + public int deleteRecordBaseketChangeRfidByObjids(String objids); + + /** + * 删除资产RFID更换记录信息 + * + * @param objid 资产RFID更换记录主键 + * @return 结果 + */ + public int deleteRecordBaseketChangeRfidByObjid(Long objid); +} diff --git a/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBaseketChangeRfidServiceImpl.java b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBaseketChangeRfidServiceImpl.java new file mode 100644 index 0000000..e6502c6 --- /dev/null +++ b/ruoyi-manager/src/main/java/com/ruoyi/manager/service/impl/RecordBaseketChangeRfidServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.manager.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manager.mapper.RecordBaseketChangeRfidMapper; +import com.ruoyi.manager.domain.RecordBaseketChangeRfid; +import com.ruoyi.manager.service.IRecordBaseketChangeRfidService; +import com.ruoyi.common.core.text.Convert; + +/** + * 资产RFID更换记录Service业务层处理 + * + * @author ruoyi + * @date 2026-05-29 + */ +@Service +public class RecordBaseketChangeRfidServiceImpl implements IRecordBaseketChangeRfidService +{ + @Autowired + private RecordBaseketChangeRfidMapper recordBaseketChangeRfidMapper; + + /** + * 查询资产RFID更换记录 + * + * @param objid 资产RFID更换记录主键 + * @return 资产RFID更换记录 + */ + @Override + public RecordBaseketChangeRfid selectRecordBaseketChangeRfidByObjid(Long objid) + { + return recordBaseketChangeRfidMapper.selectRecordBaseketChangeRfidByObjid(objid); + } + + /** + * 查询资产RFID更换记录列表 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 资产RFID更换记录 + */ + @Override + public List selectRecordBaseketChangeRfidList(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + return recordBaseketChangeRfidMapper.selectRecordBaseketChangeRfidList(recordBaseketChangeRfid); + } + + /** + * 新增资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + @Override + public int insertRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + recordBaseketChangeRfid.setCreateTime(DateUtils.getNowDate()); + return recordBaseketChangeRfidMapper.insertRecordBaseketChangeRfid(recordBaseketChangeRfid); + } + + /** + * 修改资产RFID更换记录 + * + * @param recordBaseketChangeRfid 资产RFID更换记录 + * @return 结果 + */ + @Override + public int updateRecordBaseketChangeRfid(RecordBaseketChangeRfid recordBaseketChangeRfid) + { + return recordBaseketChangeRfidMapper.updateRecordBaseketChangeRfid(recordBaseketChangeRfid); + } + + /** + * 批量删除资产RFID更换记录 + * + * @param objids 需要删除的资产RFID更换记录主键 + * @return 结果 + */ + @Override + public int deleteRecordBaseketChangeRfidByObjids(String objids) + { + return recordBaseketChangeRfidMapper.deleteRecordBaseketChangeRfidByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除资产RFID更换记录信息 + * + * @param objid 资产RFID更换记录主键 + * @return 结果 + */ + @Override + public int deleteRecordBaseketChangeRfidByObjid(Long objid) + { + return recordBaseketChangeRfidMapper.deleteRecordBaseketChangeRfidByObjid(objid); + } +} diff --git a/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml b/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml new file mode 100644 index 0000000..8a20df0 --- /dev/null +++ b/ruoyi-manager/src/main/resources/mapper/manager/RecordBaseketChangeRfidMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + select objid, basket_id, basket_epc, basket_epc2, change_type, create_by, create_time,gps_location from record_baseket_change_rfid + + + + + + + + insert into record_baseket_change_rfid + + basket_id, + basket_epc, + basket_epc2, + change_type, + create_by, + create_time, + gps_location, + + + #{basketId}, + #{basketEpc}, + #{basketEpc2}, + #{changeType}, + #{createBy}, + #{createTime}, + #{gpsLocation}, + + + + + update record_baseket_change_rfid + + basket_id = #{basketId}, + basket_epc = #{basketEpc}, + basket_epc2 = #{basketEpc2}, + change_type = #{changeType}, + create_by = #{createBy}, + create_time = #{createTime}, + gps_location = #{gpsLocation}, + + where objid = #{objid} + + + + delete from record_baseket_change_rfid where objid = #{objid} + + + + delete from record_baseket_change_rfid where objid in + + #{objid} + + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/sql/change_rfidMenu.sql b/ruoyi-manager/src/main/resources/sql/change_rfidMenu.sql new file mode 100644 index 0000000..c5c1e05 --- /dev/null +++ b/ruoyi-manager/src/main/resources/sql/change_rfidMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录', '2026', '1', '/manager/change_rfid', 'C', '0', 'manager:change_rfid:view', '#', 'admin', sysdate(), '', null, '资产RFID更换记录菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录查询', @parentId, '1', '#', 'F', '0', 'manager:change_rfid:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录新增', @parentId, '2', '#', 'F', '0', 'manager:change_rfid:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录修改', @parentId, '3', '#', 'F', '0', 'manager:change_rfid:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录删除', @parentId, '4', '#', 'F', '0', 'manager:change_rfid:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('资产RFID更换记录导出', @parentId, '5', '#', 'F', '0', 'manager:change_rfid:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manager/src/main/resources/templates/manager/change_rfid/add.html b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/add.html new file mode 100644 index 0000000..c909e4f --- /dev/null +++ b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/add.html @@ -0,0 +1,59 @@ + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html new file mode 100644 index 0000000..3944e09 --- /dev/null +++ b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/change_rfid.html @@ -0,0 +1,127 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/manager/change_rfid/edit.html b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/edit.html new file mode 100644 index 0000000..97e895f --- /dev/null +++ b/ruoyi-manager/src/main/resources/templates/manager/change_rfid/edit.html @@ -0,0 +1,60 @@ + + + + + + +
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html index fe53bdb..fb645f8 100644 --- a/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html +++ b/ruoyi-manager/src/main/resources/templates/manager/delivery_task/delivery_task.html @@ -16,7 +16,8 @@
  • - -
  • - - \n' + - '
    \n' + - ' \n' + - '
    \n' + - '
    \n' + - '
    ' + - '
    \n' + - '
    \n' + - '
    ' + - '
    \n' + - '
    \n' + - '
    \n' + - ' ').find('table'); - - // 第一个选项卡始终显示照片 - $(childTable).bootstrapTable({ - url: ctx + "manager/delivery_task_img/list", + + initTaskTable = function (index, row, $detail) { + // 为每个展开行生成唯一的标识符（使用 deliveryTaskId 确保全局唯一） + var uniqueId = 'task-detail-tab-' + (row.deliveryTaskId || row.objid || index) + '-'; + var taskType = row.taskType; + var basketTypeDatas = [[${@dict.getType('basket_type')}]]; + var [childTable, childTable1] = $detail.html('
    \n' + + '
    \n' + + ' \n' + + '
    \n' + + '
    \n' + + '
    ' + + '
    \n' + + '
    \n' + + '
    ' + + '
    \n' + + '
    \n' + + '
    \n' + + '
    ').find('table'); + + // 第一个选项卡始终显示照片 + $(childTable).bootstrapTable({ + url: ctx + "manager/delivery_task_img/list", + method: 'post', + sidePagination: "server", + contentType: "application/x-www-form-urlencoded", + queryParams: { + taskCode: row.taskCode, + }, + columns: [ + { + title: '序号', + formatter: function (value, row, index) { + return index + 1 + } + }, + { + field: 'imgPath', + title: '照片', + formatter: function (value, row, index) { + return $.table.imageView(value, 818, 460, null); + } + }, + { + field: 'createTime', + title: '提交时间' + } + ] + }); + + // 第二个选项卡根据taskType显示不同内容 + if (taskType == 1) { + $(childTable1).bootstrapTable({ + url: ctx + "manager/task_waybill/list", method: 'post', sidePagination: "server", contentType: "application/x-www-form-urlencoded", @@ -208,86 +241,55 @@ } }, { - field: 'imgPath', - title: '照片', + field: 'waybillNumber', + title: '集装器/散装斗代码' + }, + // { + // field: 'basketEpc', + // title: '扫描RFID' + // }, + + ] + }); + } else { + $(childTable1).bootstrapTable({ + url: ctx + "manager/delivery_task_baseket/list", + method: 'post', + sidePagination: "server", + contentType: "application/x-www-form-urlencoded", + queryParams: { + taskCode: row.taskCode, + }, + columns: [ + { + title: '序号', formatter: function (value, row, index) { - return $.table.imageView(value, 818, 460, null); + return index + 1 } }, + { + field: 'baseBasketInfo.basketType', + title: '资产类型', + formatter: function (value, row, index) { + return $.table.selectDictLabel(basketTypeDatas, value); + } + }, + { + field: 'baseBasketInfo.steelGrade', + title: '钢号' + }, + { + field: 'baseBasketInfo.selfCode', + title: '自编号' + }, { field: 'createTime', - title: '提交时间' + title: '绑定时间' } ] }); - - // 第二个选项卡根据taskType显示不同内容 - if (taskType == 1) { - $(childTable1).bootstrapTable({ - url: ctx + "manager/task_waybill/list", - method: 'post', - sidePagination: "server", - contentType: "application/x-www-form-urlencoded", - queryParams: { - taskCode: row.taskCode, - }, - columns: [ - { - title: '序号', - formatter: function (value, row, index) { - return index + 1 - } - }, - { - field: 'waybillNumber', - title: '集装器/散装斗代码' - }, - // { - // field: 'basketEpc', - // title: '扫描RFID' - // }, - - ] - }); - } else { - $(childTable1).bootstrapTable({ - url: ctx + "manager/delivery_task_baseket/list", - method: 'post', - sidePagination: "server", - contentType: "application/x-www-form-urlencoded", - queryParams: { - taskCode: row.taskCode, - }, - columns: [ - { - title: '序号', - formatter: function (value, row, index) { - return index + 1 - } - }, - { - field: 'baseBasketInfo.basketType', - title: '资产类型', - formatter: function (value, row, index) { - return $.table.selectDictLabel(basketTypeDatas, value); - } - }, - { - field: 'baseBasketInfo.steelGrade', - title: '钢号' - }, - { - field: 'baseBasketInfo.selfCode', - title: '自编号' - }, - { - field: 'createTime', - title: '绑定时间' - } - ] - }); - } - }; + } + }; \ No newline at end of file