新增资产单据功能

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbAssetInformationService.java

@@ -20,6 +20,14 @@ public interface ITbAssetInformationService
     public TbAssetInformation selectTbAssetInformationById(Long id);
 
     /**
+     * 查询资产信息
+     *
+     * @param assetNumber 资产信息编号
+     * @return 资产信息
+     */
+    TbAssetInformation selectTbAssetAdjustmentByAssetNumber(String assetNumber);
+
+    /**
      * 查询资产信息列表
      * 
      * @param tbAssetInformation 资产信息

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetInformationServiceImpl.java

@@ -33,6 +33,11 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
         return tbAssetInformationMapper.selectTbAssetInformationById(id);
     }
 
+    @Override
+    public TbAssetInformation selectTbAssetAdjustmentByAssetNumber(String assetNumber) {
+        return tbAssetInformationMapper.selectTbAssetInformationByAssetNumber(assetNumber);
+    }
+
     /**
      * 查询资产信息列表
      * 

ruoyi-admin/src/main/java/com/ruoyi/order/controller/TbOrderController.java

@@ -0,0 +1,361 @@
+package com.ruoyi.order.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.mapper.TbAssetInformationMapper;
+import com.ruoyi.asset.service.ITbAssetInformationService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.order.domain.dto.OrderDTO;
+import com.ruoyi.order.domain.dto.OrderTypeEnum;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.order.domain.TbOrder;
+import com.ruoyi.order.service.ITbOrderService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 资产单据Controller
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+@RestController
+@RequestMapping("/order/order")
+public class TbOrderController extends BaseController
+{
+    @Autowired
+    private ITbOrderService tbOrderService;
+
+    @Resource
+    private ISysDeptService sysDeptService;
+
+    @Resource
+    private ITbAssetInformationService tbAssetInformationService;
+
+    /**
+     * 查询资产单据列表
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbOrder tbOrder)
+    {
+        startPage();
+        List<TbOrder> list = tbOrderService.selectTbOrderList(tbOrder);
+        ArrayList<OrderDTO> orderList = new ArrayList<>();
+        for (TbOrder order : list) {
+            OrderDTO orderDTO = BeanUtil.toBean(order, OrderDTO.class);
+            String applicationDepartment = order.getApplicationDepartment();
+            if (StrUtil.isNotBlank(applicationDepartment)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(applicationDepartment));
+                if (sysDept != null) {
+                    orderDTO.setApplicationDepartmentName(sysDept.getDeptName());
+                }
+            }
+            String preparedDepartment = order.getPreparedDepartment();
+            if (StrUtil.isNotBlank(preparedDepartment)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(preparedDepartment));
+                if (sysDept != null) {
+                    orderDTO.setPreparedDepartmentName(sysDept.getDeptName());
+                }
+            }
+            String lendDepartment = order.getLendDepartment();
+            if (StrUtil.isNotBlank(lendDepartment)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(lendDepartment));
+                if (sysDept != null) {
+                    orderDTO.setLendDepartmentName(sysDept.getDeptName());
+                }
+            }
+            String allocationCallOutDepartment = order.getAllocationCallOutDepartment();
+            if (StrUtil.isNotBlank(allocationCallOutDepartment)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(allocationCallOutDepartment));
+                if (sysDept != null) {
+                    orderDTO.setAllocationCallOutDepartmentName(sysDept.getDeptName());
+                }
+            }
+            String allocationCallInDepartment = order.getAllocationCallInDepartment();
+            if (StrUtil.isNotBlank(allocationCallInDepartment)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(allocationCallInDepartment));
+                if (sysDept != null) {
+                    orderDTO.setAllocationCallInDepartmentName(sysDept.getDeptName());
+                }
+            }
+            String corporation = order.getCorporation();
+            if (StrUtil.isNotBlank(corporation)) {
+                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(corporation));
+                if (sysDept != null) {
+                    orderDTO.setCorporationName(sysDept.getDeptName());
+                }
+            }
+            orderList.add(orderDTO);
+        }
+        return getDataTable(orderList);
+    }
+
+    /**
+     * 导出资产单据列表
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:export')")
+    @Log(title = "资产单据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbOrder tbOrder)
+    {
+        List<TbOrder> list = tbOrderService.selectTbOrderList(tbOrder);
+        ExcelUtil<TbOrder> util = new ExcelUtil<TbOrder>(TbOrder.class);
+        util.exportExcel(response, list, "资产单据数据");
+    }
+
+    /**
+     * 获取资产单据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tbOrderService.selectTbOrderById(id));
+    }
+
+    /**
+     * 新增资产单据
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:add')")
+    @Log(title = "资产单据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbOrder tbOrder)
+    {
+        Long type = tbOrder.getOrderType();
+        boolean result = OrderTypeEnum.checkout(type);
+        if (!result) {
+            return AjaxResult.error(MessageUtils.message("order.type.not.exist"));
+        }
+
+        String orderNumber = "";
+        String dateTimeId = DateUtils.dateTimeNow("yyyyMMddHHmmssSSS");
+        Long orderType = tbOrder.getOrderType();
+        for (OrderTypeEnum typeEnum : OrderTypeEnum.values()) {
+            if (typeEnum.getTypeCode().equals(orderType)) {
+                orderNumber = typeEnum.getTypeName() + dateTimeId;
+            }
+        }
+        tbOrder.setOrderNumber(orderNumber);
+
+        if (type.equals(OrderTypeEnum.ADJUSTMENT.getTypeCode())) {
+            // 资产调整，即修改资产信息后记录
+            // 需要传参 AdjustmentAssetNumber 资产编号、AdjustmentOriginalAssetInfo 资产原信息JSON字符串格式
+            TbOrder.adjustmentOrder(tbOrder);
+
+            AjaxResult ajaxResult = checkAdjustment(tbOrder);
+
+            if (ajaxResult != null) {
+                return ajaxResult;
+            }
+        } else if (type.equals(OrderTypeEnum.ALLOCATION.getTypeCode())) {
+            // 资产调拨
+            TbOrder.allocationOrder(tbOrder);
+
+            AjaxResult ajaxResult = checkAllocationOrder(tbOrder);
+
+            if (ajaxResult != null) {
+                return ajaxResult;
+            }
+        } else if (type.equals(OrderTypeEnum.LEND.getTypeCode())) {
+            // 资产借出
+            TbOrder.lendOrder(tbOrder);
+
+            AjaxResult ajaxResult = checkLendOrder(tbOrder);
+
+            if (ajaxResult != null) {
+                return ajaxResult;
+            }
+        } else {
+            // 资产其他变动
+            TbOrder.otherOrder(tbOrder);
+        }
+
+        if (tbOrder.getRecordStatus() == 1) {
+            AjaxResult ajaxResult = checkOrder(tbOrder);
+            if (ajaxResult != null) {
+                return ajaxResult;
+            }
+        }
+
+        tbOrder.setPreparedBy(getUsername());
+        tbOrder.setPreparedDepartment(getDeptId().toString());
+
+        SysDept sysDept = sysDeptService.selectDeptById(getDeptId());
+        if (sysDept == null) {
+            return error("部门不存在");
+        }
+        String ancestors = sysDept.getAncestors();
+        String[] split = ancestors.split(",");
+        String deptId;
+        if (split.length > 2) {
+            deptId = split[2];
+        } else {
+            deptId = split[split.length - 1];
+        }
+        tbOrder.setCorporation(deptId);
+
+        return toAjax(tbOrderService.insertTbOrder(tbOrder));
+    }
+
+    /**
+     * 修改资产单据
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:edit')")
+    @Log(title = "资产单据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbOrder tbOrder)
+    {
+        return toAjax(tbOrderService.updateTbOrder(tbOrder));
+    }
+
+    /**
+     * 删除资产单据
+     */
+    @PreAuthorize("@ss.hasPermi('order:order:remove')")
+    @Log(title = "资产单据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbOrderService.deleteTbOrderByIds(ids));
+    }
+    /** 检验单据 */
+    private AjaxResult checkOrder(TbOrder tbOrder) {
+
+        Date applicationDate = tbOrder.getApplicationDate();
+        String applicationDepartment = tbOrder.getApplicationDepartment();
+        String reason = tbOrder.getReason();
+
+        if (applicationDate == null) {
+            return error("申请日期不能为空");
+        }
+        if (StrUtil.isBlank(applicationDepartment)) {
+            return error("申请部门不能为空");
+        }
+        if (StrUtil.isBlank(reason)) {
+            return error("原因说明不能为空");
+        }
+
+        if (!tbOrder.getOrderType().equals(OrderTypeEnum.ADJUSTMENT.getTypeCode())) {
+            String assetTotalNetValue = tbOrder.getAssetTotalNetValue();
+            String assetTotalOriginalValue = tbOrder.getAssetTotalOriginalValue();
+            if (StrUtil.isBlank(assetTotalNetValue)) {
+                return error("资产总净值不能为空");
+            }
+            if (StrUtil.isBlank(assetTotalOriginalValue)) {
+                return error("资产总原值不能为空");
+            }
+        }
+
+        return null;
+    }
+
+    /** 检验调整单据 */
+    private AjaxResult checkAdjustment(TbOrder tbOrder) {
+        String adjustmentAssetNumber = tbOrder.getAdjustmentAssetNumber();
+        if (StrUtil.isBlank(adjustmentAssetNumber)) {
+            return error("资产编号不能为空");
+        }
+        TbAssetInformation tbAssetInformation = tbAssetInformationService.selectTbAssetAdjustmentByAssetNumber(adjustmentAssetNumber);
+        if (tbAssetInformation == null) {
+            return error("调整资产不存在");
+        }
+        String jsonStr = JSONUtil.toJsonStr(tbAssetInformation);
+        tbOrder.setAdjustmentOriginalAssetInfo(jsonStr);
+        return null;
+    }
+
+    /** 检验调拨单据 */
+    private AjaxResult checkAllocationOrder(TbOrder tbOrder) {
+        String allocationCallInBy = tbOrder.getAllocationCallInBy();
+        Date allocationCallInDate = tbOrder.getAllocationCallInDate();
+        String allocationCallInDepartment = tbOrder.getAllocationCallInDepartment();
+        String allocationCallOutBy = tbOrder.getAllocationCallOutBy();
+        Date allocationCallOutDate = tbOrder.getAllocationCallOutDate();
+        String allocationCallOutDepartment = tbOrder.getAllocationCallOutDepartment();
+        String allocationNewLocationNumber = tbOrder.getAllocationNewLocationNumber();
+        String allocationNewResponsiblePerson = tbOrder.getAllocationNewResponsiblePerson();
+
+        if (StrUtil.isBlank(allocationCallInBy)) {
+            return error("调入经办人不能为空");
+        }
+
+        if (allocationCallInDate == null) {
+            return error("调入日期不能为空");
+        }
+
+        if (StrUtil.isBlank(allocationCallInDepartment)) {
+            return error("调入部门不能为空");
+        }
+
+        if (StrUtil.isBlank(allocationCallOutBy)) {
+            return error("调出经办人不能为空");
+        }
+
+        if (allocationCallOutDate == null) {
+            return error("调出日期不能为空");
+        }
+
+        if (StrUtil.isBlank(allocationCallOutDepartment)) {
+            return error("调出部门不能为空");
+        }
+
+        if (StrUtil.isBlank(allocationNewLocationNumber)) {
+            return error("新功能位置编号不能为空");
+        }
+
+        if (StrUtil.isBlank(allocationNewResponsiblePerson)) {
+            return error("新管理人不能为空");
+        }
+
+        return null;
+    }
+
+    /** 检验借出单据 */
+    private AjaxResult checkLendOrder(TbOrder tbOrder) {
+        String lendDepartment = tbOrder.getLendDepartment();
+        String lendBySponsor = tbOrder.getLendBySponsor();
+        String lendPassingUnit = tbOrder.getLendPassingUnit();
+
+        if (StrUtil.isBlank(lendDepartment)) {
+            return error("借出部门不能为空");
+        }
+
+        if (StrUtil.isBlank(lendBySponsor)) {
+            return error("借出经手人不能为空");
+        }
+
+        if (StrUtil.isBlank(lendPassingUnit)) {
+            return error("往来单位不能为空");
+        }
+
+        return null;
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/order/controller/TbOrderDetailController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.order.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.order.domain.TbOrderDetail;
+import com.ruoyi.order.service.ITbOrderDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 单据明细Controller
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+@RestController
+@RequestMapping("/order/detail")
+public class TbOrderDetailController extends BaseController
+{
+    @Autowired
+    private ITbOrderDetailService tbOrderDetailService;
+
+    /**
+     * 查询单据明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbOrderDetail tbOrderDetail)
+    {
+        startPage();
+        List<TbOrderDetail> list = tbOrderDetailService.selectTbOrderDetailList(tbOrderDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出单据明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:export')")
+    @Log(title = "单据明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbOrderDetail tbOrderDetail)
+    {
+        List<TbOrderDetail> list = tbOrderDetailService.selectTbOrderDetailList(tbOrderDetail);
+        ExcelUtil<TbOrderDetail> util = new ExcelUtil<TbOrderDetail>(TbOrderDetail.class);
+        util.exportExcel(response, list, "单据明细数据");
+    }
+
+    /**
+     * 获取单据明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tbOrderDetailService.selectTbOrderDetailById(id));
+    }
+
+    /**
+     * 新增单据明细
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:add')")
+    @Log(title = "单据明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbOrderDetail tbOrderDetail)
+    {
+        return toAjax(tbOrderDetailService.insertTbOrderDetail(tbOrderDetail));
+    }
+
+    /**
+     * 修改单据明细
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:edit')")
+    @Log(title = "单据明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbOrderDetail tbOrderDetail)
+    {
+        return toAjax(tbOrderDetailService.updateTbOrderDetail(tbOrderDetail));
+    }
+
+    /**
+     * 删除单据明细
+     */
+    @PreAuthorize("@ss.hasPermi('order:detail:remove')")
+    @Log(title = "单据明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tbOrderDetailService.deleteTbOrderDetailByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/order/domain/TbOrder.java

@@ -0,0 +1,432 @@
+package com.ruoyi.order.domain;
+
+import java.util.Date;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 资产单据对象 tb_order
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public class TbOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 单据类型，0：未知：1：调整，2：调拨，3：借出，4：拆分， 5：闲置，6：启用，7：报废，8：变卖 */
+    @Excel(name = "单据类型，0：未知：1：调整，2：调拨，3：借出，4：拆分， 5：闲置，6：启用，7：报废，8：变卖")
+    private Long orderType;
+
+    /** 资产总原值（元） */
+    @Excel(name = "资产总原值", readConverterExp = "元=")
+    private String assetTotalOriginalValue;
+
+    /** 资产总净值（元） */
+    @Excel(name = "资产总净值", readConverterExp = "元=")
+    private String assetTotalNetValue;
+
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applicationDate;
+
+    /** 申请部门 */
+    @Excel(name = "申请部门")
+    private String applicationDepartment;
+
+    /** 【调整】资产编号 */
+    @Excel(name = "【调整】资产编号")
+    private String adjustmentAssetNumber;
+
+    /** 【调整】资产原信息，以JSON字符串格式存入提取 */
+    @Excel(name = "【调整】资产原信息，以JSON字符串格式存入提取")
+    private String adjustmentOriginalAssetInfo;
+
+    /** 【调拨】调出部门 */
+    @Excel(name = "【调拨】调出部门")
+    private String allocationCallOutDepartment;
+
+    /** 【调拨】调出经办人 */
+    @Excel(name = "【调拨】调出经办人")
+    private String allocationCallOutBy;
+
+    /** 【调拨】调出日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "【调拨】调出日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date allocationCallOutDate;
+
+    /** 【调拨】调入部门 */
+    @Excel(name = "【调拨】调入部门")
+    private String allocationCallInDepartment;
+
+    /** 【调拨】调入经办人 */
+    @Excel(name = "【调拨】调入经办人")
+    private String allocationCallInBy;
+
+    /** 【调拨】调入日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "【调拨】调入日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date allocationCallInDate;
+
+    /** 【调拨】新管理人 */
+    @Excel(name = "【调拨】新管理人")
+    private String allocationNewResponsiblePerson;
+
+    /** 【调拨】新功能位置编号 */
+    @Excel(name = "【调拨】新功能位置编号")
+    private String allocationNewLocationNumber;
+
+    /** 【借出】借出部门 */
+    @Excel(name = "【借出】借出部门")
+    private String lendDepartment;
+
+    /** 【借出】经手人 */
+    @Excel(name = "【借出】经手人")
+    private String lendBySponsor;
+
+    /** 【借出】往来单位 */
+    @Excel(name = "【借出】往来单位")
+    private String lendPassingUnit;
+
+    /** 原因说明 */
+    @Excel(name = "原因说明")
+    private String reason;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private String preparedBy;
+
+    /** 制单部门 */
+    @Excel(name = "制单部门")
+    private String preparedDepartment;
+
+    /** 所属公司 */
+    @Excel(name = "所属公司")
+    private String corporation;
+
+    /** 记录状态 */
+    @Excel(name = "记录状态")
+    private Long recordStatus;
+
+    /** 获取资产调整单据 */
+    public static void adjustmentOrder(TbOrder tbOrder) {
+        if (tbOrder.getAdjustmentAssetNumber() == null || StrUtil.isBlank(tbOrder.getAdjustmentAssetNumber())) {
+            return;
+        }
+        setNullAllocation(tbOrder);
+        setNullLend(tbOrder);
+    }
+
+    /** 获取资产调拨单据 */
+    public static void allocationOrder(TbOrder tbOrder) {
+        setNullAdjustment(tbOrder);
+        setNullLend(tbOrder);
+    }
+
+    /** 获取资产借用单据 */
+    public static void lendOrder(TbOrder tbOrder) {
+        setNullAdjustment(tbOrder);
+        setNullAllocation(tbOrder);
+    }
+
+    /** 获取其他资产单据 */
+    public static void otherOrder(TbOrder tbOrder) {
+        setNullLend(tbOrder);
+        setNullAllocation(tbOrder);
+        setNullAdjustment(tbOrder);
+    }
+
+    private static void setNullAllocation(TbOrder tbOrder) {
+        tbOrder.setAllocationCallInBy(null);
+        tbOrder.setAllocationCallInDate(null);
+        tbOrder.setAllocationCallInDepartment(null);
+        tbOrder.setAllocationCallOutBy(null);
+        tbOrder.setAllocationCallOutDate(null);
+        tbOrder.setAllocationCallOutDepartment(null);
+        tbOrder.setAllocationNewLocationNumber(null);
+        tbOrder.setAllocationNewResponsiblePerson(null);
+    }
+
+    private static void setNullLend(TbOrder tbOrder) {
+        tbOrder.setLendBySponsor(null);
+        tbOrder.setLendDepartment(null);
+        tbOrder.setLendPassingUnit(null);
+    }
+
+    private static void setNullAdjustment(TbOrder tbOrder) {
+        tbOrder.setAdjustmentOriginalAssetInfo(null);
+        tbOrder.setAdjustmentAssetNumber(null);
+        tbOrder.setAssetTotalNetValue(null);
+        tbOrder.setAssetTotalOriginalValue(null);
+    }
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setOrderType(Long orderType) 
+    {
+        this.orderType = orderType;
+    }
+
+    public Long getOrderType() 
+    {
+        return orderType;
+    }
+    public void setAssetTotalOriginalValue(String assetTotalOriginalValue) 
+    {
+        this.assetTotalOriginalValue = assetTotalOriginalValue;
+    }
+
+    public String getAssetTotalOriginalValue() 
+    {
+        return assetTotalOriginalValue;
+    }
+    public void setAssetTotalNetValue(String assetTotalNetValue) 
+    {
+        this.assetTotalNetValue = assetTotalNetValue;
+    }
+
+    public String getAssetTotalNetValue() 
+    {
+        return assetTotalNetValue;
+    }
+    public void setApplicationDate(Date applicationDate) 
+    {
+        this.applicationDate = applicationDate;
+    }
+
+    public Date getApplicationDate() 
+    {
+        return applicationDate;
+    }
+    public void setApplicationDepartment(String applicationDepartment) 
+    {
+        this.applicationDepartment = applicationDepartment;
+    }
+
+    public String getApplicationDepartment() 
+    {
+        return applicationDepartment;
+    }
+    public void setAdjustmentAssetNumber(String adjustmentAssetNumber) 
+    {
+        this.adjustmentAssetNumber = adjustmentAssetNumber;
+    }
+
+    public String getAdjustmentAssetNumber() 
+    {
+        return adjustmentAssetNumber;
+    }
+    public void setAdjustmentOriginalAssetInfo(String adjustmentOriginalAssetInfo) 
+    {
+        this.adjustmentOriginalAssetInfo = adjustmentOriginalAssetInfo;
+    }
+
+    public String getAdjustmentOriginalAssetInfo() 
+    {
+        return adjustmentOriginalAssetInfo;
+    }
+    public void setAllocationCallOutDepartment(String allocationCallOutDepartment) 
+    {
+        this.allocationCallOutDepartment = allocationCallOutDepartment;
+    }
+
+    public String getAllocationCallOutDepartment() 
+    {
+        return allocationCallOutDepartment;
+    }
+    public void setAllocationCallOutBy(String allocationCallOutBy) 
+    {
+        this.allocationCallOutBy = allocationCallOutBy;
+    }
+
+    public String getAllocationCallOutBy() 
+    {
+        return allocationCallOutBy;
+    }
+    public void setAllocationCallOutDate(Date allocationCallOutDate) 
+    {
+        this.allocationCallOutDate = allocationCallOutDate;
+    }
+
+    public Date getAllocationCallOutDate() 
+    {
+        return allocationCallOutDate;
+    }
+    public void setAllocationCallInDepartment(String allocationCallInDepartment) 
+    {
+        this.allocationCallInDepartment = allocationCallInDepartment;
+    }
+
+    public String getAllocationCallInDepartment() 
+    {
+        return allocationCallInDepartment;
+    }
+    public void setAllocationCallInBy(String allocationCallInBy) 
+    {
+        this.allocationCallInBy = allocationCallInBy;
+    }
+
+    public String getAllocationCallInBy() 
+    {
+        return allocationCallInBy;
+    }
+    public void setAllocationCallInDate(Date allocationCallInDate) 
+    {
+        this.allocationCallInDate = allocationCallInDate;
+    }
+
+    public Date getAllocationCallInDate() 
+    {
+        return allocationCallInDate;
+    }
+    public void setAllocationNewResponsiblePerson(String allocationNewResponsiblePerson) 
+    {
+        this.allocationNewResponsiblePerson = allocationNewResponsiblePerson;
+    }
+
+    public String getAllocationNewResponsiblePerson() 
+    {
+        return allocationNewResponsiblePerson;
+    }
+    public void setAllocationNewLocationNumber(String allocationNewLocationNumber) 
+    {
+        this.allocationNewLocationNumber = allocationNewLocationNumber;
+    }
+
+    public String getAllocationNewLocationNumber() 
+    {
+        return allocationNewLocationNumber;
+    }
+    public void setLendDepartment(String lendDepartment) 
+    {
+        this.lendDepartment = lendDepartment;
+    }
+
+    public String getLendDepartment() 
+    {
+        return lendDepartment;
+    }
+    public void setLendBySponsor(String lendBySponsor) 
+    {
+        this.lendBySponsor = lendBySponsor;
+    }
+
+    public String getLendBySponsor() 
+    {
+        return lendBySponsor;
+    }
+    public void setLendPassingUnit(String lendPassingUnit) 
+    {
+        this.lendPassingUnit = lendPassingUnit;
+    }
+
+    public String getLendPassingUnit() 
+    {
+        return lendPassingUnit;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+    public void setPreparedBy(String preparedBy) 
+    {
+        this.preparedBy = preparedBy;
+    }
+
+    public String getPreparedBy() 
+    {
+        return preparedBy;
+    }
+    public void setPreparedDepartment(String preparedDepartment) 
+    {
+        this.preparedDepartment = preparedDepartment;
+    }
+
+    public String getPreparedDepartment() 
+    {
+        return preparedDepartment;
+    }
+    public void setCorporation(String corporation) 
+    {
+        this.corporation = corporation;
+    }
+
+    public String getCorporation() 
+    {
+        return corporation;
+    }
+    public void setRecordStatus(Long recordStatus) 
+    {
+        this.recordStatus = recordStatus;
+    }
+
+    public Long getRecordStatus() 
+    {
+        return recordStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNumber", getOrderNumber())
+            .append("orderType", getOrderType())
+            .append("assetTotalOriginalValue", getAssetTotalOriginalValue())
+            .append("assetTotalNetValue", getAssetTotalNetValue())
+            .append("applicationDate", getApplicationDate())
+            .append("applicationDepartment", getApplicationDepartment())
+            .append("adjustmentAssetNumber", getAdjustmentAssetNumber())
+            .append("adjustmentOriginalAssetInfo", getAdjustmentOriginalAssetInfo())
+            .append("allocationCallOutDepartment", getAllocationCallOutDepartment())
+            .append("allocationCallOutBy", getAllocationCallOutBy())
+            .append("allocationCallOutDate", getAllocationCallOutDate())
+            .append("allocationCallInDepartment", getAllocationCallInDepartment())
+            .append("allocationCallInBy", getAllocationCallInBy())
+            .append("allocationCallInDate", getAllocationCallInDate())
+            .append("allocationNewResponsiblePerson", getAllocationNewResponsiblePerson())
+            .append("allocationNewLocationNumber", getAllocationNewLocationNumber())
+            .append("lendDepartment", getLendDepartment())
+            .append("lendBySponsor", getLendBySponsor())
+            .append("lendPassingUnit", getLendPassingUnit())
+            .append("reason", getReason())
+            .append("preparedBy", getPreparedBy())
+            .append("preparedDepartment", getPreparedDepartment())
+            .append("corporation", getCorporation())
+            .append("recordStatus", getRecordStatus())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/order/domain/TbOrderDetail.java

@@ -0,0 +1,168 @@
+package com.ruoyi.order.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 单据明细对象 tb_order_detail
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public class TbOrderDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 单据编号 */
+    @Excel(name = "单据编号")
+    private String orderNumber;
+
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String assetNumber;
+
+    /** 【调拨】旧管理人 */
+    @Excel(name = "【调拨】旧管理人")
+    private String allocationOldResponsiblePerson;
+
+    /** 【调拨】旧功能位置编号 */
+    @Excel(name = "【调拨】旧功能位置编号")
+    private String allocationOldLocationNumber;
+
+    /** 【调拨】新管理人 */
+    @Excel(name = "【调拨】新管理人")
+    private String allocationNewResponsiblePerson;
+
+    /** 【调拨】新功能位置编号 */
+    @Excel(name = "【调拨】新功能位置编号")
+    private String allocationNewLocationNumber;
+
+    /** 【借出】预计归还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "【借出】预计归还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lendReturnDate;
+
+    /** 【借出】实际归还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "【借出】实际归还时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lendActualReturnDate;
+
+    /** 【借出】归还经手人 */
+    @Excel(name = "【借出】归还经手人")
+    private String lendBySponsor;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setAssetNumber(String assetNumber) 
+    {
+        this.assetNumber = assetNumber;
+    }
+
+    public String getAssetNumber() 
+    {
+        return assetNumber;
+    }
+    public void setAllocationOldResponsiblePerson(String allocationOldResponsiblePerson) 
+    {
+        this.allocationOldResponsiblePerson = allocationOldResponsiblePerson;
+    }
+
+    public String getAllocationOldResponsiblePerson() 
+    {
+        return allocationOldResponsiblePerson;
+    }
+    public void setAllocationOldLocationNumber(String allocationOldLocationNumber) 
+    {
+        this.allocationOldLocationNumber = allocationOldLocationNumber;
+    }
+
+    public String getAllocationOldLocationNumber() 
+    {
+        return allocationOldLocationNumber;
+    }
+    public void setAllocationNewResponsiblePerson(String allocationNewResponsiblePerson) 
+    {
+        this.allocationNewResponsiblePerson = allocationNewResponsiblePerson;
+    }
+
+    public String getAllocationNewResponsiblePerson() 
+    {
+        return allocationNewResponsiblePerson;
+    }
+    public void setAllocationNewLocationNumber(String allocationNewLocationNumber) 
+    {
+        this.allocationNewLocationNumber = allocationNewLocationNumber;
+    }
+
+    public String getAllocationNewLocationNumber() 
+    {
+        return allocationNewLocationNumber;
+    }
+    public void setLendReturnDate(Date lendReturnDate) 
+    {
+        this.lendReturnDate = lendReturnDate;
+    }
+
+    public Date getLendReturnDate() 
+    {
+        return lendReturnDate;
+    }
+    public void setLendActualReturnDate(Date lendActualReturnDate) 
+    {
+        this.lendActualReturnDate = lendActualReturnDate;
+    }
+
+    public Date getLendActualReturnDate() 
+    {
+        return lendActualReturnDate;
+    }
+    public void setLendBySponsor(String lendBySponsor) 
+    {
+        this.lendBySponsor = lendBySponsor;
+    }
+
+    public String getLendBySponsor() 
+    {
+        return lendBySponsor;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderNumber", getOrderNumber())
+            .append("assetNumber", getAssetNumber())
+            .append("allocationOldResponsiblePerson", getAllocationOldResponsiblePerson())
+            .append("allocationOldLocationNumber", getAllocationOldLocationNumber())
+            .append("allocationNewResponsiblePerson", getAllocationNewResponsiblePerson())
+            .append("allocationNewLocationNumber", getAllocationNewLocationNumber())
+            .append("lendReturnDate", getLendReturnDate())
+            .append("lendActualReturnDate", getLendActualReturnDate())
+            .append("lendBySponsor", getLendBySponsor())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/order/domain/dto/OrderDTO.java

@@ -0,0 +1,28 @@
+package com.ruoyi.order.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.order.domain.TbOrder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrderDTO extends TbOrder {
+    /** 申请部门 */
+    private String applicationDepartmentName;
+
+    /** 【调拨】调出部门 */
+    private String allocationCallOutDepartmentName;
+
+    /** 【调拨】调入部门 */
+    private String allocationCallInDepartmentName;
+
+    /** 【借出】借出部门 */
+    private String lendDepartmentName;
+
+    /** 制单部门名称 */
+    private String preparedDepartmentName;
+
+    /** 所属公司名称 */
+    private String corporationName;
+}

ruoyi-admin/src/main/java/com/ruoyi/order/domain/dto/OrderTypeEnum.java

@@ -0,0 +1,48 @@
+package com.ruoyi.order.domain.dto;
+
+public enum OrderTypeEnum {
+    /** 未知 */
+    UNKNOWN("UNKNOWN", 0L),
+    /** 调整 */
+    ADJUSTMENT("TZ", 1L),
+    /** 调拨 */
+    ALLOCATION("DB", 2L),
+    /** 借出 */
+    LEND("JC", 3L),
+    /** 拆分 */
+    SPLIT("CF", 4L),
+    /** 闲置 */
+    LEAVE_UNUSED("XZ", 5L),
+    /** 启用 */
+    START_USING("QY", 6L),
+    /** 报废 */
+    SCRAP("BF", 7L),
+    /** 变卖 */
+    REALIZE_ON("BM", 8L);
+
+    private final String typeName;
+    private final Long typeCode;
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public Long getTypeCode() {
+        return typeCode;
+    }
+
+    OrderTypeEnum(String typeName, Long typeCode) {
+        this.typeName = typeName;
+        this.typeCode = typeCode;
+    }
+
+    /** 验证单据类型 */
+    public static boolean checkout(Long typeCode) {
+        for (OrderTypeEnum typeEnum : OrderTypeEnum.values()) {
+            if (typeEnum.getTypeCode().equals(typeCode)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/order/mapper/TbOrderDetailMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.order.mapper;
+
+import java.util.List;
+import com.ruoyi.order.domain.TbOrderDetail;
+
+/**
+ * 单据明细Mapper接口
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public interface TbOrderDetailMapper 
+{
+    /**
+     * 查询单据明细
+     * 
+     * @param id 单据明细主键
+     * @return 单据明细
+     */
+    public TbOrderDetail selectTbOrderDetailById(Long id);
+
+    /**
+     * 查询单据明细列表
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 单据明细集合
+     */
+    public List<TbOrderDetail> selectTbOrderDetailList(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 新增单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    public int insertTbOrderDetail(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 修改单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    public int updateTbOrderDetail(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 删除单据明细
+     * 
+     * @param id 单据明细主键
+     * @return 结果
+     */
+    public int deleteTbOrderDetailById(Long id);
+
+    /**
+     * 批量删除单据明细
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbOrderDetailByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/order/mapper/TbOrderMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.order.mapper;
+
+import java.util.List;
+import com.ruoyi.order.domain.TbOrder;
+
+/**
+ * 资产单据Mapper接口
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public interface TbOrderMapper 
+{
+    /**
+     * 查询资产单据
+     * 
+     * @param id 资产单据主键
+     * @return 资产单据
+     */
+    public TbOrder selectTbOrderById(Long id);
+
+    /**
+     * 查询资产单据列表
+     * 
+     * @param tbOrder 资产单据
+     * @return 资产单据集合
+     */
+    public List<TbOrder> selectTbOrderList(TbOrder tbOrder);
+
+    /**
+     * 新增资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    public int insertTbOrder(TbOrder tbOrder);
+
+    /**
+     * 修改资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    public int updateTbOrder(TbOrder tbOrder);
+
+    /**
+     * 删除资产单据
+     * 
+     * @param id 资产单据主键
+     * @return 结果
+     */
+    public int deleteTbOrderById(Long id);
+
+    /**
+     * 批量删除资产单据
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTbOrderByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/order/service/ITbOrderDetailService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.order.service;
+
+import java.util.List;
+import com.ruoyi.order.domain.TbOrderDetail;
+
+/**
+ * 单据明细Service接口
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public interface ITbOrderDetailService 
+{
+    /**
+     * 查询单据明细
+     * 
+     * @param id 单据明细主键
+     * @return 单据明细
+     */
+    public TbOrderDetail selectTbOrderDetailById(Long id);
+
+    /**
+     * 查询单据明细列表
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 单据明细集合
+     */
+    public List<TbOrderDetail> selectTbOrderDetailList(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 新增单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    public int insertTbOrderDetail(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 修改单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    public int updateTbOrderDetail(TbOrderDetail tbOrderDetail);
+
+    /**
+     * 批量删除单据明细
+     * 
+     * @param ids 需要删除的单据明细主键集合
+     * @return 结果
+     */
+    public int deleteTbOrderDetailByIds(Long[] ids);
+
+    /**
+     * 删除单据明细信息
+     * 
+     * @param id 单据明细主键
+     * @return 结果
+     */
+    public int deleteTbOrderDetailById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/order/service/ITbOrderService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.order.service;
+
+import java.util.List;
+import com.ruoyi.order.domain.TbOrder;
+
+/**
+ * 资产单据Service接口
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+public interface ITbOrderService 
+{
+    /**
+     * 查询资产单据
+     * 
+     * @param id 资产单据主键
+     * @return 资产单据
+     */
+    public TbOrder selectTbOrderById(Long id);
+
+    /**
+     * 查询资产单据列表
+     * 
+     * @param tbOrder 资产单据
+     * @return 资产单据集合
+     */
+    public List<TbOrder> selectTbOrderList(TbOrder tbOrder);
+
+    /**
+     * 新增资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    public int insertTbOrder(TbOrder tbOrder);
+
+    /**
+     * 修改资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    public int updateTbOrder(TbOrder tbOrder);
+
+    /**
+     * 批量删除资产单据
+     * 
+     * @param ids 需要删除的资产单据主键集合
+     * @return 结果
+     */
+    public int deleteTbOrderByIds(Long[] ids);
+
+    /**
+     * 删除资产单据信息
+     * 
+     * @param id 资产单据主键
+     * @return 结果
+     */
+    public int deleteTbOrderById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/order/service/impl/TbOrderDetailServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.order.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.order.mapper.TbOrderDetailMapper;
+import com.ruoyi.order.domain.TbOrderDetail;
+import com.ruoyi.order.service.ITbOrderDetailService;
+
+/**
+ * 单据明细Service业务层处理
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+@Service
+public class TbOrderDetailServiceImpl implements ITbOrderDetailService 
+{
+    @Autowired
+    private TbOrderDetailMapper tbOrderDetailMapper;
+
+    /**
+     * 查询单据明细
+     * 
+     * @param id 单据明细主键
+     * @return 单据明细
+     */
+    @Override
+    public TbOrderDetail selectTbOrderDetailById(Long id)
+    {
+        return tbOrderDetailMapper.selectTbOrderDetailById(id);
+    }
+
+    /**
+     * 查询单据明细列表
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 单据明细
+     */
+    @Override
+    public List<TbOrderDetail> selectTbOrderDetailList(TbOrderDetail tbOrderDetail)
+    {
+        return tbOrderDetailMapper.selectTbOrderDetailList(tbOrderDetail);
+    }
+
+    /**
+     * 新增单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    @Override
+    public int insertTbOrderDetail(TbOrderDetail tbOrderDetail)
+    {
+        return tbOrderDetailMapper.insertTbOrderDetail(tbOrderDetail);
+    }
+
+    /**
+     * 修改单据明细
+     * 
+     * @param tbOrderDetail 单据明细
+     * @return 结果
+     */
+    @Override
+    public int updateTbOrderDetail(TbOrderDetail tbOrderDetail)
+    {
+        return tbOrderDetailMapper.updateTbOrderDetail(tbOrderDetail);
+    }
+
+    /**
+     * 批量删除单据明细
+     * 
+     * @param ids 需要删除的单据明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbOrderDetailByIds(Long[] ids)
+    {
+        return tbOrderDetailMapper.deleteTbOrderDetailByIds(ids);
+    }
+
+    /**
+     * 删除单据明细信息
+     * 
+     * @param id 单据明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbOrderDetailById(Long id)
+    {
+        return tbOrderDetailMapper.deleteTbOrderDetailById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/order/service/impl/TbOrderServiceImpl.java

@@ -0,0 +1,106 @@
+package com.ruoyi.order.service.impl;
+
+import java.util.List;
+import java.util.UUID;
+
+import cn.hutool.core.lang.func.LambdaUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.mapper.TbAssetInformationMapper;
+import com.ruoyi.order.domain.dto.OrderTypeEnum;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.order.mapper.TbOrderMapper;
+import com.ruoyi.order.domain.TbOrder;
+import com.ruoyi.order.service.ITbOrderService;
+
+import javax.annotation.Resource;
+
+/**
+ * 资产单据Service业务层处理
+ * 
+ * @author 原动力
+ * @date 2023-05-24
+ */
+@Service
+public class TbOrderServiceImpl implements ITbOrderService 
+{
+    @Resource
+    private TbOrderMapper tbOrderMapper;
+
+    /**
+     * 查询资产单据
+     * 
+     * @param id 资产单据主键
+     * @return 资产单据
+     */
+    @Override
+    public TbOrder selectTbOrderById(Long id)
+    {
+        return tbOrderMapper.selectTbOrderById(id);
+    }
+
+    /**
+     * 查询资产单据列表
+     * 
+     * @param tbOrder 资产单据
+     * @return 资产单据
+     */
+    @Override
+    public List<TbOrder> selectTbOrderList(TbOrder tbOrder)
+    {
+        return tbOrderMapper.selectTbOrderList(tbOrder);
+    }
+
+    /**
+     * 新增资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    @Override
+    public int insertTbOrder(TbOrder tbOrder)
+    {
+        return tbOrderMapper.insertTbOrder(tbOrder);
+    }
+
+    /**
+     * 修改资产单据
+     * 
+     * @param tbOrder 资产单据
+     * @return 结果
+     */
+    @Override
+    public int updateTbOrder(TbOrder tbOrder)
+    {
+        return tbOrderMapper.updateTbOrder(tbOrder);
+    }
+
+    /**
+     * 批量删除资产单据
+     * 
+     * @param ids 需要删除的资产单据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbOrderByIds(Long[] ids)
+    {
+        return tbOrderMapper.deleteTbOrderByIds(ids);
+    }
+
+    /**
+     * 删除资产单据信息
+     * 
+     * @param id 资产单据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTbOrderById(Long id)
+    {
+        return tbOrderMapper.deleteTbOrderById(id);
+    }
+}

ruoyi-admin/src/main/resources/i18n/messages.properties

@@ -36,3 +36,6 @@ no.update.permission=您没有修改数据的权限，请联系管理员添加
 no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
 no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
 no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+
+# 单据
+order.type.not.exist=单据类型不存在

ruoyi-admin/src/main/resources/mapper/order/TbOrderDetailMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.order.mapper.TbOrderDetailMapper">
+    
+    <resultMap type="TbOrderDetail" id="TbOrderDetailResult">
+        <result property="id"    column="id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="assetNumber"    column="asset_number"    />
+        <result property="allocationOldResponsiblePerson"    column="allocation_old_responsible_person"    />
+        <result property="allocationOldLocationNumber"    column="allocation_old_location_number"    />
+        <result property="allocationNewResponsiblePerson"    column="allocation_new_responsible_person"    />
+        <result property="allocationNewLocationNumber"    column="allocation_new_location_number"    />
+        <result property="lendReturnDate"    column="lend_return_date"    />
+        <result property="lendActualReturnDate"    column="lend_actual_return_date"    />
+        <result property="lendBySponsor"    column="lend_by_sponsor"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTbOrderDetailVo">
+        select id, order_number, asset_number, allocation_old_responsible_person, allocation_old_location_number, allocation_new_responsible_person, allocation_new_location_number, lend_return_date, lend_actual_return_date, lend_by_sponsor, remark from tb_order_detail
+    </sql>
+
+    <select id="selectTbOrderDetailList" parameterType="TbOrderDetail" resultMap="TbOrderDetailResult">
+        <include refid="selectTbOrderDetailVo"/>
+        <where>  
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="assetNumber != null  and assetNumber != ''"> and asset_number = #{assetNumber}</if>
+            <if test="allocationOldResponsiblePerson != null  and allocationOldResponsiblePerson != ''"> and allocation_old_responsible_person = #{allocationOldResponsiblePerson}</if>
+            <if test="allocationOldLocationNumber != null  and allocationOldLocationNumber != ''"> and allocation_old_location_number = #{allocationOldLocationNumber}</if>
+            <if test="allocationNewResponsiblePerson != null  and allocationNewResponsiblePerson != ''"> and allocation_new_responsible_person = #{allocationNewResponsiblePerson}</if>
+            <if test="allocationNewLocationNumber != null  and allocationNewLocationNumber != ''"> and allocation_new_location_number = #{allocationNewLocationNumber}</if>
+            <if test="lendReturnDate != null "> and lend_return_date = #{lendReturnDate}</if>
+            <if test="lendActualReturnDate != null "> and lend_actual_return_date = #{lendActualReturnDate}</if>
+            <if test="lendBySponsor != null  and lendBySponsor != ''"> and lend_by_sponsor = #{lendBySponsor}</if>
+        </where>
+    </select>
+    
+    <select id="selectTbOrderDetailById" parameterType="Long" resultMap="TbOrderDetailResult">
+        <include refid="selectTbOrderDetailVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTbOrderDetail" parameterType="TbOrderDetail" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number,</if>
+            <if test="assetNumber != null and assetNumber != ''">asset_number,</if>
+            <if test="allocationOldResponsiblePerson != null">allocation_old_responsible_person,</if>
+            <if test="allocationOldLocationNumber != null">allocation_old_location_number,</if>
+            <if test="allocationNewResponsiblePerson != null">allocation_new_responsible_person,</if>
+            <if test="allocationNewLocationNumber != null">allocation_new_location_number,</if>
+            <if test="lendReturnDate != null">lend_return_date,</if>
+            <if test="lendActualReturnDate != null">lend_actual_return_date,</if>
+            <if test="lendBySponsor != null">lend_by_sponsor,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
+            <if test="assetNumber != null and assetNumber != ''">#{assetNumber},</if>
+            <if test="allocationOldResponsiblePerson != null">#{allocationOldResponsiblePerson},</if>
+            <if test="allocationOldLocationNumber != null">#{allocationOldLocationNumber},</if>
+            <if test="allocationNewResponsiblePerson != null">#{allocationNewResponsiblePerson},</if>
+            <if test="allocationNewLocationNumber != null">#{allocationNewLocationNumber},</if>
+            <if test="lendReturnDate != null">#{lendReturnDate},</if>
+            <if test="lendActualReturnDate != null">#{lendActualReturnDate},</if>
+            <if test="lendBySponsor != null">#{lendBySponsor},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTbOrderDetail" parameterType="TbOrderDetail">
+        update tb_order_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number = #{orderNumber},</if>
+            <if test="assetNumber != null and assetNumber != ''">asset_number = #{assetNumber},</if>
+            <if test="allocationOldResponsiblePerson != null">allocation_old_responsible_person = #{allocationOldResponsiblePerson},</if>
+            <if test="allocationOldLocationNumber != null">allocation_old_location_number = #{allocationOldLocationNumber},</if>
+            <if test="allocationNewResponsiblePerson != null">allocation_new_responsible_person = #{allocationNewResponsiblePerson},</if>
+            <if test="allocationNewLocationNumber != null">allocation_new_location_number = #{allocationNewLocationNumber},</if>
+            <if test="lendReturnDate != null">lend_return_date = #{lendReturnDate},</if>
+            <if test="lendActualReturnDate != null">lend_actual_return_date = #{lendActualReturnDate},</if>
+            <if test="lendBySponsor != null">lend_by_sponsor = #{lendBySponsor},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbOrderDetailById" parameterType="Long">
+        delete from tb_order_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteTbOrderDetailByIds" parameterType="String">
+        delete from tb_order_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-admin/src/main/resources/mapper/order/TbOrderMapper.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.order.mapper.TbOrderMapper">
+    
+    <resultMap type="TbOrder" id="TbOrderResult">
+        <result property="id"    column="id"    />
+        <result property="orderNumber"    column="order_number"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="assetTotalOriginalValue"    column="asset_total_original_value"    />
+        <result property="assetTotalNetValue"    column="asset_total_net_value"    />
+        <result property="applicationDate"    column="application_date"    />
+        <result property="applicationDepartment"    column="application_department"    />
+        <result property="adjustmentAssetNumber"    column="adjustment_asset_number"    />
+        <result property="adjustmentOriginalAssetInfo"    column="adjustment_original_asset_info"    />
+        <result property="allocationCallOutDepartment"    column="allocation_call_out_department"    />
+        <result property="allocationCallOutBy"    column="allocation_call_out_by"    />
+        <result property="allocationCallOutDate"    column="allocation_call_out_date"    />
+        <result property="allocationCallInDepartment"    column="allocation_call_in_department"    />
+        <result property="allocationCallInBy"    column="allocation_call_in_by"    />
+        <result property="allocationCallInDate"    column="allocation_call_in_date"    />
+        <result property="allocationNewResponsiblePerson"    column="allocation_new_responsible_person"    />
+        <result property="allocationNewLocationNumber"    column="allocation_new_location_number"    />
+        <result property="lendDepartment"    column="lend_department"    />
+        <result property="lendBySponsor"    column="lend_by_sponsor"    />
+        <result property="lendPassingUnit"    column="lend_passing_unit"    />
+        <result property="reason"    column="reason"    />
+        <result property="preparedBy"    column="prepared_by"    />
+        <result property="preparedDepartment"    column="prepared_department"    />
+        <result property="corporation"    column="corporation"    />
+        <result property="recordStatus"    column="record_status"    />
+    </resultMap>
+
+    <sql id="selectTbOrderVo">
+        select id, order_number, order_type, asset_total_original_value, asset_total_net_value, application_date, application_department, adjustment_asset_number, adjustment_original_asset_info, allocation_call_out_department, allocation_call_out_by, allocation_call_out_date, allocation_call_in_department, allocation_call_in_by, allocation_call_in_date, allocation_new_responsible_person, allocation_new_location_number, lend_department, lend_by_sponsor, lend_passing_unit, reason, prepared_by, prepared_department, corporation, record_status from tb_order
+    </sql>
+
+    <select id="selectTbOrderList" parameterType="TbOrder" resultMap="TbOrderResult">
+        <include refid="selectTbOrderVo"/>
+        <where>  
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="orderType != null "> and order_type = #{orderType}</if>
+            <if test="applicationDate != null "> and application_date = #{applicationDate}</if>
+            <if test="applicationDepartment != null  and applicationDepartment != ''"> and application_department = #{applicationDepartment}</if>
+            <if test="adjustmentAssetNumber != null  and adjustmentAssetNumber != ''"> and adjustment_asset_number = #{adjustmentAssetNumber}</if>
+            <if test="allocationCallOutDepartment != null  and allocationCallOutDepartment != ''"> and allocation_call_out_department = #{allocationCallOutDepartment}</if>
+            <if test="allocationCallOutBy != null  and allocationCallOutBy != ''"> and allocation_call_out_by = #{allocationCallOutBy}</if>
+            <if test="allocationCallOutDate != null "> and allocation_call_out_date = #{allocationCallOutDate}</if>
+            <if test="allocationCallInDepartment != null  and allocationCallInDepartment != ''"> and allocation_call_in_department = #{allocationCallInDepartment}</if>
+            <if test="allocationCallInBy != null  and allocationCallInBy != ''"> and allocation_call_in_by = #{allocationCallInBy}</if>
+            <if test="allocationCallInDate != null "> and allocation_call_in_date = #{allocationCallInDate}</if>
+            <if test="lendDepartment != null  and lendDepartment != ''"> and lend_department = #{lendDepartment}</if>
+            <if test="lendBySponsor != null  and lendBySponsor != ''"> and lend_by_sponsor = #{lendBySponsor}</if>
+            <if test="lendPassingUnit != null  and lendPassingUnit != ''"> and lend_passing_unit = #{lendPassingUnit}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="preparedBy != null  and preparedBy != ''"> and prepared_by = #{preparedBy}</if>
+            <if test="preparedDepartment != null  and preparedDepartment != ''"> and prepared_department = #{preparedDepartment}</if>
+            <if test="corporation != null  and corporation != ''"> and corporation = #{corporation}</if>
+            <if test="recordStatus != null "> and record_status = #{recordStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectTbOrderById" parameterType="Long" resultMap="TbOrderResult">
+        <include refid="selectTbOrderVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTbOrder" parameterType="TbOrder" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="assetTotalOriginalValue != null and assetTotalOriginalValue != ''">asset_total_original_value,</if>
+            <if test="assetTotalNetValue != null and assetTotalNetValue != ''">asset_total_net_value,</if>
+            <if test="applicationDate != null">application_date,</if>
+            <if test="applicationDepartment != null">application_department,</if>
+            <if test="adjustmentAssetNumber != null">adjustment_asset_number,</if>
+            <if test="adjustmentOriginalAssetInfo != null">adjustment_original_asset_info,</if>
+            <if test="allocationCallOutDepartment != null">allocation_call_out_department,</if>
+            <if test="allocationCallOutBy != null">allocation_call_out_by,</if>
+            <if test="allocationCallOutDate != null">allocation_call_out_date,</if>
+            <if test="allocationCallInDepartment != null">allocation_call_in_department,</if>
+            <if test="allocationCallInBy != null">allocation_call_in_by,</if>
+            <if test="allocationCallInDate != null">allocation_call_in_date,</if>
+            <if test="allocationNewResponsiblePerson != null">allocation_new_responsible_person,</if>
+            <if test="allocationNewLocationNumber != null">allocation_new_location_number,</if>
+            <if test="lendDepartment != null">lend_department,</if>
+            <if test="lendBySponsor != null">lend_by_sponsor,</if>
+            <if test="lendPassingUnit != null">lend_passing_unit,</if>
+            <if test="reason != null">reason,</if>
+            <if test="preparedBy != null and preparedBy != ''">prepared_by,</if>
+            <if test="preparedDepartment != null and preparedDepartment != ''">prepared_department,</if>
+            <if test="corporation != null and corporation != ''">corporation,</if>
+            <if test="recordStatus != null">record_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">#{orderNumber},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="assetTotalOriginalValue != null and assetTotalOriginalValue != ''">#{assetTotalOriginalValue},</if>
+            <if test="assetTotalNetValue != null and assetTotalNetValue != ''">#{assetTotalNetValue},</if>
+            <if test="applicationDate != null">#{applicationDate},</if>
+            <if test="applicationDepartment != null">#{applicationDepartment},</if>
+            <if test="adjustmentAssetNumber != null">#{adjustmentAssetNumber},</if>
+            <if test="adjustmentOriginalAssetInfo != null">#{adjustmentOriginalAssetInfo},</if>
+            <if test="allocationCallOutDepartment != null">#{allocationCallOutDepartment},</if>
+            <if test="allocationCallOutBy != null">#{allocationCallOutBy},</if>
+            <if test="allocationCallOutDate != null">#{allocationCallOutDate},</if>
+            <if test="allocationCallInDepartment != null">#{allocationCallInDepartment},</if>
+            <if test="allocationCallInBy != null">#{allocationCallInBy},</if>
+            <if test="allocationCallInDate != null">#{allocationCallInDate},</if>
+            <if test="allocationNewResponsiblePerson != null">#{allocationNewResponsiblePerson},</if>
+            <if test="allocationNewLocationNumber != null">#{allocationNewLocationNumber},</if>
+            <if test="lendDepartment != null">#{lendDepartment},</if>
+            <if test="lendBySponsor != null">#{lendBySponsor},</if>
+            <if test="lendPassingUnit != null">#{lendPassingUnit},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="preparedBy != null and preparedBy != ''">#{preparedBy},</if>
+            <if test="preparedDepartment != null and preparedDepartment != ''">#{preparedDepartment},</if>
+            <if test="corporation != null and corporation != ''">#{corporation},</if>
+            <if test="recordStatus != null">#{recordStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTbOrder" parameterType="TbOrder">
+        update tb_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNumber != null and orderNumber != ''">order_number = #{orderNumber},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="assetTotalOriginalValue != null and assetTotalOriginalValue != ''">asset_total_original_value = #{assetTotalOriginalValue},</if>
+            <if test="assetTotalNetValue != null and assetTotalNetValue != ''">asset_total_net_value = #{assetTotalNetValue},</if>
+            <if test="applicationDate != null">application_date = #{applicationDate},</if>
+            <if test="applicationDepartment != null">application_department = #{applicationDepartment},</if>
+            <if test="adjustmentAssetNumber != null">adjustment_asset_number = #{adjustmentAssetNumber},</if>
+            <if test="adjustmentOriginalAssetInfo != null">adjustment_original_asset_info = #{adjustmentOriginalAssetInfo},</if>
+            <if test="allocationCallOutDepartment != null">allocation_call_out_department = #{allocationCallOutDepartment},</if>
+            <if test="allocationCallOutBy != null">allocation_call_out_by = #{allocationCallOutBy},</if>
+            <if test="allocationCallOutDate != null">allocation_call_out_date = #{allocationCallOutDate},</if>
+            <if test="allocationCallInDepartment != null">allocation_call_in_department = #{allocationCallInDepartment},</if>
+            <if test="allocationCallInBy != null">allocation_call_in_by = #{allocationCallInBy},</if>
+            <if test="allocationCallInDate != null">allocation_call_in_date = #{allocationCallInDate},</if>
+            <if test="allocationNewResponsiblePerson != null">allocation_new_responsible_person = #{allocationNewResponsiblePerson},</if>
+            <if test="allocationNewLocationNumber != null">allocation_new_location_number = #{allocationNewLocationNumber},</if>
+            <if test="lendDepartment != null">lend_department = #{lendDepartment},</if>
+            <if test="lendBySponsor != null">lend_by_sponsor = #{lendBySponsor},</if>
+            <if test="lendPassingUnit != null">lend_passing_unit = #{lendPassingUnit},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="preparedBy != null and preparedBy != ''">prepared_by = #{preparedBy},</if>
+            <if test="preparedDepartment != null and preparedDepartment != ''">prepared_department = #{preparedDepartment},</if>
+            <if test="corporation != null and corporation != ''">corporation = #{corporation},</if>
+            <if test="recordStatus != null">record_status = #{recordStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTbOrderById" parameterType="Long">
+        delete from tb_order where id = #{id}
+    </delete>
+
+    <delete id="deleteTbOrderByIds" parameterType="String">
+        delete from tb_order where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-ui/src/api/order/detail.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询单据明细列表
+export function listDetail(query) {
+  return request({
+    url: '/order/detail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询单据明细详细
+export function getDetail(id) {
+  return request({
+    url: '/order/detail/' + id,
+    method: 'get'
+  })
+}
+
+// 新增单据明细
+export function addDetail(data) {
+  return request({
+    url: '/order/detail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改单据明细
+export function updateDetail(data) {
+  return request({
+    url: '/order/detail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除单据明细
+export function delDetail(id) {
+  return request({
+    url: '/order/detail/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/order/order.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询资产单据列表
+export function listOrder(query) {
+  return request({
+    url: '/order/order/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询资产单据详细
+export function getOrder(id) {
+  return request({
+    url: '/order/order/' + id,
+    method: 'get'
+  })
+}
+
+// 新增资产单据
+export function addOrder(data) {
+  return request({
+    url: '/order/order',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改资产单据
+export function updateOrder(data) {
+  return request({
+    url: '/order/order',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除资产单据
+export function delOrder(id) {
+  return request({
+    url: '/order/order/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/asset/adjustment/index.vue

@@ -2,20 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="资产编号" prop="assetNumber">
-        <el-input
-          v-model="queryParams.assetNumber"
-          placeholder="请输入资产编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.assetNumber" placeholder="请输入资产编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="调整原因" prop="reason">
-        <el-input
-          v-model="queryParams.reason"
-          placeholder="请输入调整原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.reason" placeholder="请输入调整原因" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <!-- <el-form-item label="调整单号" prop="orderNumber">
         <el-input
@@ -26,12 +16,7 @@
         />
       </el-form-item> -->
       <el-form-item label="制单人" prop="preparedBy">
-        <el-input
-          v-model="queryParams.preparedBy"
-          placeholder="请输入制单人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.preparedBy" placeholder="请输入制单人" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <!-- <el-form-item label="制单部门" prop="preparedDepartment">
         <el-input
@@ -43,12 +28,7 @@
       </el-form-item> -->
       <el-form-item label="记录状态" prop="recordStatus">
         <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
-          <el-option
-            v-for="dict in dict.type.asset_record_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.asset_record_status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -59,68 +39,22 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['asset:adjustment:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['asset:adjustment:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['asset:adjustment:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['asset:adjustment:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-position"
-          size="mini"
-          :disabled="single"
-          @click="submit"
-          v-hasPermi="['asset:adjustment:submit']"
-        >提交</el-button>
+        <el-button type="info" plain icon="el-icon-position" size="mini" :disabled="single" @click="submit" v-hasPermi="['asset:adjustment:submit']">提交</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-check"
-          size="mini"
-          :disabled="single"
-          @click="audit"
-          v-hasPermi="['asset:adjustment:audit']"
-        >审核</el-button>
+        <el-button type="success" plain icon="el-icon-check" size="mini" :disabled="single" @click="audit" v-hasPermi="['asset:adjustment:audit']">审核</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['asset:adjustment:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['asset:adjustment:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['asset:adjustment:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['asset:adjustment:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -128,14 +62,14 @@
     <el-table v-loading="loading" :data="adjustmentList" @selection-change="handleSelectionChange" v-if="arr">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="资产编号" align="center" prop="assetNumber" >
+      <el-table-column label="资产编号" align="center" prop="assetNumber">
         <template slot-scope="scope">
-          <span>{{ scope.row.assetNumber != null ? assetName(scope.row.assetNumber) : ""}}</span>
+          <span>{{ scope.row.assetNumber != null ? assetName(scope.row.assetNumber) : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="资产原信息" align="center" prop="originalAssetInfo" >
+      <el-table-column label="资产原信息" align="center" prop="originalAssetInfo">
         <template slot-scope="scope">
-          <div>{{test(scope.row.originalAssetInfo) }}</div>
+          <el-button type="text" icon="el-icon-search" @click="test(scope.row.originalAssetInfo)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column label="调整原因" align="center" prop="reason" />
@@ -143,53 +77,30 @@
       <el-table-column label="制单人" align="center" prop="preparedBy" />
       <el-table-column label="制单部门" align="center" prop="preparedDepartment">
         <template slot-scope="scope">
-          <span v-if="scope.row.preparedDepartment">{{ scope.row.preparedDepartment != null ? deptName(scope.row.preparedDepartment) : ""}}</span>
+          <span v-if="scope.row.preparedDepartment">{{ scope.row.preparedDepartment != null ? deptName(scope.row.preparedDepartment) : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="记录状态" align="center" prop="recordStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>
+          <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['asset:adjustment:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['asset:adjustment:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['asset:adjustment:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['asset:adjustment:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改资产调整对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="资产编号" prop="assetNumber">
           <el-select v-model="form.assetNumber" filterable placeholder="请选择资产编号">
-            <el-option
-              v-for="item in informationList"
-              :key="item.number"
-              :label="item.name"
-              :value="item.number"
-            ></el-option>
+            <el-option v-for="item in informationList" :key="item.number" :label="item.name" :value="item.number"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="资产原信息" prop="originalAssetInfo">
@@ -205,12 +116,7 @@
           <el-input v-model="form.preparedBy" placeholder="请输入制单人" />
         </el-form-item>
         <el-form-item label="制单部门" prop="preparedDepartment">
-          <treeselect
-                v-model="form.preparedDepartment"
-                :options="deptOptions"
-                :normalizer="normalizer"
-                placeholder="选择制单部门"
-              />
+          <treeselect v-model="form.preparedDepartment" :options="deptOptions" :normalizer="normalizer" placeholder="选择制单部门" />
         </el-form-item>
         <!-- <el-form-item label="记录状态" prop="recordStatus">
           <el-select v-model="form.recordStatus" placeholder="请选择记录状态">
@@ -232,17 +138,17 @@
 </template>
 
 <script>
-import { listAdjustment, getAdjustment, delAdjustment, addAdjustment, updateAdjustment, submitAdjustment, auditAdjustment } from "@/api/asset/adjustment";
-import { listDept } from "@/api/system/dept";
-import { listInformation } from "@/api/asset/information";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listAdjustment, getAdjustment, delAdjustment, addAdjustment, updateAdjustment, submitAdjustment, auditAdjustment } from '@/api/asset/adjustment'
+import { listDept } from '@/api/system/dept'
+import { listInformation } from '@/api/asset/information'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "Adjustment",
+  name: 'Adjustment',
   dicts: ['asset_record_status'],
-  components:{
-    Treeselect
+  components: {
+    Treeselect,
   },
   data() {
     return {
@@ -266,7 +172,7 @@ export default {
       // 资产信息表格数据
       informationList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -279,7 +185,7 @@ export default {
         orderNumber: null,
         preparedBy: null,
         preparedDepartment: null,
-        recordStatus: null
+        recordStatus: null,
       },
       // 表单参数
       form: {},
@@ -288,73 +194,67 @@ export default {
         // assetNumber: [
         //   { required: true, message: "资产编号不能为空", trigger: "blur" }
         // ],
-        originalAssetInfo: [
-          { required: true, message: "资产原信息", trigger: "blur" }
-        ],
-        orderNumber: [
-          { required: true, message: "调整单号不能为空", trigger: "blur" }
-        ],
-        preparedBy: [
-          { required: true, message: "制单人不能为空", trigger: "blur" }
-        ],
-        recordStatus: [
-          { required: true, message: "记录状态不能为空", trigger: "change" }
-        ]
-      }
-    };
+        originalAssetInfo: [{ required: true, message: '资产原信息', trigger: 'blur' }],
+        orderNumber: [{ required: true, message: '调整单号不能为空', trigger: 'blur' }],
+        preparedBy: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
+        recordStatus: [{ required: true, message: '记录状态不能为空', trigger: 'change' }],
+      },
+      // 资产原信息
+      originalAssetInfo: {}
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     test(val) {
       const json = JSON.parse(val)
-      console.log(json)
+      console.log('资产原信息:', json)
     },
     /** 查询资产调整列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listDept().then((response) => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, 'deptId')
         this.arr = response.data
-      });
-      listInformation().then(response => {
-        this.informationList = response.rows;
-      });
-      listAdjustment(this.queryParams).then(response => {
-        this.adjustmentList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      })
+      listInformation().then((response) => {
+        this.informationList = response.rows
+      })
+      listAdjustment(this.queryParams).then((response) => {
+        this.adjustmentList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
         id: node.deptId,
         label: node.deptName,
         children: node.children,
-      };
+      }
     },
     //获取公司名
-    deptName(val){
-       let num = parseInt(val)
-       let arr2 = this.arr.filter(item => item.deptId===num);
-       if (arr2) {
+    deptName(val) {
+      let num = parseInt(val)
+      let arr2 = this.arr.filter((item) => item.deptId === num)
+      if (arr2) {
         return arr2[0].deptName
-       }
+      }
     },
     //获取资产名
-    assetName(val){
-      let arr2 = this.informationList.filter(item => item.number===val);
+    assetName(val) {
+      let arr2 = this.informationList.filter((item) => item.number === val)
       return arr2[0].name
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -366,101 +266,109 @@ export default {
         orderNumber: null,
         preparedBy: null,
         preparedDepartment: null,
-        recordStatus: null
-      };
-      this.resetForm("form");
+        recordStatus: null,
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.ids = selection.map((item) => item.id)
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加资产调整";
+      this.reset()
+      this.open = true
+      this.title = '添加资产调整'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
-      getAdjustment(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改资产调整";
-      });
+      getAdjustment(id).then((response) => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改资产调整'
+      })
     },
-    submit(row){
-      this.reset();
+    submit(row) {
+      this.reset()
       const id = row.id || this.ids
-      getAdjustment(id).then(response => {
-        submitAdjustment(response.data).then(response => {
-              this.$modal.msgSuccess("提交成功");
-              this.open = false;
-              this.getList();
-            });
-      });
+      getAdjustment(id).then((response) => {
+        submitAdjustment(response.data).then((response) => {
+          this.$modal.msgSuccess('提交成功')
+          this.open = false
+          this.getList()
+        })
+      })
     },
     /**审核按钮 */
-    audit(row){
-      this.reset();
+    audit(row) {
+      this.reset()
       const id = row.id || this.ids
-      getAdjustment(id).then(response => {
-        auditAdjustment(response.data).then(response => {
-              this.$modal.msgSuccess("审核成功");
-              this.open = false;
-              this.getList();
-            });
-      });
+      getAdjustment(id).then((response) => {
+        auditAdjustment(response.data).then((response) => {
+          this.$modal.msgSuccess('审核成功')
+          this.open = false
+          this.getList()
+        })
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateAdjustment(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            updateAdjustment(this.form).then((response) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
-            addAdjustment(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            addAdjustment(this.form).then((response) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除资产调整编号为"' + ids + '"的数据项？').then(function() {
-        return delAdjustment(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      const ids = row.id || this.ids
+      this.$modal
+        .confirm('是否确认删除资产调整编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delAdjustment(ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('asset/adjustment/export', {
-        ...this.queryParams
-      }, `adjustment_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
+      this.download(
+        'asset/adjustment/export',
+        {
+          ...this.queryParams,
+        },
+        `adjustment_${new Date().getTime()}.xlsx`
+      )
+    },
+  },
+}
 </script>

ruoyi-ui/src/views/order/detail/index.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="170px">
+      <el-form-item label="单据编号" prop="orderNumber">
+        <el-input
+          v-model="queryParams.orderNumber"
+          placeholder="请输入单据编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="资产编号" prop="assetNumber">
+        <el-input
+          v-model="queryParams.assetNumber"
+          placeholder="请输入资产编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
+        <el-input
+          v-model="queryParams.allocationOldResponsiblePerson"
+          placeholder="请输入【调拨】旧管理人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
+        <el-input
+          v-model="queryParams.allocationOldLocationNumber"
+          placeholder="请输入【调拨】旧功能位置编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+        <el-input
+          v-model="queryParams.allocationNewResponsiblePerson"
+          placeholder="请输入【调拨】新管理人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
+        <el-input
+          v-model="queryParams.allocationNewLocationNumber"
+          placeholder="请输入【调拨】新功能位置编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="【借出】预计归还时间" prop="lendReturnDate">
+        <el-date-picker clearable
+          v-model="queryParams.lendReturnDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择【借出】预计归还时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="【借出】实际归还时间" prop="lendActualReturnDate">
+        <el-date-picker clearable
+          v-model="queryParams.lendActualReturnDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择【借出】实际归还时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="【借出】归还经手人" prop="lendBySponsor">
+        <el-input
+          v-model="queryParams.lendBySponsor"
+          placeholder="请输入【借出】归还经手人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['order:detail:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['order:detail:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['order:detail:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['order:detail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="单据编号" align="center" prop="orderNumber" />
+      <el-table-column label="资产编号" align="center" prop="assetNumber" />
+      <el-table-column label="【调拨】旧管理人" align="center" prop="allocationOldResponsiblePerson" />
+      <el-table-column label="【调拨】旧功能位置编号" align="center" prop="allocationOldLocationNumber" />
+      <el-table-column label="【调拨】新管理人" align="center" prop="allocationNewResponsiblePerson" />
+      <el-table-column label="【调拨】新功能位置编号" align="center" prop="allocationNewLocationNumber" />
+      <el-table-column label="【借出】预计归还时间" align="center" prop="lendReturnDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lendReturnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="【借出】实际归还时间" align="center" prop="lendActualReturnDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lendActualReturnDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="【借出】归还经手人" align="center" prop="lendBySponsor" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['order:detail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['order:detail:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改单据明细对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="单据编号" prop="orderNumber">
+          <el-input v-model="form.orderNumber" placeholder="请输入单据编号" />
+        </el-form-item>
+        <el-form-item label="资产编号" prop="assetNumber">
+          <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
+        </el-form-item>
+        <el-form-item label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
+          <el-input v-model="form.allocationOldResponsiblePerson" placeholder="请输入【调拨】旧管理人" />
+        </el-form-item>
+        <el-form-item label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
+          <el-input v-model="form.allocationOldLocationNumber" placeholder="请输入【调拨】旧功能位置编号" />
+        </el-form-item>
+        <el-form-item label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+          <el-input v-model="form.allocationNewResponsiblePerson" placeholder="请输入【调拨】新管理人" />
+        </el-form-item>
+        <el-form-item label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
+          <el-input v-model="form.allocationNewLocationNumber" placeholder="请输入【调拨】新功能位置编号" />
+        </el-form-item>
+        <el-form-item label="【借出】预计归还时间" prop="lendReturnDate">
+          <el-date-picker clearable
+            v-model="form.lendReturnDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择【借出】预计归还时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="【借出】实际归还时间" prop="lendActualReturnDate">
+          <el-date-picker clearable
+            v-model="form.lendActualReturnDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择【借出】实际归还时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="【借出】归还经手人" prop="lendBySponsor">
+          <el-input v-model="form.lendBySponsor" placeholder="请输入【借出】归还经手人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDetail, getDetail, delDetail, addDetail, updateDetail } from "@/api/order/detail";
+
+export default {
+  name: "Detail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 单据明细表格数据
+      detailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNumber: null,
+        assetNumber: null,
+        allocationOldResponsiblePerson: null,
+        allocationOldLocationNumber: null,
+        allocationNewResponsiblePerson: null,
+        allocationNewLocationNumber: null,
+        lendReturnDate: null,
+        lendActualReturnDate: null,
+        lendBySponsor: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        orderNumber: [
+          { required: true, message: "单据编号不能为空", trigger: "blur" }
+        ],
+        assetNumber: [
+          { required: true, message: "资产编号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询单据明细列表 */
+    getList() {
+      this.loading = true;
+      listDetail(this.queryParams).then(response => {
+        this.detailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderNumber: null,
+        assetNumber: null,
+        allocationOldResponsiblePerson: null,
+        allocationOldLocationNumber: null,
+        allocationNewResponsiblePerson: null,
+        allocationNewLocationNumber: null,
+        lendReturnDate: null,
+        lendActualReturnDate: null,
+        lendBySponsor: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加单据明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDetail(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改单据明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDetail(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDetail(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除单据明细编号为"' + ids + '"的数据项？').then(function() {
+        return delDetail(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('order/detail/export', {
+        ...this.queryParams
+      }, `detail_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/order/order/index.vue

@@ -0,0 +1,705 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
+      <el-form-item label="单据类型" prop="orderType">
+        <el-select v-model="queryParams.orderType" placeholder="请选择单据类型" @change="onQueryTypeChange">
+          <el-option
+            v-for="dict in dict.type.asset_order_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据编号" prop="orderNumber">
+        <el-input
+          v-model="queryParams.orderNumber"
+          placeholder="请输入单据编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期" prop="applicationDate">
+        <el-date-picker clearable
+          v-model="queryParams.applicationDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="申请部门" prop="applicationDepartment">
+        <el-input
+          v-model="queryParams.applicationDepartment"
+          placeholder="请输入申请部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '1'" label="【调整】资产编号" prop="adjustmentAssetNumber">
+        <el-input
+          v-model="queryParams.adjustmentAssetNumber"
+          placeholder="请输入【调整】资产编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调出部门" prop="allocationCallOutDepartment">
+        <el-input
+          v-model="queryParams.allocationCallOutDepartment"
+          placeholder="请输入【调拨】调出部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调出经办人" prop="allocationCallOutBy">
+        <el-input
+          v-model="queryParams.allocationCallOutBy"
+          placeholder="请输入【调拨】调出经办人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调出日期" prop="allocationCallOutDate">
+        <el-date-picker clearable
+          v-model="queryParams.allocationCallOutDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择【调拨】调出日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调入部门" prop="allocationCallInDepartment">
+        <el-input
+          v-model="queryParams.allocationCallInDepartment"
+          placeholder="请输入【调拨】调入部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调入经办人" prop="allocationCallInBy">
+        <el-input
+          v-model="queryParams.allocationCallInBy"
+          placeholder="请输入【调拨】调入经办人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '2'" label="【调拨】调入日期" prop="allocationCallInDate">
+        <el-date-picker clearable
+          v-model="queryParams.allocationCallInDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择【调拨】调入日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '3'" label="【借出】借出部门" prop="lendDepartment">
+        <el-input
+          v-model="queryParams.lendDepartment"
+          placeholder="请输入【借出】借出部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '3'" label="【借出】经手人" prop="lendBySponsor">
+        <el-input
+          v-model="queryParams.lendBySponsor"
+          placeholder="请输入【借出】经手人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="queryParams.orderType === '3'" label="【借出】往来单位" prop="lendPassingUnit">
+        <el-input
+          v-model="queryParams.lendPassingUnit"
+          placeholder="请输入【借出】往来单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原因说明" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入原因说明"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制单人" prop="preparedBy">
+        <el-input
+          v-model="queryParams.preparedBy"
+          placeholder="请输入制单人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制单部门" prop="preparedDepartment">
+        <el-input
+          v-model="queryParams.preparedDepartment"
+          placeholder="请输入制单部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属公司" prop="corporation">
+        <el-input
+          v-model="queryParams.corporation"
+          placeholder="请输入所属公司"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="记录状态" prop="recordStatus">
+        <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
+          <el-option
+            v-for="dict in dict.type.asset_record_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['order:order:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['order:order:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['order:order:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['order:order:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50">
+      </el-table-column>
+      <!-- <el-table-column label="编号" align="center" prop="id" /> -->
+      <el-table-column label="单据编号" align="center" prop="orderNumber" />
+      <el-table-column label="单据类型" align="center" prop="orderType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.asset_order_type" :value="scope.row.orderType"/>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总原值" align="center" prop="assetTotalOriginalValue" />
+      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总净值" align="center" prop="assetTotalNetValue" />
+      <el-table-column label="申请日期" align="center" prop="applicationDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请部门" align="center" prop="applicationDepartmentName" />
+      <el-table-column v-if="queryParams.orderType === '1'" label="【调整】资产编号" align="center" prop="adjustmentAssetNumber" />
+      <el-table-column v-if="queryParams.orderType === '1'" label="【调整】资产原信息" align="center" prop="adjustmentOriginalAssetInfo">
+        <template slot-scope="scope">
+          <el-button type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(scope.row.adjustmentOriginalAssetInfo)">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调出部门" align="center" prop="allocationCallOutDepartmentName" />
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调出经办人" align="center" prop="allocationCallOutBy" />
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调出日期" align="center" prop="allocationCallOutDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.allocationCallOutDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调入部门" align="center" prop="allocationCallInDepartmentName" />
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调入经办人" align="center" prop="allocationCallInBy" />
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调入日期" align="center" prop="allocationCallInDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.allocationCallInDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】新管理人" align="center" prop="allocationNewResponsiblePerson" />
+      <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】新功能位置编号" align="center" prop="allocationNewLocationNumber" />
+      <el-table-column v-if="queryParams.orderType === '3'" label="【借出】借出部门" align="center" prop="lendDepartmentName" />
+      <el-table-column v-if="queryParams.orderType === '3'" label="【借出】经手人" align="center" prop="lendBySponsor" />
+      <el-table-column v-if="queryParams.orderType === '3'" label="【借出】往来单位" align="center" prop="lendPassingUnit" />
+      <el-table-column label="原因说明" align="center" prop="reason" />
+      <el-table-column label="制单人" align="center" prop="preparedBy" />
+      <el-table-column label="制单部门" align="center" prop="preparedDepartmentName" />
+      <el-table-column label="所属公司" align="center" prop="corporationName" />
+      <el-table-column label="记录状态" align="center" prop="recordStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['order:order:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['order:order:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改资产单据对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="单据编号" prop="orderNumber">
+          <el-input v-model="form.orderNumber" placeholder="单据编号（系统自动生成）" disabled/>
+        </el-form-item>
+        <el-form-item label="单据类型" prop="orderType">
+          <el-select v-model="form.orderType" placeholder="请选择单据类型" @change="onFormTypeChange">
+            <el-option
+              v-for="dict in dict.type.asset_order_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.orderType !== 1" label="资产总原值" prop="assetTotalOriginalValue">
+          <el-input v-model="form.assetTotalOriginalValue" placeholder="请输入资产总原值" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType !== 1" label="资产总净值" prop="assetTotalNetValue">
+          <el-input v-model="form.assetTotalNetValue" placeholder="请输入资产总净值" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applicationDate">
+          <el-date-picker clearable
+            v-model="form.applicationDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申请部门" prop="applicationDepartment">
+          <el-input v-model="form.applicationDepartment" placeholder="请输入申请部门" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 1" label="【调整】资产编号" prop="adjustmentAssetNumber">
+          <el-input v-model="form.adjustmentAssetNumber" placeholder="请输入【调整】资产编号" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 1" label="【调整】资产原信息" prop="adjustmentOriginalAssetInfo">
+          <el-input v-model="form.adjustmentOriginalAssetInfo" type="textarea" placeholder="系统自动补充" disabled/>
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调出部门" prop="allocationCallOutDepartment">
+          <el-input v-model="form.allocationCallOutDepartment" placeholder="请输入【调拨】调出部门" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调出经办人" prop="allocationCallOutBy">
+          <el-input v-model="form.allocationCallOutBy" placeholder="请输入【调拨】调出经办人" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调出日期" prop="allocationCallOutDate">
+          <el-date-picker clearable
+            v-model="form.allocationCallOutDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择【调拨】调出日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调入部门" prop="allocationCallInDepartment">
+          <el-input v-model="form.allocationCallInDepartment" placeholder="请输入【调拨】调入部门" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调入经办人" prop="allocationCallInBy">
+          <el-input v-model="form.allocationCallInBy" placeholder="请输入【调拨】调入经办人" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】调入日期" prop="allocationCallInDate">
+          <el-date-picker clearable
+            v-model="form.allocationCallInDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择【调拨】调入日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+          <el-input v-model="form.allocationNewResponsiblePerson" placeholder="请输入【调拨】新管理人" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 2" label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
+          <el-input v-model="form.allocationNewLocationNumber" placeholder="请输入【调拨】新功能位置编号" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 3" label="【借出】借出部门" prop="lendDepartment">
+          <el-input v-model="form.lendDepartment" placeholder="请输入【借出】借出部门" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 3" label="【借出】经手人" prop="lendBySponsor">
+          <el-input v-model="form.lendBySponsor" placeholder="请输入【借出】经手人" />
+        </el-form-item>
+        <el-form-item v-if="form.orderType === 3" label="【借出】往来单位" prop="lendPassingUnit">
+          <el-input v-model="form.lendPassingUnit" placeholder="请输入【借出】往来单位" />
+        </el-form-item>
+        <el-form-item label="原因说明" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入原因说明" />
+        </el-form-item>
+        <!-- <el-form-item label="制单人" prop="preparedBy">
+          <el-input v-model="form.preparedBy" placeholder="系统自动补充" disabled />
+        </el-form-item>
+        <el-form-item label="制单部门" prop="preparedDepartment">
+          <el-input v-model="form.preparedDepartment" placeholder="系统自动补充" disabled />
+        </el-form-item>
+        <el-form-item label="所属公司" prop="corporation">
+          <el-input v-model="form.corporation" placeholder="系统自动补充" disabled />
+        </el-form-item> -->
+        <!-- <el-form-item label="记录状态" prop="recordStatus">
+          <el-select v-model="form.recordStatus" placeholder="请选择记录状态">
+            <el-option
+              v-for="dict in dict.type.asset_record_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 【调整】资产信息 -->
+    <el-dialog title="资产调整" :visible.sync="openAdjustment" width="900px" append-to-body>
+      <el-descriptions title="资产原信息" v-if="adjustmentOriginalAssetInfo" :column="3" border>
+        <el-descriptions-item label="资产ID" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.id}}</el-descriptions-item>
+        <el-descriptions-item label="资产名称" v-if="adjustmentOriginalAssetInfo.name">{{adjustmentOriginalAssetInfo.name}}</el-descriptions-item>
+        <el-descriptions-item label="资产条码" v-if="adjustmentOriginalAssetInfo.code">{{adjustmentOriginalAssetInfo.code}}</el-descriptions-item>
+        <el-descriptions-item label="资产编号" v-if="adjustmentOriginalAssetInfo.number">{{adjustmentOriginalAssetInfo.number}}</el-descriptions-item>
+        <el-descriptions-item label="资产分类" v-if="adjustmentOriginalAssetInfo.categoryNumber">{{adjustmentOriginalAssetInfo.categoryNumber}}</el-descriptions-item>
+        <el-descriptions-item label="规格型号" v-if="adjustmentOriginalAssetInfo.specificationsModel">{{adjustmentOriginalAssetInfo.specificationsModel}}</el-descriptions-item>
+        <el-descriptions-item label="ABC分类" v-if="adjustmentOriginalAssetInfo.abcCategory">{{adjustmentOriginalAssetInfo.abcCategory}}</el-descriptions-item>
+        <el-descriptions-item label="管理状态" v-if="adjustmentOriginalAssetInfo.manageStatus">{{adjustmentOriginalAssetInfo.manageStatus}}</el-descriptions-item>
+        <el-descriptions-item label="使用部门" v-if="adjustmentOriginalAssetInfo.userDepartment">{{adjustmentOriginalAssetInfo.userDepartment}}</el-descriptions-item>
+        <el-descriptions-item label="管理部门" v-if="adjustmentOriginalAssetInfo.department">{{adjustmentOriginalAssetInfo.department}}</el-descriptions-item>
+        <el-descriptions-item label="责任人" v-if="adjustmentOriginalAssetInfo.responsiblePerson">{{adjustmentOriginalAssetInfo.responsiblePerson}}</el-descriptions-item>
+        <el-descriptions-item label="所在位置编号" v-if="adjustmentOriginalAssetInfo.locationNumber">{{adjustmentOriginalAssetInfo.locationNumber}}</el-descriptions-item>
+        <el-descriptions-item label="资产性质" v-if="adjustmentOriginalAssetInfo.property">{{adjustmentOriginalAssetInfo.property}}</el-descriptions-item>
+        <el-descriptions-item label="购置日期" v-if="adjustmentOriginalAssetInfo.purchaseDate">{{adjustmentOriginalAssetInfo.purchaseDate}}</el-descriptions-item>
+        <el-descriptions-item label="启用日期" v-if="adjustmentOriginalAssetInfo.commissioningDate">{{adjustmentOriginalAssetInfo.commissioningDate}}</el-descriptions-item>
+        <el-descriptions-item label="资产原值（元）" v-if="adjustmentOriginalAssetInfo.originalValue">{{adjustmentOriginalAssetInfo.originalValue}}</el-descriptions-item>
+        <el-descriptions-item label="使用年限">{{adjustmentOriginalAssetInfo.durableYears}}</el-descriptions-item>
+        <el-descriptions-item label="资产净值（元）" v-if="adjustmentOriginalAssetInfo.netValue">{{adjustmentOriginalAssetInfo.netValue}}</el-descriptions-item>
+        <el-descriptions-item label="资产残值（元）" v-if="adjustmentOriginalAssetInfo.residualValue">{{adjustmentOriginalAssetInfo.residualValue}}</el-descriptions-item>
+        <el-descriptions-item label="累计折旧（元）" v-if="adjustmentOriginalAssetInfo.accumulatedDepreciation">{{adjustmentOriginalAssetInfo.accumulatedDepreciation}}</el-descriptions-item>
+        <el-descriptions-item label="最近折旧日期" v-if="adjustmentOriginalAssetInfo.lastDepreciationDate">{{adjustmentOriginalAssetInfo.lastDepreciationDate}}</el-descriptions-item>
+        <el-descriptions-item label="折旧方式" v-if="adjustmentOriginalAssetInfo.depreciationMethod">{{adjustmentOriginalAssetInfo.depreciationMethod}}</el-descriptions-item>
+        <el-descriptions-item label="合同编号" v-if="adjustmentOriginalAssetInfo.contractNumber">{{adjustmentOriginalAssetInfo.contractNumber}}</el-descriptions-item>
+        <el-descriptions-item label="出厂编号" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.factoryNumber}}</el-descriptions-item>
+        <el-descriptions-item label="制造商" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.manufacturer}}</el-descriptions-item>
+        <el-descriptions-item label="供应商" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.supplier}}</el-descriptions-item>
+        <el-descriptions-item label="资产用途" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.purpose}}</el-descriptions-item>
+        <el-descriptions-item label="维保到期日期" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.maintenanceDate}}</el-descriptions-item>
+        <el-descriptions-item label="维修电话" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.maintenanceTel}}</el-descriptions-item>
+        <el-descriptions-item label="维修人员" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.maintenanceUser}}</el-descriptions-item>
+        <el-descriptions-item label="所属公司" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.corporation}}</el-descriptions-item>
+        <el-descriptions-item label="记录状态" v-if="adjustmentOriginalAssetInfo.id">{{adjustmentOriginalAssetInfo.recordStatus}}</el-descriptions-item>
+        <el-descriptions-item label="备注">
+          <el-tag size="small">学校</el-tag>
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/order/order";
+
+export default {
+  name: "Order",
+  dicts: ['asset_order_type', 'asset_record_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 资产单据表格数据
+      orderList: [],
+      orderType: 1,
+      // 资产原信息
+      openAdjustment: false,
+      adjustmentOriginalAssetInfo: null,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNumber: null,
+        orderType: '1',
+        applicationDate: null,
+        applicationDepartment: null,
+        adjustmentAssetNumber: null,
+        allocationCallOutDepartment: null,
+        allocationCallOutBy: null,
+        allocationCallOutDate: null,
+        allocationCallInDepartment: null,
+        allocationCallInBy: null,
+        allocationCallInDate: null,
+        lendDepartment: null,
+        lendBySponsor: null,
+        lendPassingUnit: null,
+        reason: null,
+        preparedBy: null,
+        preparedDepartment: null,
+        corporation: null,
+        recordStatus: null
+      },
+      orderType: null,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        // orderNumber: [
+        //   { required: true, message: "单据编号不能为空", trigger: "blur" }
+        // ],
+        orderType: [
+          { required: true, message: "单据类型不能为空", trigger: "change" }
+        ],
+        // assetTotalOriginalValue: [
+        //   { required: true, message: "资产总原值不能为空", trigger: "blur" }
+        // ],
+        // assetTotalNetValue: [
+        //   { required: true, message: "资产总净值不能为空", trigger: "blur" }
+        // ],
+        // preparedBy: [
+        //   { required: true, message: "制单人不能为空", trigger: "blur" }
+        // ],
+        // preparedDepartment: [
+        //   { required: true, message: "制单部门不能为空", trigger: "blur" }
+        // ],
+        // corporation: [
+        //   { required: true, message: "所属公司不能为空", trigger: "blur" }
+        // ],
+        recordStatus: [
+          { required: true, message: "记录状态不能为空", trigger: "change" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.orderType = 1
+    this.getList();
+  },
+  methods: {
+    /** 查询资产单据列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    onSelectOriginalAssetInfo(info) {
+      const json = JSON.parse(info)
+      this.adjustmentOriginalAssetInfo = json
+      this.openAdjustment = true
+      console.log('资产原信息:', json)
+    },
+    onQueryTypeChange() {
+      this.orderType = Number(this.queryParams.orderType)
+      this.queryParams.assetTotalOriginalValue = null,
+      this.queryParams.assetTotalNetValue = null,
+      this.queryParams.adjustmentAssetNumber = null,
+      this.queryParams.adjustmentOriginalAssetInfo = null,
+      this.queryParams.allocationCallOutDepartment = null,
+      this.queryParams.allocationCallOutBy = null,
+      this.queryParams.allocationCallOutDate = null,
+      this.queryParams.allocationCallInDepartment = null,
+      this.queryParams.allocationCallInBy = null,
+      this.queryParams.allocationCallInDate = null,
+      this.queryParams.allocationNewResponsiblePerson = null,
+      this.queryParams.allocationNewLocationNumber = null,
+      this.queryParams.lendDepartment = null,
+      this.queryParams.lendBySponsor = null,
+      this.queryParams.lendPassingUnit = null
+      this.handleQuery()
+    },
+    onFormTypeChange() {
+      this.form.assetTotalOriginalValue = null,
+      this.form.assetTotalNetValue = null,
+      this.form.adjustmentAssetNumber = null,
+      this.form.adjustmentOriginalAssetInfo = null,
+      this.form.allocationCallOutDepartment = null,
+      this.form.allocationCallOutBy = null,
+      this.form.allocationCallOutDate = null,
+      this.form.allocationCallInDepartment = null,
+      this.form.allocationCallInBy = null,
+      this.form.allocationCallInDate = null,
+      this.form.allocationNewResponsiblePerson = null,
+      this.form.allocationNewLocationNumber = null,
+      this.form.lendDepartment = null,
+      this.form.lendBySponsor = null,
+      this.form.lendPassingUnit = null
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderNumber: null,
+        orderType: null,
+        assetTotalOriginalValue: null,
+        assetTotalNetValue: null,
+        applicationDate: null,
+        applicationDepartment: null,
+        adjustmentAssetNumber: null,
+        adjustmentOriginalAssetInfo: null,
+        allocationCallOutDepartment: null,
+        allocationCallOutBy: null,
+        allocationCallOutDate: null,
+        allocationCallInDepartment: null,
+        allocationCallInBy: null,
+        allocationCallInDate: null,
+        allocationNewResponsiblePerson: null,
+        allocationNewLocationNumber: null,
+        lendDepartment: null,
+        lendBySponsor: null,
+        lendPassingUnit: null,
+        reason: null,
+        preparedBy: null,
+        preparedDepartment: null,
+        corporation: null,
+        recordStatus: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.orderType = this.orderType
+      // 默认未提交
+      this.form.recordStatus = 0
+      this.open = true;
+      this.title = "添加资产单据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOrder(id).then(response => {
+        this.form = response.data;
+        if (response.data.recordStatus > 0) {
+          this.$modal.msgWarning("已提交单据不可修改")
+          return;
+        }
+        this.open = true;
+        this.title = "修改资产单据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除资产单据编号为"' + ids + '"的数据项？').then(function() {
+        return delOrder(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('order/order/export', {
+        ...this.queryParams
+      }, `order_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>