设备移交、费用、报废

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -132,6 +132,7 @@ public class CmcCarApprovalController extends BaseController
             BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {
                 CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
+                cmcCar.setStatus("0");
                 if (cmcCar.getDayCost() != null)
                     estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
             }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -131,20 +131,7 @@ public class CmcDeviceApprovalController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formDataJson.getString("deviceApplyId"));
-        if (formDataJson.getString("managerComment") != null && formDataJson.getString("dispatchComment") == null) {
-            cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
-            cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
-            cmcDeviceApproval.setManagerTime(new Date());
-        }
-        if (formDataJson.getDate("confirmDate") != null) {
-            cmcDeviceApproval.setConfirmDate(formDataJson.getDate("confirmDate"));
-        }
-        if (formDataJson.getDate("returnDate") != null) {
-            cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
-            cmcDeviceApproval.setState(formDataJson.getString("state"));
-            cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
-        }
-        if (formDataJson.getString("dispatchComment") != null) {
+        if (formDataJson.getString("modifyDevices") != null && formDataJson.getString("managerComment") == null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
             cmcDeviceApproval.setDispatchTime(new Date());
@@ -162,6 +149,31 @@ public class CmcDeviceApprovalController extends BaseController
             }
             cmcDeviceApproval.setEstimateCost(estimateCost);
         }
+        if (formDataJson.getString("managerComment") != null && formDataJson.getString("confirmDate") == null) {
+            cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
+            cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
+            cmcDeviceApproval.setManagerTime(new Date());
+        }
+        if (formDataJson.getDate("confirmDate") != null && formDataJson.getDate("returnDate") == null) {
+            cmcDeviceApproval.setConfirmDate(new Date());
+            CmcDevice cmcDevice = new CmcDevice();
+            cmcDevice.setStatus("0"); //确认被领用
+            cmcDeviceService.updateCmcDevice(cmcDevice);
+        }
+        if (formDataJson.getDate("returnDate") != null) {
+            cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
+            if (formDataJson.getJSONArray("repairDevices").size() > 0) {
+                String deviceString = formDataJson.getString("repairDevices").substring(1, formDataJson.getString("repairDevices").length() - 1);
+                cmcDeviceApproval.setRepairDevices(deviceString);
+                String[] devices = deviceString.split(",");
+                for (String device : devices) {
+                    CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                    cmcDevice.setStatus("2"); //需维修
+                    cmcDeviceService.updateCmcDevice(cmcDevice);
+                }
+            }
+            cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
+        }
         cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval);
         return AjaxResult.success("修改设备审批表成功");
     }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceExpenseController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcDeviceExpenseController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceExpense cmcDeviceExpense)
     {
+        cmcDeviceExpense.setDeviceExpenseId(new SnowFlake().generateId());
         return toAjax(cmcDeviceExpenseService.insertCmcDeviceExpense(cmcDeviceExpense));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceHandoverController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcDeviceHandoverController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceHandover cmcDeviceHandover)
     {
+        cmcDeviceHandover.setDeviceHandoverId(new SnowFlake().generateId());
         return toAjax(cmcDeviceHandoverService.insertCmcDeviceHandover(cmcDeviceHandover));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceScrapController.java

@@ -2,6 +2,12 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcCar;
+import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.oa.service.ICmcDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +39,12 @@ public class CmcDeviceScrapController extends BaseController
     @Autowired
     private ICmcDeviceScrapService cmcDeviceScrapService;
 
+    @Autowired
+    private ICmcDeviceService cmcDeviceService;
+
+    @Autowired
+    private ICmcCarService cmcCarService;
+
     /**
      * 查询cmc设备报废列表
      */
@@ -72,6 +84,17 @@ public class CmcDeviceScrapController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceScrap cmcDeviceScrap)
     {
+        cmcDeviceScrap.setDeviceScrapId(new SnowFlake().generateId());
+        if (cmcDeviceScrap.getDeviceId() != null) {
+            CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(cmcDeviceScrap.getDeviceId());
+            cmcDevice.setStatus("4");
+            cmcDeviceService.updateCmcDevice(cmcDevice);
+        }
+        if (cmcDeviceScrap.getCarId() != null) {
+            CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(cmcDeviceScrap.getCarId());
+            cmcCar.setStatus("4");
+            cmcCarService.updateCmcCar(cmcCar);
+        }
         return toAjax(cmcDeviceScrapService.insertCmcDeviceScrap(cmcDeviceScrap));
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCar.java

@@ -65,6 +65,10 @@ public class CmcCar extends BaseEntity
     @Excel(name = "单日成本")
     private BigDecimal dayCost;
 
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
     public void setCarId(Integer carId)
     {
         this.carId = carId;
@@ -173,6 +177,15 @@ public class CmcCar extends BaseEntity
     {
         return dayCost;
     }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
 
     @Override
     public String toString() {
@@ -188,6 +201,7 @@ public class CmcCar extends BaseEntity
                 .append("brand", getBrand())
                 .append("isRent", getIsRent())
                 .append("dayCost", getDayCost())
+                .append("status", getStatus())
                 .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarExpense.java

@@ -22,11 +22,13 @@ public class CmcCarExpense extends BaseEntity
     private String carExpenseId;
 
     /** 车辆id */
-    @Excel(name = "车辆id")
+    @Excel(name = "车牌号")
+    private String licensePlate;
     private Integer carId;
+    private CmcCar car;
 
-    /** 费用类型 */
-    @Excel(name = "费用类型")
+    /** 费用类型（0保险费,1维修保养费,2轮胎费） */
+    @Excel(name = "费用类型", readConverterExp = "0=保险费,1=维修/保养费,2=轮胎费")
     private String expenseType;
 
     /** 费用金额 */

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

@@ -117,9 +117,9 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "调度审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dispatchTime;
 
-    /** 设备状况 */
-    @Excel(name = "设备状况")
-    private String state;
+    /** 需维修设备id */
+    @Excel(name = "需维修设备id")
+    private String repairDevices;
 
     public void setDeviceApplyId(String deviceApplyId)
     {
@@ -347,14 +347,14 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return dispatchTime;
     }
-    public void setState(String state)
+    public void setRepairDevices(String repairDevices)
     {
-        this.state = state;
+        this.repairDevices = repairDevices;
     }
 
-    public String getState()
+    public String getRepairDevices()
     {
-        return state;
+        return repairDevices;
     }
 
     @Override
@@ -364,6 +364,7 @@ public class CmcDeviceApproval extends BaseEntity
             .append("applier", getApplier())
             .append("devices", getDevices())
             .append("modifyDevices", getModifyDevices())
+            .append("repairDevices", getRepairDevices())
             .append("projectId", getProjectId())
             .append("applyReason", getApplyReason())
             .append("beginDate", getBeginDate())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceExpense.java

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -22,15 +23,33 @@ public class CmcDeviceExpense extends BaseEntity
     private String deviceExpenseId;
 
     /** 设备id */
-    @Excel(name = "设备id")
-    private Long deviceId;
+    private Integer deviceId;
+    private CmcDevice device;
+
+    @Excel(name = "设备编码")
+    private String deviceNumber;
+
+    @Excel(name = "设备名称")
+    private String name;
+
+    @Excel(name = "出厂编号")
+    private String code;
+
+    @Excel(name = "品牌")
+    private String brand;
+
+    @Excel(name = "系列")
+    private String series;
 
     /** 负责人id */
-    @Excel(name = "负责人id")
     private Long userId;
 
-    /** 费用类型（0检定费、1维修保养费） */
-    @Excel(name = "费用类型", readConverterExp = "0=检定费、1维修保养费")
+    @Excel(name = "负责人")
+    private String nickName;
+    private SysUser user;
+
+    /** 费用类型（0保险费,1维修保养费,2检定费） */
+    @Excel(name = "费用类型", readConverterExp = "0=保险费,1=维修/保养费,2=检定费")
     private String expenseType;
 
     /** 费用金额 */
@@ -55,15 +74,29 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return deviceExpenseId;
     }
-    public void setDeviceId(Long deviceId) 
+    public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
+    public Integer getDeviceId()
     {
         return deviceId;
     }
+    public void setDevice(CmcDevice device)
+    {
+        this.device = device;
+        this.deviceNumber = device.getDeviceNumber();
+        this.brand = device.getBrand();
+        this.series = device.getSeries();
+        this.name = device.getName();
+        this.code = device.getCode();
+    }
+
+    public CmcDevice getDevice()
+    {
+        return device;
+    }
     public void setUserId(Long userId) 
     {
         this.userId = userId;
@@ -73,6 +106,16 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return userId;
     }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.nickName = user.getNickName();
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
     public void setExpenseType(String expenseType) 
     {
         this.expenseType = expenseType;

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceHandover.java

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,16 +23,34 @@ public class CmcDeviceHandover extends BaseEntity
     private String deviceHandoverId;
 
     /** 设备id */
-    @Excel(name = "设备id")
-    private Long deviceId;
+    private Integer deviceId;
+    private CmcDevice device;
+
+    @Excel(name = "设备编码")
+    private String deviceNumber;
+
+    @Excel(name = "设备名称")
+    private String name;
+
+    @Excel(name = "出厂编号")
+    private String code;
+
+    @Excel(name = "品牌")
+    private String brand;
+
+    @Excel(name = "系列")
+    private String series;
+
 
     /** 移交部门id */
-    @Excel(name = "移交部门id")
-    private Long handoverDept;
+    @Excel(name = "移交部门")
+    private String handoverDeptName;
+    private Long handoverDeptId;
 
     /** 移交人id */
-    @Excel(name = "移交人id")
-    private Long handoverUser;
+    @Excel(name = "移交人")
+    private String handoverNickName;
+    private Long handoverUserId;
 
     /** 移交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -38,12 +58,22 @@ public class CmcDeviceHandover extends BaseEntity
     private Date handoverDate;
 
     /** 接收部门id */
-    @Excel(name = "接收部门id")
-    private Long receiveDept;
+    @Excel(name = "接收部门")
+    private String receiveDeptName;
+    private Long receiveDeptId;
 
     /** 接收人id */
-    @Excel(name = "接收人id")
-    private Long receiveUser;
+    @Excel(name = "接收人")
+    private String receiveNickName;
+    private Long receiveUserId;
+
+    private SysUser handoverUser;
+
+    private SysUser receiveUser;
+
+    private SysDept handoverDept;
+
+    private SysDept receiveDept;
 
     /** 设备软件说明 */
     @Excel(name = "设备软件说明")
@@ -62,32 +92,46 @@ public class CmcDeviceHandover extends BaseEntity
     {
         return deviceHandoverId;
     }
-    public void setDeviceId(Long deviceId) 
+    public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
+    public Integer getDeviceId()
     {
         return deviceId;
     }
-    public void setHandoverDept(Long handoverDept) 
+    public void setDevice(CmcDevice device)
     {
-        this.handoverDept = handoverDept;
+        this.device = device;
+        this.deviceNumber = device.getDeviceNumber();
+        this.brand = device.getBrand();
+        this.series = device.getSeries();
+        this.name = device.getName();
+        this.code = device.getCode();
     }
 
-    public Long getHandoverDept() 
+    public CmcDevice getDevice()
     {
-        return handoverDept;
+        return device;
     }
-    public void setHandoverUser(Long handoverUser) 
+    public void setHandoverDeptId(Long handoverDeptId)
     {
-        this.handoverUser = handoverUser;
+        this.handoverDeptId = handoverDeptId;
     }
 
-    public Long getHandoverUser() 
+    public Long getHandoverDeptId()
     {
-        return handoverUser;
+        return handoverDeptId;
+    }
+    public void setHandoverUserId(Long handoverUserId)
+    {
+        this.handoverUserId = handoverUserId;
+    }
+
+    public Long getHandoverUserId()
+    {
+        return handoverUserId;
     }
     public void setHandoverDate(Date handoverDate) 
     {
@@ -98,24 +142,64 @@ public class CmcDeviceHandover extends BaseEntity
     {
         return handoverDate;
     }
-    public void setReceiveDept(Long receiveDept) 
+    public void setReceiveDeptId(Long receiveDeptId)
     {
-        this.receiveDept = receiveDept;
+        this.receiveDeptId = receiveDeptId;
     }
 
-    public Long getReceiveDept() 
+    public Long getReceiveDeptId()
     {
-        return receiveDept;
+        return receiveDeptId;
     }
-    public void setReceiveUser(Long receiveUser) 
+    public void setReceiveUserId(Long receiveUserId)
+    {
+        this.receiveUserId = receiveUserId;
+    }
+
+    public Long getReceiveUserId()
+    {
+        return receiveUserId;
+    }
+    public void setHandoverUser(SysUser handoverUser)
+    {
+        this.handoverUser = handoverUser;
+        this.handoverNickName = handoverUser.getNickName();
+    }
+
+    public SysUser getHandoverUser()
+    {
+        return handoverUser;
+    }
+    public void setReceiveUser(SysUser receiveUser)
     {
         this.receiveUser = receiveUser;
+        this.receiveNickName = receiveUser.getNickName();
     }
 
-    public Long getReceiveUser() 
+    public SysUser getReceiveUser()
     {
         return receiveUser;
     }
+    public void setReceiveDept(SysDept receiveDept)
+    {
+        this.receiveDept = receiveDept;
+        this.receiveDeptName = receiveDept.getDeptName();
+    }
+
+    public SysDept getReceiveDept()
+    {
+        return receiveDept;
+    }
+    public void setHandoverDept(SysDept handoverDept)
+    {
+        this.handoverDept = handoverDept;
+        this.handoverDeptName = handoverDept.getDeptName();
+    }
+
+    public SysDept getHandoverDept()
+    {
+        return handoverDept;
+    }
     public void setDescription(String description) 
     {
         this.description = description;
@@ -140,11 +224,11 @@ public class CmcDeviceHandover extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceHandoverId", getDeviceHandoverId())
             .append("deviceId", getDeviceId())
-            .append("handoverDept", getHandoverDept())
-            .append("handoverUser", getHandoverUser())
+            .append("handoverDeptId", getHandoverDeptId())
+            .append("handoverUserId", getHandoverUserId())
             .append("handoverDate", getHandoverDate())
-            .append("receiveDept", getReceiveDept())
-            .append("receiveUser", getReceiveUser())
+            .append("receiveDeptId", getReceiveDeptId())
+            .append("receiveUserId", getReceiveUserId())
             .append("description", getDescription())
             .append("reason", getReason())
             .append("remark", getRemark())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceScrap.java

@@ -23,11 +23,11 @@ public class CmcDeviceScrap extends BaseEntity
 
     /** 设备id */
     @Excel(name = "设备id")
-    private Long deviceId;
+    private Integer deviceId;
 
     /** 车辆id */
     @Excel(name = "车辆id")
-    private Long carId;
+    private Integer carId;
 
     /** 原价值 */
     @Excel(name = "原价值")
@@ -59,21 +59,21 @@ public class CmcDeviceScrap extends BaseEntity
     {
         return deviceScrapId;
     }
-    public void setDeviceId(Long deviceId) 
+    public void setDeviceId(Integer deviceId) 
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
+    public Integer getDeviceId() 
     {
         return deviceId;
     }
-    public void setCarId(Long carId)
+    public void setCarId(Integer carId)
     {
         this.carId = carId;
     }
 
-    public Long getCarId()
+    public Integer getCarId()
     {
         return carId;
     }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarMapper.xml

@@ -17,6 +17,7 @@
         <result property="isRent"    column="is_rent"    />
         <result property="dayCost"    column="day_cost"    />
         <result property="remark"    column="remark"    />
+        <result property="status"    column="status"    />
         <association property="driverUser"    javaType="SysUser"         resultMap="SysUserResult" />
     </resultMap>
 
@@ -26,7 +27,7 @@
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, c.expect_life, c.expect_km, c.series, c.brand, c.is_rent, c.day_cost, c.remark from cmc_car as c
+        select c.car_id, c.license_plate, c.driver, u.nick_name, c.acquisition_time, c.cost, c.expect_life, c.expect_km, c.series, c.brand, c.is_rent, c.day_cost, c.remark, c.status from cmc_car as c
         left join sys_user as u on u.user_id = c.driver
     </sql>
 
@@ -44,6 +45,7 @@
             <if test="isRent != null  and isRent != ''"> and c.isRent = #{isRent}</if>
             <if test="dayCost != null  and dayCost != ''"> and c.day_cost = #{dayCost}</if>
             <if test="remark != null  and remark != ''"> and c.remark = #{remark}</if>
+            <if test="status != null  and status != ''"> and c.status = #{status}</if>
         </where>
     </select>
 
@@ -66,6 +68,7 @@
             <if test="isRent != null">is_rent,</if>
             <if test="dayCost != null">day_cost,</if>
             <if test="remark != null">remark,</if>
+            <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
@@ -79,6 +82,7 @@
             <if test="isRent != null">#{isRent},</if>
             <if test="dayCost != null">#{dayCost},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="status != null">#{status},</if>
         </trim>
     </insert>
 
@@ -96,6 +100,7 @@
             <if test="isRent != null">is_rent = #{isRent},</if>
             <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where car_id = #{carId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="useDept"    column="use_dept"    />
         <result property="devices"    column="devices"    />
         <result property="modifyDevices"    column="modify_devices"    />
+        <result property="repairDevices"    column="repair_devices"    />
         <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
@@ -23,7 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
         <result property="remark"    column="remark"    />
-        <result property="state"    column="state"    />
         <result property="managerTime"    column="manager_time"    />
         <result property="dispatchTime"    column="dispatch_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcDeviceApprovalVo">
         select da.device_apply_id, da.applier, u.nick_name as applier_nick_name, da.use_dept, d.dept_name, da.devices, da.modify_devices, da.project_id, p.project_number, p.project_name,
-               da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.end_date, da.days, da.state, da.manager_user_id, u1.nick_name as manager_nick_name, da.manager_comment,
+               da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.end_date, da.days, da.repair_devices, da.manager_user_id, u1.nick_name as manager_nick_name, da.manager_comment,
                da.dispatcher, u2.nick_name as dispatch_nick_name, da.dispatch_comment, da.estimate_cost, da.remark, da.manager_time, da.dispatch_time from cmc_device_approval as da
             left join sys_user as u on u.user_id = da.applier
             left join sys_user as u1 on u1.user_id = da.manager_user_id
@@ -77,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useDept != null "> and da.use_dept = #{useDept}</if>
             <if test="devices != null  and devices != ''"> and da.devices like concat('%', #{devices}, '%')</if>
             <if test="modifyDevices != null  and modifyDevices != ''"> and da.modify_devices like concat('%', #{modifyDevices}, '%')</if>
+            <if test="repairDevices != null  and repairDevices != ''"> and da.repair_devices like concat('%', #{repairDevices}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>
@@ -107,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useDept != null">use_dept,</if>
             <if test="devices != null">devices,</if>
             <if test="modifyDevices != null">modify_devices,</if>
+            <if test="repairDevices != null">repair_devices,</if>
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDate != null">apply_date,</if>
@@ -120,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">dispatch_comment,</if>
             <if test="estimateCost != null">estimate_cost,</if>
             <if test="remark != null">remark,</if>
-            <if test="state != null">state,</if>
             <if test="managerTime != null">manager_time,</if>
             <if test="dispatchTime != null">dispatch_time,</if>
          </trim>
@@ -130,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useDept != null">#{useDept},</if>
             <if test="devices != null">#{devices},</if>
             <if test="modifyDevices != null">#{modifyDevices},</if>
+            <if test="repairDevices != null">#{repairDevices},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDate != null">#{applyDate},</if>
@@ -143,7 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">#{dispatchComment},</if>
             <if test="estimateCost != null">#{estimateCost},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="state != null">#{state},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="dispatchTime != null">#{dispatchTime},</if>
          </trim>
@@ -156,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useDept != null">use_dept = #{useDept},</if>
             <if test="devices != null">devices = #{devices},</if>
             <if test="modifyDevices != null">modify_devices = #{modifyDevices},</if>
+            <if test="repairDevices != null">repair_devices = #{repairDevices},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>
@@ -169,7 +171,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="state != null">state = #{state},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
             <if test="dispatchTime != null">dispatch_time = #{dispatchTime},</if>
         </trim>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceExpenseMapper.xml

@@ -13,27 +13,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="occurDate"    column="occur_date"    />
         <result property="remark"    column="remark"    />
         <result property="document"    column="document"    />
+        <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNumber"    column="device_number"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcDeviceExpenseVo">
-        select device_expense_id, device_id, user_id, expense_type, expense, occur_date, remark, document from cmc_device_expense
+        select de.device_expense_id, de.device_id, d.device_number, d.code, d.name, d.brand, d.series, de.user_id, u.nick_name, de.expense_type, de.expense, de.occur_date, de.remark, de.document from cmc_device_expense as de
+        left join sys_user as u on u.user_id = de.user_id
+        left join cmc_device as d on d.device_id = de.device_id
     </sql>
 
     <select id="selectCmcDeviceExpenseList" parameterType="CmcDeviceExpense" resultMap="CmcDeviceExpenseResult">
         <include refid="selectCmcDeviceExpenseVo"/>
         <where>  
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="expenseType != null  and expenseType != ''"> and expense_type = #{expenseType}</if>
-            <if test="expense != null "> and expense = #{expense}</if>
-            <if test="occurDate != null "> and occur_date = #{occurDate}</if>
-            <if test="document != null  and document != ''"> and document = #{document}</if>
+            <if test="deviceId != null "> and de.device_id = #{deviceId}</if>
+            <if test="userId != null "> and de.user_id = #{userId}</if>
+            <if test="expenseType != null  and expenseType != ''"> and de.expense_type = #{expenseType}</if>
+            <if test="expense != null "> and de.expense = #{expense}</if>
+            <if test="occurDate != null "> and de.occur_date = #{occurDate}</if>
+            <if test="document != null  and document != ''"> and de.document = #{document}</if>
         </where>
     </select>
     
     <select id="selectCmcDeviceExpenseByDeviceExpenseId" parameterType="String" resultMap="CmcDeviceExpenseResult">
         <include refid="selectCmcDeviceExpenseVo"/>
-        where device_expense_id = #{deviceExpenseId}
+        where de.device_expense_id = #{deviceExpenseId}
     </select>
         
     <insert id="insertCmcDeviceExpense" parameterType="CmcDeviceExpense">

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceHandoverMapper.xml

@@ -7,37 +7,77 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceHandover" id="CmcDeviceHandoverResult">
         <result property="deviceHandoverId"    column="device_handover_id"    />
         <result property="deviceId"    column="device_id"    />
-        <result property="handoverDept"    column="handover_dept"    />
-        <result property="handoverUser"    column="handover_user"    />
+        <result property="handoverDeptId"    column="handover_dept_id"    />
+        <result property="handoverUserId"    column="handover_user_id"    />
         <result property="handoverDate"    column="handover_date"    />
-        <result property="receiveDept"    column="receive_dept"    />
-        <result property="receiveUser"    column="receive_user"    />
+        <result property="receiveDeptId"    column="receive_dept_id"    />
+        <result property="receiveUserId"    column="receive_user_id"    />
         <result property="description"    column="description"    />
         <result property="reason"    column="reason"    />
         <result property="remark"    column="remark"    />
+        <association property="handoverUser"    javaType="SysUser"         resultMap="HandoverUserResult" />
+        <association property="receiveUser"    javaType="SysDept"         resultMap="ReceiveUserResult" />
+        <association property="handoverDept"    javaType="SysDept"         resultMap="HandoverDeptResult" />
+        <association property="receiveDept"    javaType="SysDept"         resultMap="ReceiveDeptResult" />
+        <association property="device"    javaType="CmcDevice"         resultMap="CmcDeviceResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="HandoverUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="handover_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ReceiveUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="receive_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="HandoverDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="handover_dept_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="ReceiveDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="receive_dept_name"    />
+    </resultMap>
+
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="deviceNumber"    column="device_number"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcDeviceHandoverVo">
-        select device_handover_id, device_id, handover_dept, handover_user, handover_date, receive_dept, receive_user, description, reason, remark from cmc_device_handover
+        select dh.device_handover_id, dh.device_id, dv.device_number, dv.code, dv.name, dv.brand, dv.series, dh.handover_dept_id, d.dept_name as handover_dept_name, u.nick_name as handover_nick_name, dh.handover_user_id, dh.handover_date,
+               dh.receive_dept_id, d1.dept_name as receive_dept_name, dh.receive_user_id, u1.nick_name as receive_nick_name, dh.description, dh.reason, dh.remark from cmc_device_handover as dh
+        left join sys_user as u on u.user_id = dh.handover_user_id
+        left join sys_user as u1 on u1.user_id = dh.receive_user_id
+        left join sys_dept as d on d.dept_id = dh.handover_dept_id
+        left join sys_dept as d1 on d1.dept_id = dh.receive_dept_id
+        left join cmc_device as dv on dv.device_id = dh.device_id
     </sql>
 
     <select id="selectCmcDeviceHandoverList" parameterType="CmcDeviceHandover" resultMap="CmcDeviceHandoverResult">
         <include refid="selectCmcDeviceHandoverVo"/>
         <where>  
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="handoverDept != null "> and handover_dept = #{handoverDept}</if>
-            <if test="handoverUser != null "> and handover_user = #{handoverUser}</if>
-            <if test="handoverDate != null "> and handover_date = #{handoverDate}</if>
-            <if test="receiveDept != null "> and receive_dept = #{receiveDept}</if>
-            <if test="receiveUser != null "> and receive_user = #{receiveUser}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="deviceId != null "> and dh.device_id = #{deviceId}</if>
+            <if test="handoverDeptId != null "> and dh.handover_dept_id = #{handoverDeptId}</if>
+            <if test="handoverUserId != null "> and dh.handover_user_id = #{handoverUserId}</if>
+            <if test="handoverDate != null "> and dh.handover_date = #{handoverDate}</if>
+            <if test="receiveDeptId != null "> and dh.receive_dept_id = #{receiveDeptId}</if>
+            <if test="receiveUserId != null "> and dh.receive_user_id = #{receiveUserId}</if>
+            <if test="description != null  and description != ''"> and dh.description = #{description}</if>
+            <if test="reason != null  and reason != ''"> and dh.reason = #{reason}</if>
         </where>
     </select>
     
     <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="String" resultMap="CmcDeviceHandoverResult">
         <include refid="selectCmcDeviceHandoverVo"/>
-        where device_handover_id = #{deviceHandoverId}
+        where dh.device_handover_id = #{deviceHandoverId}
     </select>
         
     <insert id="insertCmcDeviceHandover" parameterType="CmcDeviceHandover">
@@ -45,11 +85,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceHandoverId != null">device_handover_id,</if>
             <if test="deviceId != null">device_id,</if>
-            <if test="handoverDept != null">handover_dept,</if>
-            <if test="handoverUser != null">handover_user,</if>
+            <if test="handoverDeptId != null">handover_dept_id,</if>
+            <if test="handoverUserId != null">handover_user_id,</if>
             <if test="handoverDate != null">handover_date,</if>
-            <if test="receiveDept != null">receive_dept,</if>
-            <if test="receiveUser != null">receive_user,</if>
+            <if test="receiveDeptId != null">receive_dept_id,</if>
+            <if test="receiveUserId != null">receive_user_id,</if>
             <if test="description != null">description,</if>
             <if test="reason != null">reason,</if>
             <if test="remark != null">remark,</if>
@@ -57,11 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceHandoverId != null">#{deviceHandoverId},</if>
             <if test="deviceId != null">#{deviceId},</if>
-            <if test="handoverDept != null">#{handoverDept},</if>
-            <if test="handoverUser != null">#{handoverUser},</if>
+            <if test="handoverDeptId != null">#{handoverDeptId},</if>
+            <if test="handoverUserId != null">#{handoverUserId},</if>
             <if test="handoverDate != null">#{handoverDate},</if>
-            <if test="receiveDept != null">#{receiveDept},</if>
-            <if test="receiveUser != null">#{receiveUser},</if>
+            <if test="receiveDeptId != null">#{receiveDeptId},</if>
+            <if test="receiveUserId != null">#{receiveUserId},</if>
             <if test="description != null">#{description},</if>
             <if test="reason != null">#{reason},</if>
             <if test="remark != null">#{remark},</if>
@@ -72,11 +112,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_handover
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceId != null">device_id = #{deviceId},</if>
-            <if test="handoverDept != null">handover_dept = #{handoverDept},</if>
-            <if test="handoverUser != null">handover_user = #{handoverUser},</if>
+            <if test="handoverDeptId != null">handover_dept_id = #{handoverDeptId},</if>
+            <if test="handoverUserId != null">handover_user_id = #{handoverUserId},</if>
             <if test="handoverDate != null">handover_date = #{handoverDate},</if>
-            <if test="receiveDept != null">receive_dept = #{receiveDept},</if>
-            <if test="receiveUser != null">receive_user = #{receiveUser},</if>
+            <if test="receiveDeptId != null">receive_dept_id = #{receiveDeptId},</if>
+            <if test="receiveUserId != null">receive_user_id = #{receiveUserId},</if>
             <if test="description != null">description = #{description},</if>
             <if test="reason != null">reason = #{reason},</if>
             <if test="remark != null">remark = #{remark},</if>

oa-back/sql/sql.sql

@@ -5600,7 +5600,7 @@ INSERT INTO `cmc_device` VALUES (1, '001', '364696', '全站仪', '仪器设备'
 INSERT INTO `cmc_device` VALUES (2, '002', '242572', '全站仪', '仪器设备', NULL, 0.00, NULL, 'TCRP1201+R400', '徕卡', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (3, '003', '363119', '全站仪', '仪器设备', '2012-03-26', 353000.00, NULL, 'TM30 0.5\"', '徕卡', 15.00, '重庆分公司', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (4, '004', '369141', '全站仪', '仪器设备', '2019-10-12', 280000.00, NULL, 'TM50 0.5\"', '徕卡', 15.00, 'C204', '2022.11.13-2022.11.18用于科博会展览', 104, NULL);
-INSERT INTO `cmc_device` VALUES (5, '005', '438516', '全站仪', '仪器设备', NULL, 393000.00, NULL, 'TCA2003  0.5\"', '徕卡', 15.00, 'C204', '设备停用，电池坏', 104, NULL);
+INSERT INTO `cmc_device` VALUES (5, '005', '438516', '全站仪', '仪器设备', NULL, 393000.00, NULL, 'TCA2003  0.5\"', '徕卡', 15.00, 'C204', '设备停用，电池坏', 104, '3');
 INSERT INTO `cmc_device` VALUES (6, '006', '7X0126', '全站仪', '仪器设备', '2008-07-01', 128000.00, NULL, 'GPT-7502', '拓普康', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (7, '007', '7X1038', '全站仪', '仪器设备', '2008-07-01', 128000.00, NULL, 'GPT-7502', '拓普康', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (8, '008', 'OP1454', '全站仪', '仪器设备', '2006-01-01', 0.00, NULL, 'GTS-332N', '拓普康', 15.00, 'C204', '无免棱镜', 104, NULL);
@@ -5616,30 +5616,30 @@ INSERT INTO `cmc_device` VALUES (17, '017', 'XJ1042', '全站仪', '仪器设备
 INSERT INTO `cmc_device` VALUES (18, '018', 'AP0035', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3002LNC', '拓普康', 15.00, 'C204', '2022.12.22二滩项目还回送星辰维修，仪器在项目上摔过，问题1：正倒镜距离偏差较大；问题2：目镜有遮挡物；问题3：竖盘指标差明显变大。', 104, NULL);
 INSERT INTO `cmc_device` VALUES (19, '019', '4K2768', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3002LN', '拓普康', 15.00, '巴拉测量中心', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (20, '020', '4K2051', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3002LN', '拓普康', 15.00, 'C204', '', 104, NULL);
-INSERT INTO `cmc_device` VALUES (21, '021', 'XL0461', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (22, '022', 'XL1614', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (23, '023', 'KQ0408', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335W', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (24, '024', '5B0214', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335N', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (25, '025', '5B0208', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335N', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (26, '026', '2N1574', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-102N', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
+INSERT INTO `cmc_device` VALUES (21, '021', 'XL0461', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (22, '022', 'XL1614', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (23, '023', 'KQ0408', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335W', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (24, '024', '5B0214', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335N', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (25, '025', '5B0208', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-335N', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (26, '026', '2N1574', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GTS-102N', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
 INSERT INTO `cmc_device` VALUES (27, '027', '4M0255', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005LN', '拓普康', 15.00, 'C204', '免棱镜', 104, NULL);
 INSERT INTO `cmc_device` VALUES (28, '028', '4M0174', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005LN/OP', '拓普康', 15.00, 'C204', '免棱镜', 104, NULL);
-INSERT INTO `cmc_device` VALUES (29, '029', '4M0179', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005LN/OP', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (30, '030', '4M1731', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005/LN', '拓普康', 15.00, 'C204', '设备停用', 104, NULL);
+INSERT INTO `cmc_device` VALUES (29, '029', '4M0179', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005LN/OP', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (30, '030', '4M1731', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005/LN', '拓普康', 15.00, 'C204', '设备停用', 104, '3');
 INSERT INTO `cmc_device` VALUES (31, '031', 'ZQ007616', '全站仪', '仪器设备', '2020-05-10', 49000.00, NULL, 'GM-102', '拓普康', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (32, '032', 'ZQ007600', '全站仪', '仪器设备', '2020-05-10', 49000.00, NULL, 'GM-102', '拓普康', 15.00, '巴拉测量中心', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (33, '033', '4M2584', '全站仪', '仪器设备', NULL, 0.00, NULL, 'GPT-3005LN', '拓普康', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (34, '034', 'CF0727', '全站仪', '仪器设备', '2019-05-10', 61440.00, NULL, 'FX-102', '索佳', 15.00, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (35, '035', '2P6437', '全站仪', '仪器设备', '2021-09-26', 0.00, NULL, 'GTS-102N', '拓普康', 15.00, 'C314', '无免棱镜', 104, NULL);
-INSERT INTO `cmc_device` VALUES (36, '036', '0220414597', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (37, '037', '0220412233', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (38, '038', '0220414589', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '电池卡槽松动，设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (39, '039', '0220384703', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (40, '040', '0220403484', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (41, '041', '4838158462', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '电瓶备注“坏”，设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (42, '042', '4913169195', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (43, '043', '4838158505', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
-INSERT INTO `cmc_device` VALUES (44, '043-1', '4852162793', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, NULL);
+INSERT INTO `cmc_device` VALUES (36, '036', '0220414597', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (37, '037', '0220412233', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (38, '038', '0220414589', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '电池卡槽松动，设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (39, '039', '0220384703', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (40, '040', '0220403484', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (41, '041', '4838158462', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '电瓶备注“坏”，设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (42, '042', '4913169195', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (43, '043', '4838158505', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
+INSERT INTO `cmc_device` VALUES (44, '043-1', '4852162793', 'GPS接收机', '仪器设备', NULL, 0.00, NULL, '天宝5700', '天宝', NULL, 'C204', '设备停用', 104, '3');
 INSERT INTO `cmc_device` VALUES (45, '044', 'SG6063117172467WHS', 'GNSS接收机', '仪器设备', '2016-03-01', 34000.00, NULL, '银河6', '南方', 5.30, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (46, '045', 'SG6062117168894WHS', 'GNSS接收机', '仪器设备', '2016-03-01', 34000.00, NULL, '银河6', '南方', 5.30, 'C204', '缺充电器', 104, NULL);
 INSERT INTO `cmc_device` VALUES (47, '046', 'SG6063117172454WHS', 'GNSS接收机', '仪器设备', '2016-03-01', 34000.00, NULL, '银河6', '南方', 5.30, 'C204', '', 104, NULL);
@@ -5754,7 +5754,7 @@ INSERT INTO `cmc_device` VALUES (155, '154', 'R22KB00567W', '平板电脑', '仪
 INSERT INTO `cmc_device` VALUES (156, '155', 'R22K300JCKT', '平板电脑', '仪器设备', NULL, 0.00, NULL, 'SM-T830', '三星S3', NULL, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (157, '156', 'R22M4001YJZ', '平板电脑', '仪器设备', NULL, 0.00, NULL, 'SM-T830', '三星S4', NULL, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (158, '157', 'R22KB00570K', '平板电脑', '仪器设备', NULL, 0.00, NULL, 'SM-T830', '三星S4', NULL, 'C204', '', 104, NULL);
-INSERT INTO `cmc_device` VALUES (159, '158', 'DSFFCGLS20460247', '无人机', '仪器设备', '2021-11-12', 0.00, NULL, '飞马D200S', '飞马', 137.00, 'C204', '2022.11.13-2022.11.18用于科博会展览，保险有效期为2022.11.25至2023.11.24', 104, NULL);
+INSERT INTO `cmc_device` VALUES (159, '158', 'DSFFCGLS20460247', '无人机', '仪器设备', '2021-11-12', 360000.00, NULL, '飞马D200S', '飞马', 137.00, 'C204', '2022.11.13-2022.11.18用于科博会展览，保险有效期为2022.11.25至2023.11.24', 104, NULL);
 INSERT INTO `cmc_device` VALUES (160, '158-1', 'D-CAM310G1911023', '相机', '仪器设备', NULL, 0.00, NULL, '飞马单镜头相机', '飞马', NULL, 'C204', '', 104, NULL);
 INSERT INTO `cmc_device` VALUES (161, '159', 'DSFFCGLS19480130 ', '无人机', '仪器设备', '2019-12-03', 0.00, NULL, '飞马D200S', '飞马', 137.00, 'C204', '2022.3.8寄天津维护保养,4.12寄回，保险有效期至2023-02-15', 104, NULL);
 INSERT INTO `cmc_device` VALUES (162, '160', 'D2000GLS21051080 （相机D-OP300021050682）', '无人机', '仪器设备', NULL, 0.00, NULL, '飞马D2000', '飞马', NULL, 'C204', '保险有效期至2024-02-23，寄回厂家换快门后2024.1.11寄回公司', 104, NULL);
@@ -6202,11 +6202,11 @@ drop table if exists `cmc_device_handover`;
 create table `cmc_device_handover`  (
   `device_handover_id`	char(19)		not null 		comment '设备移交id',
   `device_id` 			int 			default null 	comment '设备id',
-  `handover_dept` 		bigint 			default null 	comment '移交部门id',
-  `handover_user` 		bigint 			default null 	comment '移交人id',
+  `handover_dept_id` 	bigint 			default null 	comment '移交部门id',
+  `handover_user_id` 	bigint 			default null 	comment '移交人id',
   `handover_date`		date			default null 	comment '移交日期',
-  `receive_dept` 		bigint 			default null 	comment '接收部门id',
-  `receive_user` 		bigint 			default null 	comment '接收人id',
+  `receive_dept_id` 	bigint 			default null 	comment '接收部门id',
+  `receive_user_id` 	bigint 			default null 	comment '接收人id',
   `description`			varchar(255)	default null 	comment '设备软件说明',
   `reason`				varchar(255)	default null 	comment '交接原因',
   `remark`				varchar(255)	default null 	comment '备注',
@@ -6240,7 +6240,7 @@ create table `cmc_device_approval`  (
   `apply_date`			date			default null 	comment '申请日期',
   `confirm_date`		date			default null 	comment '确认日期',
   `return_date`			date			default null 	comment '归还日期',
-  `state`				char(1)			default null 	comment '设备状况',
+  `repair_devices`		varchar(50)		default null 	comment '需维修设备id',
   `remark`				varchar(255)	default null 	comment '备注说明',
   `dept_time`			date			default null 	comment '部门审批时间',
   `manager_time`		date			default null 	comment '分管审批时间',

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-23 17:35:16
+ * @LastEditTime: 2024-05-24 09:27:36
 -->
 
 <template>
@@ -61,7 +61,7 @@
               <el-form-item label="设备选择：">
                 <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '设备申请'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status == null || item.status != 1"
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1"
                     :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
                      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
                   </el-option>
@@ -98,7 +98,7 @@
               <el-form-item label-width="120px" label="拟发放设备：">
                 <el-select style="width: 100%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status == null || item.status != 1"
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" 
                     :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
                      + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
                   </el-option>
@@ -144,11 +144,14 @@
               </el-row>
               <!-- 归还确认 -->
               <el-divider></el-divider>
-              <el-form-item label="设备状况：" prop="state" label-width="120px">                
-                <el-radio-group v-model="form.state" size="small" :disabled="taskName != '归还确认'">
-                  <el-radio label="0">完好</el-radio>
-                  <el-radio label="1">需维修</el-radio>
-                </el-radio-group>
+              <el-form-item label="需维修设备：" prop="state" label-width="120px">                
+                <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
+                  clearable :disabled="taskName != '归还确认'">
+                  <el-option v-for="item in modifyDeviceList" :key="item.deviceId"
+                    :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
+                     + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="备注：" prop="remark" label-width="120px">
                 <el-input type="textarea" :rows="2" placeholder="请输入备注" v-model="form.remark"
@@ -262,6 +265,7 @@ export default {
         ],
       },
       deviceList: [],
+      modifyDeviceList: [],
       formTotal: 0
     }
   },
@@ -297,7 +301,10 @@ export default {
             data.modifyDevices = data.modifyDevices.split(',');
             let arr = []
             for (let d of data.modifyDevices) {
-              arr.push(parseInt(d))
+              arr.push(parseInt(d));
+              getDevice(d).then(result => {
+                this.modifyDeviceList.push(result.data);
+              })
             }
             data.modifyDevices = arr;
           }

oa-ui/src/views/oa/car/detail.vue

@@ -76,6 +76,13 @@
         </template>
         {{ carInfo.dayCost }}
       </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
+          状态
+        </template>
+        {{ statusTypeText(carInfo.status) }}
+      </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
@@ -108,7 +115,7 @@
               <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="info" plain icon="el-icon-s-release" size="mini">前往报废</el-button>
+              <el-button type="info" plain icon="el-icon-s-release" size="mini"@click="handleScrap">{{ scrapButtonName }}</el-button>
             </el-col>
           </el-row>
           <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
@@ -213,12 +220,42 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 添加或修改cmc设备报废对话框 -->
+    <el-dialog :title="title" :visible.sync="scrapOpen" width="500px" append-to-body>
+      <el-form ref="scrapForm" :model="scrapForm" :rules="rules" label-width="80px">
+        <el-form-item label="原价值" prop="cost">
+          <el-input v-model="scrapForm.cost" placeholder="请输入原价值" />
+        </el-form-item>
+        <el-form-item label="报废日期" prop="scrapDate">
+          <el-date-picker clearable v-model="scrapForm.scrapDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择报废日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报废原因" prop="reason">
+          <el-input v-model="scrapForm.reason" placeholder="请输入报废原因" />
+        </el-form-item>
+        <el-form-item label="处理结果" prop="deal">
+          <el-input v-model="scrapForm.deal" placeholder="请输入处理结果" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="scrapForm.document" placeholder="请输入附件" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitScrapForm">确 定</el-button>
+        <el-button @click="scrapCancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { getCar } from '@/api/oa/car/car.js'
 import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
+import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
 import { listCarApproval } from "@/api/oa/car/carApproval";
 export default {
   data() {
@@ -252,7 +289,10 @@ export default {
       single: true,
       title: '',
       open: false,
+      scrapOpen: false,
       form: {},
+      scrapForm: {},
+      scrapButtonName: '',
       rules: {
         expenseType: [
           { required: true, message: '请选择费用类型', trigger: 'change' }
@@ -273,6 +313,7 @@ export default {
         this.carInfo = res.data;
       })
       this.getList();
+      this.getScrapStatus();
     }
     if (this.$store.state.app.device == 'desktop') {
 
@@ -298,6 +339,15 @@ export default {
       this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/car' });
     },
+    getScrapStatus() {
+      this.queryParams.deviceId = this.$route.query.deviceId
+      listDeviceScrap(this.queryParams).then(res => {
+        if (res.total > 0)
+          this.scrapButtonName = '查看报废信息';
+        else
+          this.scrapButtonName = '前往报废';
+      })
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -373,9 +423,78 @@ export default {
       this.open = false;
       this.reset();
     },
+    /* 报废记录 */
+    handleScrap() {
+      if (this.scrapButtonName == '查看报废信息')
+        this.handleUpdateScrap();      
+      else
+        this.handleAddScrap();  
+    },
+    handleAddScrap() {
+      this.resetScrap();
+      this.scrapOpen = true;
+      this.title = "添加设备报废信息";
+    },
+    handleUpdateScrap() {
+      this.resetScrap();
+      this.scrapForm.carId = this.$route.query.carId
+      listDeviceScrap(this.scrapForm).then(response => {
+        this.scrapForm = response.rows[0];
+        this.scrapOpen = true;
+        this.title = "修改设备报废信息";
+      });
+    },
+    // 表单重置
+    resetScrap() {
+      this.scrapForm = {
+        deviceScrapId: null,
+      };
+      this.resetForm("scrapForm");
+    },
+    submitScrapForm() {
+      this.$refs["scrapForm"].validate(valid => {
+        if (valid) {
+          this.scrapForm.carId = this.$route.query.carId
+          if (this.scrapForm.deviceScrapId != null) {
+            updateDeviceScrap(this.scrapForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.scrapOpen = false;
+              this.getScrapList();
+            });
+          } else {
+            addDeviceScrap(this.scrapForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.scrapOpen = false;
+              this.getScrapList();
+            });
+          }
+        }
+      });
+    },
+    scrapCancel() {
+      this.scrapOpen = false;
+      this.resetScrap();
+    },
     isNumber(value) {
       return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
     },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
+      if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
+        return '已停用'
+      }
+      if (row == '4') {
+        return '已报废'
+      }
+    },
     expenseTypeText(row) {
       if (row == '0') {
         return '保险费'

oa-ui/src/views/oa/device/detail.vue

@@ -74,7 +74,14 @@
           <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
           管理部门
         </template>
-        {{ deviceInfo.manageDeptName }}
+        {{ deviceInfo.dept ? deviceInfo.dept.deptName : '' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
+          状态
+        </template>
+        {{ statusTypeText(deviceInfo.status) }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
@@ -95,85 +102,77 @@
           </div>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-                @click="handleUpdate">修改</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddExpense">新增</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-                @click="handleDelete">删除</el-button>
+                @click="handleDeleteExpense">删除</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini"
+                @click="handleExportExpense">导出</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="info" plain icon="el-icon-s-release" size="mini">前往报废</el-button>
+              <el-button type="info" plain icon="el-icon-s-release" size="mini" @click="handleScrap">{{ scrapButtonName
+              }}</el-button>
             </el-col>
           </el-row>
-          <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
+          <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionExpenseChange">
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column type="index" width="55" align="center" label="序号" />
-            <el-table-column label="费用类型" align="center" prop="expenseType">
+            <el-table-column label="负责人" align="center" prop="userId">
               <template slot-scope="scope">
-                <el-tag :type="expenseTypeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
+                {{ scope.row.user ? scope.row.user.nickName : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="费用金额" align="center" prop="expense">
+            <el-table-column label="费用类型" align="center" prop="expenseType">
               <template slot-scope="scope">
-                {{ scope.row.expense + '元' }}
+                <el-tag :type="expenseTypeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType)
+                }}</el-tag>
               </template>
             </el-table-column>
+            <el-table-column label="费用金额" align="center" prop="expense" />
             <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
               <template slot-scope="scope">
-                {{ scope.row.occurDate }}
-              </template>
-            </el-table-column>
-            <el-table-column label="负责人" align="center" prop="userId">
-              <template slot-scope="scope">
-                {{ scope.row.userId}}
+                <span>{{ parseTime(scope.row.occurDate, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="55" align="center" label="备注" prop="remark" />
+            <el-table-column label="备注" align="center" prop="remark" />
+            <el-table-column label="附件" align="center" prop="document" />
             <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="['oa:carExpense:edit']">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['oa:carExpense:remove']">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit"
+                  @click="handleUpdateExpense(scope.row)">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete"
+                  @click="handleDeleteExpense(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
+
           <pagination v-show="expenseTotal > 0" :total="expenseTotal" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" />
+            :limit.sync="queryParams.pageSize" @pagination="getExpenseList" />
         </el-card>
       </el-col>
       <el-col :span="12" :xs="24">
-      <!-- 移交、申领记录 -->
+        <!-- 移交、申领记录 -->
         <el-card>
           <div slot="header" class="clearfix">
             <h3>{{ cardName }}</h3>
           </div>
-          <el-row :gutter="10" class="mb8">
+          <el-row v-if="routeType == 'supply'" :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-                @click="handleUpdate">修改</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddHandover">新增</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-                @click="handleDelete">删除</el-button>
+                @click="handleDeleteHandover">删除</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini"
+                @click="handleExportHandover">导出</el-button>
             </el-col>
           </el-row>
-          <!-- 设备使用记录 -->
-          <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
+          <!-- 设备申领记录 -->
+          <el-table v-if="routeType == 'equipment'" v-loading="loading" :data="approvalList">
             <el-table-column type="index" width="55" align="center" label="序号" />
             <el-table-column label="申请人" align="center" prop="user.nickName">
               <template slot-scope="scope">
@@ -204,67 +203,190 @@
               <template slot-scope="scope">
                 {{ scope.row.returnDate }}
               </template>
-            </el-table-column>            
+            </el-table-column>
             <el-table-column label="设备状况" align="center" prop="state">
               <template slot-scope="scope">
-                <el-tag :type="stateTypeStyle(scope.row.state)">{{ stateTypeText(scope.row.state) }}</el-tag>
+                <el-tag :type="stateTypeStyle(scope.row)">{{ stateTypeText(scope.row) }}</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="approvalTotal > 0" :total="approvalTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getApprovalList" />
+
+          <!-- 设备移交记录 -->
+          <el-table v-if="routeType == 'supply'" v-loading="loading" :data="handoverList"
+            @selection-change="handleSelectionHandoverChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="移交人" align="center" prop="handoverUser.nickName">
+              <template slot-scope="scope">
+                {{ scope.row.handoverUser ? scope.row.handoverUser.nickName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="移交部门" align="center" prop="handoverDept.deptName">
+              <template slot-scope="scope">
+                {{ scope.row.handoverDept ? scope.row.handoverDept.deptName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="接收人" align="center" prop="receiveUser.nickName">
+              <template slot-scope="scope">
+                {{ scope.row.receiveUser ? scope.row.receiveUser.nickName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="接收部门" align="center" prop="receiveDept.deptName">
+              <template slot-scope="scope">
+                {{ scope.row.receiveDept ? scope.row.receiveDept.deptName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="移交日期" align="center" prop="handoverDate" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.handoverDate, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="设备软件说明" align="center" prop="description" />
+            <el-table-column label="交接原因" align="center" prop="reason" />
+            <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="['oa:deviceApproval:edit']">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['oa:deviceApproval:remove']">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit"
+                  @click="handleUpdateHandover(scope.row)">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete"
+                  @click="handleDeleteHandover(scope.row)">删除</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="handoverTotal > 0" :total="handoverTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getHandoverList" />
         </el-card>
       </el-col>
     </el-row>
-    <!-- 添加明细 -->
-    <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="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
+    <!-- 添加或修改cmc设备费用对话框 -->
+    <el-dialog :title="title" :visible.sync="expenseOpen" width="500px" append-to-body>
+      <el-form ref="expenseForm" :model="expenseForm" :rules="rules" label-width="80px">
+        <el-form-item label="负责人" prop="userId">
+          <el-select v-model="expenseForm.userId" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="使用部门" prop="useDept">
-          <el-input v-model="form.useDept" placeholder="请输入使用部门" />
+        <el-form-item label="费用类型" prop="expenseType">
+          <el-select v-model="expenseForm.expenseType" placeholder="请选择" clearable>
+            <el-option label="保险费" value="0"></el-option>
+            <el-option label="维修/保养费" value="1"></el-option>
+            <el-option label="检定费" value="2"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="设备id" prop="devices">
-          <el-input v-model="form.devices" placeholder="请输入设备id" />
+        <el-form-item label="费用金额" prop="expense">
+          <el-input v-model="expenseForm.expense" placeholder="请输入费用金额" />
         </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        <el-form-item label="发生日期" prop="occurDate">
+          <el-date-picker clearable v-model="expenseForm.occurDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择发生日期">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="申领事由" prop="applyReason">
-          <el-input v-model="form.applyReason" placeholder="请输入申领事由" />
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="expenseForm.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="开始日期" prop="beginDate">
-          <el-date-picker clearable v-model="form.beginDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择开始日期">
-          </el-date-picker>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="expenseForm.document" placeholder="请输入附件" />
         </el-form-item>
-        <el-form-item label="结束日期" prop="endDate">
-          <el-date-picker clearable v-model="form.endDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择结束日期">
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitExpenseForm">确 定</el-button>
+        <el-button @click="expenseCancel">取 消</el-button>
+      </div>
+    </el-dialog>.
+    <!-- 添加或修改cmc设备移交对话框 -->
+    <el-dialog :title="title" :visible.sync="handoverOpen" width="500px" append-to-body>
+      <el-form ref="handoverForm" :model="handoverForm" :rules="rules" label-width="80px">
+        <el-row :gutter="20">
+          <el-col :span="12" :xs="24">
+            <el-form-item label="移交部门" prop="handoverDeptId">
+              <el-select v-model="handoverForm.handoverDeptId" filterable clearable style="width:120px"
+                @change="deptChange">
+                <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="移交人" prop="handoverUserId">
+              <el-select v-model="handoverForm.handoverUserId" filterable clearable style="width:120px">
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                  v-if="item.nickName != 'admin'">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :xs="24">
+            <el-form-item label="接收部门" prop="receiveDeptId">
+              <el-select v-model="handoverForm.receiveDeptId" filterable clearable style="width:120px"
+                @change="deptChange">
+                <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接收人" prop="receiveUserId">
+              <el-select v-model="handoverForm.receiveUserId" filterable clearable style="width:120px">
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                  v-if="item.nickName != 'admin'">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="移交日期" prop="handoverDate">
+          <el-date-picker clearable v-model="handoverForm.handoverDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择移交日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="天数" prop="days">
-          <el-input v-model="form.days" placeholder="请输入天数" />
+        <el-form-item label="设备软件说明" prop="description">
+          <el-input v-model="handoverForm.description" placeholder="请输入设备软件说明" />
         </el-form-item>
-        <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable v-model="form.applyDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择申请日期">
-          </el-date-picker>
+        <el-form-item label="交接原因" prop="reason">
+          <el-input v-model="handoverForm.reason" placeholder="请输入交接原因" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="handoverForm.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="归还日期" prop="returnDate">
-          <el-date-picker clearable v-model="form.returnDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择归还日期">
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitHandoverForm">确 定</el-button>
+        <el-button @click="handoverCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 添加或修改cmc设备报废对话框 -->
+    <el-dialog :title="title" :visible.sync="scrapOpen" width="500px" append-to-body>
+      <el-form ref="scrapForm" :model="scrapForm" :rules="rules" label-width="80px">
+        <el-form-item label="原价值" prop="cost">
+          <el-input v-model="scrapForm.cost" placeholder="请输入原价值" />
+        </el-form-item>
+        <el-form-item label="报废日期" prop="scrapDate">
+          <el-date-picker clearable v-model="scrapForm.scrapDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择报废日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="报废原因" prop="reason">
+          <el-input v-model="scrapForm.reason" placeholder="请输入报废原因" />
+        </el-form-item>
+        <el-form-item label="处理结果" prop="deal">
+          <el-input v-model="scrapForm.deal" placeholder="请输入处理结果" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="附件" prop="document">
+          <el-input v-model="scrapForm.document" 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>
+        <el-button type="primary" @click="submitScrapForm">确 定</el-button>
+        <el-button @click="scrapCancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -273,6 +395,11 @@
 <script>
 import { getDevice } from '@/api/oa/device/device.js'
 import { listDeviceApproval, getDeviceApproval, delDeviceApproval, addDeviceApproval, updateDeviceApproval } from "@/api/oa/device/deviceApproval";
+import { listDeviceHandover, getDeviceHandover, delDeviceHandover, addDeviceHandover, updateDeviceHandover } from "@/api/oa/device/deviceHandover";
+import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
+import { listDeviceScrap, getDeviceScrap, delDeviceScrap, addDeviceScrap, updateDeviceScrap } from "@/api/oa/device/deviceScrap";
+import { listDept } from '@/api/system/dept';
+import { listUser } from '@/api/system/user';
 export default {
   data() {
     let validateApproval = (rule, value, callback) => {
@@ -291,7 +418,8 @@ export default {
       // 遮罩层
       loading: true,
       // 选中数组
-      ids: [],
+      expenseIds: [],
+      handoverIds: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -299,43 +427,61 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total: 0,
+      approvalTotal: 0,
       expenseTotal: 0,
+      handoverTotal: 0,
       // cmc设备审批表格数据
       approvalList: [],
       expenseList: [],
+      handoverList: [],
+      userList: [],
+      deptList: [],
       cardName: '',
       column: 4,
       deviceInfo: {},
       // 弹出层标题
       title: "",
       // 是否显示弹出层
-      open: false,
+      expenseOpen: false,
+      handoverOpen: false,
+      scrapOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
       },
       // 表单参数
-      form: {},
+      expenseForm: {
+        userId: 18,
+      },
+      handoverForm: {},
+      scrapForm: {},
       // 表单校验
       rules: {
       },
       loading: false,
-      routeType:''
+      routeType: '',
+      scrapButtonName: ''
     }
   },
   created() {
     if (this.$route.query) {
       this.routeType = this.$route.query.type
-      if (this.$route.query.type == 'equipment')
+      if (this.routeType == 'equipment') {
         this.cardName = '申领记录';
-      else
+        this.getApprovalList();
+      }
+      else {
         this.cardName = '移交记录';
+        this.getHandoverList();
+      }
       getDevice(this.$route.query.deviceId).then(res => {
         this.deviceInfo = res.data;
       })
-      this.getList();
+      this.getExpenseList();
+      this.getDeptList();
+      this.getUserList();
+      this.getScrapStatus();
     }
     if (this.$store.state.app.device == 'desktop') {
 
@@ -344,106 +490,264 @@ export default {
     }
   },
   methods: {
-    getList() {
+    getApprovalList() {
       this.queryParams.modifyDevices = this.$route.query.deviceId
       listDeviceApproval(this.queryParams).then(res => {
         this.approvalList = res.rows;
-        this.total = res.total;
+        this.approvalTotal = res.total;
+      })
+    },
+    getExpenseList() {
+      this.queryParams.deviceId = this.$route.query.deviceId
+      listDeviceExpense(this.queryParams).then(res => {
+        this.expenseList = res.rows;
+        this.expenseTotal = res.total;
+      })
+    },
+    getHandoverList() {
+      this.queryParams.deviceId = this.$route.query.deviceId
+      listDeviceHandover(this.queryParams).then(res => {
+        this.handoverList = res.rows;
+        this.handoverTotal = res.total;
+      })
+    },
+    getDeptList() {
+      listDept({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.deptList = res.data
+      })
+    },
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    deptChange(val) {
+      listUser({ pageSize: 9999, pageNum: 1, deptId: val }).then(res => {
+        this.userList = res.rows
+      })
+    },
+    getScrapStatus() {
+      this.queryParams.deviceId = this.$route.query.deviceId
+      listDeviceScrap(this.queryParams).then(res => {
+        if (res.total > 0)
+          this.scrapButtonName = '查看报废信息';
+        else
+          this.scrapButtonName = '前往报废';
       })
     },
     goBack() {
       let obj = { path: "/device/detail" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/device/'+ this.routeType });
+      this.$router.push({ path: '/device/' + this.routeType });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleExpenseQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.deviceId = this.$route.query.deviceId;
+      this.getExpenseList();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceApprovalId)
+    handleSelectionExpenseChange(selection) {
+      this.expenseIds = selection.map(item => item.deviceExpenseId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加设备使用明细";
-    },
-    handleUpdate(row) {
-      this.reset();
-      const deviceApplyId = row.deviceApplyId || this.ids
-      getDeviceApproval(deviceApplyId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改设备使用明细";
+    handleAddExpense() {
+      this.resetExpense();
+      this.expenseOpen = true;
+      this.title = "添加设备费用明细";
+    },
+    handleUpdateExpense(row) {
+      this.resetExpense();
+      const deviceExpenseId = row.deviceExpenseId || this.expenseIds
+      getDeviceExpense(deviceExpenseId).then(response => {
+        this.expenseForm = response.data;
+        this.expenseOpen = true;
+        this.title = "修改设备费用明细";
       });
     },
-    handleDelete(row) {
-      const deviceApprovalIds = row.deviceApprovalId || this.ids;
-      this.$modal.confirm('是否确认删除设备使用费用编号为"' + deviceApprovalIds + '"的数据项？').then(function () {
-        return delDeviceApproval(deviceApprovalIds);
+    handleDeleteExpense(row) {
+      const deviceExpenseIds = row.deviceExpenseId || this.expenseIds;
+      this.$modal.confirm('是否确认删除设备费用编号为"' + deviceExpenseIds + '"的数据项？').then(function () {
+        return delDeviceExpense(deviceExpenseIds);
       }).then(() => {
-        this.getList();
+        this.getExpenseList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
-    handleExport() {
+    handleExportExpense() {
+      this.download('oa/deviceExpense/export', {
+        ...this.queryParams
+      }, `deviceExpense_${new Date().getTime()}.xlsx`)
+    },
+    // 表单重置
+    resetExpense() {
+      this.expenseForm = {
+        deviceExpenseId: null,
+      };
+      this.resetForm("expenseForm");
+    },
+    submitExpenseForm() {
+      this.$refs["expenseForm"].validate(valid => {
+        if (valid) {
+          this.expenseForm.deviceId = this.$route.query.deviceId
+          if (this.expenseForm.deviceExpenseId != null) {
+            updateDeviceExpense(this.expenseForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.expenseOpen = false;
+              this.getExpenseList();
+            });
+          } else {
+            addDeviceExpense(this.expenseForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.expenseOpen = false;
+              this.getExpenseList();
+            });
+          }
+        }
+      });
+    },
+    expenseCancel() {
+      this.expenseOpen = false;
+      this.resetExpense();
+    },
+
+    /* 申领记录 */
+    /** 搜索按钮操作 */
+    handleApprovalQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.modifyDevices = this.$route.query.deviceId;
+      this.getApprovalList();
+    },
+    handleExportApproval() {
       this.download('oa/deviceApproval/export', {
         ...this.queryParams
       }, `deviceApproval_${new Date().getTime()}.xlsx`)
     },
+
+    /* 移交记录 */
+    /** 搜索按钮操作 */
+    handleHandoverQuery() {
+      this.queryParams.pageNum = 1;
+      this.getHandoverList();
+    },
+    // 多选框选中数据
+    handleSelectionHandoverChange(selection) {
+      this.handoverIds = selection.map(item => item.deviceHandoverId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleAddHandover() {
+      this.resetHandover();
+      this.handoverOpen = true;
+      this.title = "添加设备移交明细";
+    },
+    handleUpdateHandover(row) {
+      this.resetHandover();
+      const deviceHandoverId = row.deviceHandoverId || this.handoverIds
+      getDeviceHandover(deviceHandoverId).then(response => {
+        this.handoverForm = response.data;
+        this.handoverOpen = true;
+        this.title = "修改设备移交明细";
+      });
+    },
+    handleDeleteHandover(row) {
+      const deviceHandoverIds = row.deviceHandoverId || this.handoverIds;
+      this.$modal.confirm('是否确认删除设备移交编号为"' + deviceHandoverIds + '"的数据项？').then(function () {
+        return delDeviceHandover(deviceHandoverIds);
+      }).then(() => {
+        this.getHandoverList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    handleExportHandover() {
+      this.download('oa/deviceHandover/export', {
+        ...this.queryParams
+      }, `deviceHandover_${new Date().getTime()}.xlsx`)
+    },
     // 表单重置
-    reset() {
-      this.form = {
-        deviceApplyId: null,
-        applier: null,
-        useDept: null,
-        devices: null,
-        projectId: null,
-        applyReason: null,
-        beginDate: null,
-        beginHalfday: null,
-        endDate: null,
-        endHalfday: null,
-        days: null,
-        deptUserId: null,
-        deptComment: null,
-        managerUserId: null,
-        managerComment: null,
-        dispatcher: null,
-        dispatchComment: null,
-        estimateCost: null,
-        applyDate: null,
-        returnDate: null
+    resetHandover() {
+      this.handoverForm = {
+        deviceHandoverId: null,
       };
-      this.resetForm("form");
+      this.resetForm("handoverForm");
     },
-    submitForm() {
-      this.$refs["form"].validate(valid => {
+    submitHandoverForm() {
+      this.$refs["handoverForm"].validate(valid => {
         if (valid) {
-          this.form.deviceId = this.$route.query.deviceId
-          if (this.form.deviceApprovalId != null) {
-            updateDeviceApproval(this.form).then(response => {
+          this.handoverForm.deviceId = this.$route.query.deviceId
+          if (this.handoverForm.deviceHandoverId != null) {
+            updateDeviceHandover(this.handoverForm).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+              this.handoverOpen = false;
+              this.getHandoverList();
             });
           } else {
-            addDeviceApproval(this.form).then(response => {
+            addDeviceHandover(this.handoverForm).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              this.handoverOpen = false;
+              this.getHandoverList();
             });
           }
         }
       });
     },
-    cancel() {
-      this.open = false;
-      this.reset();
+    handoverCancel() {
+      this.handoverOpen = false;
+      this.resetHandover();
+    },
+
+    /* 报废记录 */
+    handleScrap() {
+      if (this.scrapButtonName == '查看报废信息')
+        this.handleUpdateScrap();      
+      else
+        this.handleAddScrap();  
+    },
+    handleAddScrap() {
+      this.resetScrap();
+      this.scrapOpen = true;
+      this.title = "添加设备报废信息";
+    },
+    handleUpdateScrap() {
+      this.resetScrap();
+      this.scrapForm.deviceId = this.$route.query.deviceId
+      listDeviceScrap(this.scrapForm).then(response => {
+        this.scrapForm = response.rows[0];
+        this.scrapOpen = true;
+        this.title = "修改设备报废信息";
+      });
+    },
+    // 表单重置
+    resetScrap() {
+      this.scrapForm = {
+        deviceScrapId: null,
+      };
+      this.resetForm("scrapForm");
+    },
+    submitScrapForm() {
+      this.$refs["scrapForm"].validate(valid => {
+        if (valid) {
+          this.scrapForm.deviceId = this.$route.query.deviceId
+          if (this.scrapForm.deviceScrapId != null) {
+            updateDeviceScrap(this.scrapForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.scrapOpen = false;
+              this.getScrapList();
+            });
+          } else {
+            addDeviceScrap(this.scrapForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.scrapOpen = false;
+              this.getScrapList();
+            });
+          }
+        }
+      });
+    },
+    scrapCancel() {
+      this.scrapOpen = false;
+      this.resetScrap();
     },
     isNumber(value) {
       return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
@@ -471,20 +775,54 @@ export default {
       }
     },
     stateTypeText(row) {
-      if (row == '0') {
+      if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
         return '完好'
       }
-      if (row == '1') {
+      else {
         return '需维修'
       }
     },
     stateTypeStyle(row) {
-      if (row == '0') {
+      if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
         return 'success'
       }
+      else {
+        return 'danger'
+      }
+    },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
       if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
+        return '已停用'
+      }
+      if (row == '4') {
+        return '已报废'
+      }
+    },
+    statusTypeStyle(row) {
+      if (row == '0') {
+        return 'warning'
+      }
+      if (row == '1') {
+        return 'success'
+      }
+      if (row == '2') {
         return 'danger'
       }
+      if (row == '3') {
+        return 'primary'
+      }
+      if (row == '3') {
+        return 'info'
+      }
     }
   },
 }

oa-ui/src/views/oa/device/index.vue

@@ -37,10 +37,10 @@
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
-      <el-table-column label="设备状态" align="center" prop="status" >
+      <el-table-column label="设备状态" align="center" prop="status">
         <template slot-scope="scope">
-                <el-tag :type="stateTypeStyle(scope.row.status)">{{ stateTypeText(scope.row.status) }}</el-tag>
-              </template>
+          <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>
+        </template>
       </el-table-column>
       <el-table-column label="出厂编号" align="center" prop="code" />
       <el-table-column label="设备名称" align="center" prop="name" />
@@ -141,9 +141,24 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="管理部门" prop="dept.deptName">
-          <el-input v-model="form.deptName" placeholder="请输入管理部门" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="管理部门" prop="manageDept">
+              <el-select v-model="form.manageDept" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备状态" prop="status">
+              <el-select v-model="form.status" filterable placeholder="请选择">
+                <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -163,6 +178,7 @@
 
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/oa/device/device";
+import { listDept } from '@/api/system/dept'
 
 export default {
   name: "Device",
@@ -182,6 +198,8 @@ export default {
       total: 0,
       // cmc设备信息表格数据
       deviceList: [],
+      deptList: [],
+      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -206,6 +224,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptList();
   },
   methods: {
     /** 查询cmc设备信息列表 */
@@ -217,6 +236,11 @@ export default {
         this.loading = false;
       });
     },
+    getDeptList() {
+      listDept({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.deptList = res.data
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -314,7 +338,7 @@ export default {
         ...this.queryParams
       }, `device_${new Date().getTime()}.xlsx`)
     },
-    stateTypeText(row) {
+    statusTypeText(row) {
       if (row == '0') {
         return '被领用'
       }
@@ -322,10 +346,13 @@ export default {
         return '可领用'
       }
       if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
         return '已停用'
       }
     },
-    stateTypeStyle(row) {
+    statusTypeStyle(row) {
       if (row == '0') {
         return 'warning'
       }
@@ -333,6 +360,9 @@ export default {
         return 'success'
       }
       if (row == '2') {
+        return 'danger'
+      }
+      if (row == '3') {
         return 'info'
       }
     }