优化修改资产单据页面,修改单据表，删除责任人、新功能位置字段

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

@@ -18,6 +18,7 @@ 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.order.service.ITbOrderDetailService;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,9 @@ public class TbOrderController extends BaseController
     @Resource
     private ITbAssetInformationService tbAssetInformationService;
 
+    @Resource
+    private ITbOrderDetailService orderDetailService;
+
     /**
      * 查询资产单据列表
      */
@@ -68,56 +72,8 @@ public class TbOrderController extends BaseController
         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 lendPassingUnit = order.getLendPassingUnit();
-            if (StrUtil.isNotBlank(lendPassingUnit)) {
-                SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(lendPassingUnit));
-                if (sysDept != null) {
-                    orderDTO.setLendPassingUnitName(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());
-                }
-            }
+            OrderDTO orderDTO = getOrderDTO(order);
+
             orderList.add(orderDTO);
         }
         return getDataTable(orderList);
@@ -143,7 +99,9 @@ public class TbOrderController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(tbOrderService.selectTbOrderById(id));
+        TbOrder tbOrder = tbOrderService.selectTbOrderById(id);
+        OrderDTO orderDTO = getOrderDTO(tbOrder);
+        return success(orderDTO);
     }
 
     /**
@@ -306,8 +264,6 @@ public class TbOrderController extends BaseController
         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("调入经办人不能为空");
@@ -333,14 +289,6 @@ public class TbOrderController extends BaseController
             return error("调出部门不能为空");
         }
 
-        if (StrUtil.isBlank(allocationNewLocationNumber)) {
-            return error("新功能位置编号不能为空");
-        }
-
-        if (StrUtil.isBlank(allocationNewResponsiblePerson)) {
-            return error("新管理人不能为空");
-        }
-
         return null;
     }
 
@@ -365,5 +313,74 @@ public class TbOrderController extends BaseController
         return null;
     }
 
+    /**
+     * 获取单据DTO
+     *
+     * @param order 单据信息
+     * @return 单据DTO
+     */
+    private OrderDTO getOrderDTO(TbOrder order) {
+        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 lendPassingUnit = order.getLendPassingUnit();
+        if (StrUtil.isNotBlank(lendPassingUnit)) {
+            SysDept sysDept = sysDeptService.selectDeptById(Long.valueOf(lendPassingUnit));
+            if (sysDept != null) {
+                orderDTO.setLendPassingUnitName(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());
+            }
+        }
+
+        int count = orderDetailService.countTbOrderDetailByOrderNumber(order.getOrderNumber());
+        orderDTO.setExistDetail(count > 0);
+
+        String adjustmentAssetNumber = order.getAdjustmentAssetNumber();
+        if (StrUtil.isNotBlank(adjustmentAssetNumber)) {
+            TbAssetInformation tbAssetInformation = tbAssetInformationService.selectTbAssetAdjustmentByAssetNumber(adjustmentAssetNumber);
+            orderDTO.setAdjustmentAssetInformation(tbAssetInformation);
+        }
+
+        return orderDTO;
+    }
 
 }

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

@@ -81,14 +81,6 @@ public class TbOrder extends BaseEntity
     @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;
@@ -156,8 +148,6 @@ public class TbOrder extends BaseEntity
         tbOrder.setAllocationCallOutBy(null);
         tbOrder.setAllocationCallOutDate(null);
         tbOrder.setAllocationCallOutDepartment(null);
-        tbOrder.setAllocationNewLocationNumber(null);
-        tbOrder.setAllocationNewResponsiblePerson(null);
     }
 
     private static void setNullLend(TbOrder tbOrder) {
@@ -308,24 +298,6 @@ public class TbOrder extends BaseEntity
     {
         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;
@@ -417,8 +389,6 @@ public class TbOrder extends BaseEntity
             .append("allocationCallInDepartment", getAllocationCallInDepartment())
             .append("allocationCallInBy", getAllocationCallInBy())
             .append("allocationCallInDate", getAllocationCallInDate())
-            .append("allocationNewResponsiblePerson", getAllocationNewResponsiblePerson())
-            .append("allocationNewLocationNumber", getAllocationNewLocationNumber())
             .append("lendDepartment", getLendDepartment())
             .append("lendBySponsor", getLendBySponsor())
             .append("lendPassingUnit", getLendPassingUnit())

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

@@ -1,6 +1,6 @@
 package com.ruoyi.order.domain.dto;
 
-import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.asset.domain.TbAssetInformation;
 import com.ruoyi.order.domain.TbOrder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +8,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class OrderDTO extends TbOrder {
+    /** 【调整】资产信息 */
+    private TbAssetInformation adjustmentAssetInformation;
+
     /** 申请部门 */
     private String applicationDepartmentName;
 
@@ -28,4 +31,7 @@ public class OrderDTO extends TbOrder {
 
     /** 所属公司名称 */
     private String corporationName;
+
+    /** 是否存在单据详细 */
+    private boolean isExistDetail;
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.order.mapper;
 
 import java.util.List;
 import com.ruoyi.order.domain.TbOrderDetail;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 单据明细Mapper接口
@@ -58,4 +59,13 @@ public interface TbOrderDetailMapper
      * @return 结果
      */
     public int deleteTbOrderDetailByIds(Long[] ids);
+
+    /**
+     * 统计单据明细
+     *
+     * @param orderNumber 单据编号
+     * @return 结果
+     */
+    @Select("SELECT COUNT(id) FROM tb_order_detail WHERE order_number = #{orderNumber}")
+    int countTbOrderDetailByOrderNumber(String orderNumber);
 }

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

@@ -58,4 +58,12 @@ public interface ITbOrderDetailService
      * @return 结果
      */
     public int deleteTbOrderDetailById(Long id);
+
+    /**
+     * 统计单据明细
+     *
+     * @param orderNumber 单据编号
+     * @return 结果
+     */
+    int countTbOrderDetailByOrderNumber(String orderNumber);
 }

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

@@ -90,4 +90,15 @@ public class TbOrderDetailServiceImpl implements ITbOrderDetailService
     {
         return tbOrderDetailMapper.deleteTbOrderDetailById(id);
     }
+
+    /**
+     * 统计单据明细
+     *
+     * @param orderNumber 单据编号
+     * @return 结果
+     */
+    @Override
+    public int countTbOrderDetailByOrderNumber(String orderNumber) {
+        return tbOrderDetailMapper.countTbOrderDetailByOrderNumber(orderNumber);
+    }
 }

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

@@ -20,8 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
@@ -33,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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, 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">
@@ -83,8 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -109,8 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -139,8 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>

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

@@ -1,14 +1,14 @@
 <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-form-item label="单据编号" prop="orderNumber">
         <el-input
           v-model="queryParams.orderNumber"
           placeholder="请输入单据编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="资产编号" prop="assetNumber">
         <el-input
           v-model="queryParams.assetNumber"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
+      <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
         <el-input
           v-model="queryParams.allocationOldResponsiblePerson"
           placeholder="请输入【调拨】旧管理人"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
+      <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
         <el-input
           v-model="queryParams.allocationOldLocationNumber"
           placeholder="请输入【调拨】旧功能位置编号"
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+      <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
         <el-input
           v-model="queryParams.allocationNewResponsiblePerson"
           placeholder="请输入【调拨】新管理人"
@@ -41,15 +41,17 @@
           @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 v-if="orderInfo.orderType === 2" label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
+        <el-select v-model="queryParams.allocationNewLocationNumber" placeholder="请选择【调拨】新功能位置">
+          <el-option
+            v-for="item in locationList"
+            :key="item.number"
+            :label="item.name"
+            :value="item.number"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="【借出】预计归还时间" prop="lendReturnDate">
+      <el-form-item v-if="orderInfo.orderType === 3" label="【借出】预计归还时间" prop="lendReturnDate">
         <el-date-picker clearable
           v-model="queryParams.lendReturnDate"
           type="date"
@@ -57,7 +59,7 @@
           placeholder="请选择【借出】预计归还时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="【借出】实际归还时间" prop="lendActualReturnDate">
+      <el-form-item v-if="orderInfo.orderType === 3" label="【借出】实际归还时间" prop="lendActualReturnDate">
         <el-date-picker clearable
           v-model="queryParams.lendActualReturnDate"
           type="date"
@@ -65,7 +67,7 @@
           placeholder="请选择【借出】实际归还时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="【借出】归还经手人" prop="lendBySponsor">
+      <el-form-item v-if="orderInfo.orderType === 3" label="【借出】归还经手人" prop="lendBySponsor">
         <el-input
           v-model="queryParams.lendBySponsor"
           placeholder="请输入【借出】归还经手人"
@@ -80,7 +82,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5"  v-if="orderInfo.id === null || orderInfo.recordStatus < 1">
         <el-button
           type="primary"
           plain
@@ -90,7 +92,7 @@
           v-hasPermi="['order:detail:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5"  v-if="orderInfo.id === null || orderInfo.recordStatus < 1">
         <el-button
           type="success"
           plain
@@ -101,7 +103,7 @@
           v-hasPermi="['order:detail:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col :span="1.5"  v-if="orderInfo.id === null || orderInfo.recordStatus < 1">
         <el-button
           type="danger"
           plain
@@ -128,23 +130,23 @@
     <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="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">
+      <el-table-column v-if="orderInfo.orderType === 2" label="【调拨】旧管理人" align="center" prop="allocationOldResponsiblePerson" />
+      <el-table-column v-if="orderInfo.orderType === 2" label="【调拨】旧功能位置编号" align="center" prop="allocationOldLocationNumber" />
+      <el-table-column v-if="orderInfo.orderType === 2" label="【调拨】新管理人" align="center" prop="allocationNewResponsiblePerson" />
+      <el-table-column v-if="orderInfo.orderType === 2" label="【调拨】新功能位置编号" align="center" prop="allocationNewLocationNumber" />
+      <el-table-column v-if="orderInfo.orderType === 2" 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">
+      <el-table-column v-if="orderInfo.orderType === 3" 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 v-if="orderInfo.orderType === 3" 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">
@@ -175,27 +177,34 @@
     />
 
     <!-- 添加或修改单据明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="170px">
         <el-form-item label="单据编号" prop="orderNumber">
-          <el-input v-model="form.orderNumber" placeholder="请输入单据编号" />
+          <el-input v-model="form.orderNumber" placeholder="请输入单据编号" disabled/>
         </el-form-item>
         <el-form-item label="资产编号" prop="assetNumber">
           <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
         </el-form-item>
-        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
-          <el-input v-model="form.allocationOldResponsiblePerson" placeholder="请输入【调拨】旧管理人" />
+        <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
+          <el-input v-model="form.allocationOldResponsiblePerson" placeholder="系统自动补充" disabled/>
         </el-form-item>
-        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
-          <el-input v-model="form.allocationOldLocationNumber" placeholder="请输入【调拨】旧功能位置编号" />
+        <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】旧功能位置" prop="allocationOldLocationNumber">
+          <el-input v-model="form.allocationOldLocationNumber" placeholder="系统自动补充" disabled/>
         </el-form-item>
-        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+        <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
           <el-input v-model="form.allocationNewResponsiblePerson" placeholder="请输入【调拨】新管理人" />
         </el-form-item>
-        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
-          <el-input v-model="form.allocationNewLocationNumber" placeholder="请输入【调拨】新功能位置编号" />
+        <el-form-item v-if="orderInfo.orderType === 2" label="【调拨】新功能位置" prop="allocationNewLocationNumber">
+          <el-select v-model="form.allocationNewLocationNumber" placeholder="请选择【调拨】新功能位置">
+            <el-option
+              v-for="item in locationList"
+              :key="item.number"
+              :label="item.name"
+              :value="item.number"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="【借出】预计归还时间" prop="lendReturnDate">
+        <el-form-item v-if="orderInfo.orderType === 3" label="【借出】预计归还时间" prop="lendReturnDate">
           <el-date-picker clearable
             v-model="form.lendReturnDate"
             type="date"
@@ -203,7 +212,7 @@
             placeholder="请选择【借出】预计归还时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="【借出】实际归还时间" prop="lendActualReturnDate">
+        <el-form-item v-if="orderInfo.orderType === 3" label="【借出】实际归还时间" prop="lendActualReturnDate">
           <el-date-picker clearable
             v-model="form.lendActualReturnDate"
             type="date"
@@ -211,7 +220,7 @@
             placeholder="请选择【借出】实际归还时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="【借出】归还经手人" prop="lendBySponsor">
+        <el-form-item v-if="orderInfo.orderType === 3" label="【借出】归还经手人" prop="lendBySponsor">
           <el-input v-model="form.lendBySponsor" placeholder="请输入【借出】归还经手人" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -228,33 +237,35 @@
 
 <script>
 import { listDetail, getDetail, delDetail, addDetail, updateDetail } from "@/api/order/detail";
-
+import { listLocation } from "@/api/asset/location";
 export default {
   name: "Detail",
   props: {
     orderInfo: {
       type: Object,
-      default: {
-        id: null,
-        orderNumber: null,
-        orderType: null,
-        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
+      default: () => { 
+        return {
+          id: null,
+          orderNumber: null,
+          orderType: null,
+          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
+        }
       }
     }
   },
@@ -274,6 +285,8 @@ export default {
       total: 0,
       // 单据明细表格数据
       detailList: [],
+      // 所属位置表格数据
+      locationList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -282,7 +295,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        orderNumber: null,
+        orderNumber: this.orderInfo.orderNumber,
         assetNumber: null,
         allocationOldResponsiblePerson: null,
         allocationOldLocationNumber: null,
@@ -296,9 +309,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        orderNumber: [
-          { required: true, message: "单据编号不能为空", trigger: "blur" }
-        ],
+        // orderNumber: [
+        //   { required: true, message: "单据编号不能为空", trigger: "blur" }
+        // ],
         assetNumber: [
           { required: true, message: "资产编号不能为空", trigger: "blur" }
         ],
@@ -306,6 +319,8 @@ export default {
     };
   },
   created() {
+    console.log('单据明细-单据信息：', this.orderInfo)
+    this.getLocation()
     this.getList();
   },
   methods: {
@@ -318,6 +333,12 @@ export default {
         this.loading = false;
       });
     },
+    /** 获取所属位置 */
+    getLocation() {
+      listLocation().then((response) => {
+        this.locationList = response.rows;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -327,7 +348,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        orderNumber: null,
+        orderNumber: this.orderInfo.orderNumber,
         assetNumber: null,
         allocationOldResponsiblePerson: null,
         allocationOldLocationNumber: null,
@@ -359,6 +380,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.orderNumber = this.orderInfo.orderNumber
       this.open = true;
       this.title = "添加单据明细";
     },
@@ -411,3 +433,15 @@ export default {
   }
 };
 </script>
+
+<style lang="less" scoped>
+/deep/ .vue-treeselect{
+  display:inline-block;
+}
+.queryForm{
+  /deep/ .vue-treeselect{
+    width: 205px;
+    height: 32px;
+  }
+}
+</style>

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

@@ -234,7 +234,7 @@
       <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 v-if="queryParams.orderType === '1'" type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(scope.row.adjustmentOriginalAssetInfo)">查看</el-button>
+          <el-button v-if="queryParams.orderType === '1'" type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(scope.row)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调出部门" align="center" prop="allocationCallOutDepartmentName" />
@@ -251,8 +251,6 @@
           <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="lendPassingUnitName" />
@@ -272,7 +270,7 @@
             size="mini"
             type="text"
             icon="el-icon-document"
-            @click="handleUpdate(scope.row)"
+            @click="onSelectopenDetail(scope.row)"
             v-hasPermi="['order:order:edit']"
           >明细</el-button>
           <el-button
@@ -383,19 +381,6 @@
             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-select v-model="form.allocationNewLocationNumber" placeholder="请选择【调拨】新功能位置">
-            <el-option
-              v-for="item in locationList"
-              :key="item.number"
-              :label="item.name"
-              :value="item.number"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item v-if="form.orderType === 3" label="【借出】借出部门" prop="lendDepartment">
           <treeselect
             v-model="form.lendDepartment"
@@ -440,18 +425,21 @@
       </el-form>
       <p class="msg" v-if="form.orderType !== 1"><i class="el-icon-info"></i> 保存生成单据后，记得完善单据明细后再提交哦</p>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.orderType === 1" type="warning" @click="submitForm(1)">提 交</el-button>
+        <el-button v-if="form.orderType === 1 || form.existDetail" type="warning" @click="submitForm(1)">提 交</el-button>
         <el-button type="primary" @click="submitForm(0)">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 【调整】资产信息 -->
-    <el-dialog title="资产调整" :visible.sync="openAdjustment" width="900px" append-to-body>
+    <el-dialog title="资产调整信息" :visible.sync="openAdjustment" width="900px" append-to-body>
+      <AssetInfo :title="'现资产信息'" :assetInfo="adjustmentAssetInformation"/>
+      <div style="height: 20px;"></div>
       <AssetInfo :title="'资产原信息'" :assetInfo="adjustmentOriginalAssetInfo"/>
     </el-dialog>
 
-    <el-dialog title="">
+    <el-dialog title="单据详细信息" :visible.sync="openDetail" width="1300px" append-to-body>
+      <OrderDetail v-if="openDetail" :orderInfo="orderInfo"/>
     </el-dialog>
   </div>
 </template>
@@ -459,7 +447,6 @@
 <script>
 import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/order/order";
 import { deptTreeSelect } from "@/api/system/user";
-import { listLocation } from "@/api/asset/location";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -467,6 +454,7 @@ export default {
   dicts: ['asset_order_type', 'asset_record_status'],
   components: {
     AssetInfo: () => import('@/components/asset/assetCard.vue'),
+    OrderDetail: () => import('@/views/order/detail/index.vue'),
     Treeselect,
   },
   data() {
@@ -486,11 +474,13 @@ export default {
       // 资产单据表格数据
       orderList: [],
       orderType: 1,
-      // 所属位置表格数据
-      locationList: [],
       // 资产原信息
       openAdjustment: false,
       adjustmentOriginalAssetInfo: null,
+      adjustmentAssetInformation: null,
+      // 单据详细
+      openDetail: false,
+      orderInfo: null,
       // 部门树选项
       deptOptions: [],
       // 弹出层标题
@@ -559,7 +549,6 @@ export default {
   created() {
     this.orderType = 1
     this.getDeptTree()
-    this.getLocation()
     this.getList();
   },
   methods: {
@@ -578,23 +567,23 @@ export default {
         this.deptOptions = response.data;
       });
     },
-    /** 获取所属位置 */
-    getLocation() {
-      listLocation().then((response) => {
-        this.locationList = response.rows;
-      });
-    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
-    onSelectOriginalAssetInfo(info) {
-      const json = JSON.parse(info)
+    onSelectOriginalAssetInfo(row) {
+      this.adjustmentAssetInformation = row.adjustmentAssetInformation
+      const json = JSON.parse(row.adjustmentOriginalAssetInfo)
       this.adjustmentOriginalAssetInfo = json
       this.openAdjustment = true
       console.log('资产原信息:', json)
     },
+    onSelectopenDetail(order) {
+      this.orderInfo = order
+      console.log('单据信息:', order)
+      this.openDetail = true
+    },
     onQueryTypeChange() {
       this.orderType = Number(this.queryParams.orderType)
       this.queryParams.assetTotalOriginalValue = null,
@@ -693,6 +682,7 @@ export default {
       const id = row.id || this.ids
       getOrder(id).then(response => {
         this.form = response.data;
+        console.log('修改表单信息:', this.form)
         if (response.data.recordStatus > 0) {
           this.$modal.msgWarning("已提交单据不可修改")
           return;