设备详情

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

@@ -55,17 +55,6 @@ public class SysPostController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 获取岗位列表
-     */
-    @GetMapping("/driverList")
-    public TableDataInfo driverList()
-    {
-        startPage();
-        List<SysUser> list = postService.selectDriverList();
-        return getDataTable(list);
-    }
-
     /**
      * 获取部门主任
      */
@@ -122,10 +111,10 @@ public class SysPostController extends BaseController
     /**
      * 查询总经理
      */
-    @GetMapping("/gm")
-    public AjaxResult getGm()
+    @GetMapping("/postName")
+    public AjaxResult getUserByPost(String postName)
     {
-        return success(postService.selectGm().getUserId());
+        return success(postService.selectUserListByPostName(postName));
     }
 
     /**

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSafeActivityExecutionListener.java

@@ -13,7 +13,8 @@ public class CallSafeActivityExecutionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
-        Authentication.setAuthenticatedUserId(userPostMapper.selectSafe().getUserId().toString());
-        delegateExecution.setVariable("approval", userPostMapper.selectSafe().getUserId().toString());
+        String userId = userPostMapper.selectUserListByPostName("专职安全员").get(0).getUserId().toString();
+        Authentication.setAuthenticatedUserId(userId);
+        delegateExecution.setVariable("approval", userId);
     }
 }

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

@@ -42,14 +42,6 @@ public class CmcBudgetStaff extends BaseEntity
     @Excel(name = "人员成本")
     private BigDecimal staffCost;
 
-    /** 进出场单价 */
-    @Excel(name = "进出场单价")
-    private BigDecimal inOutPrice;
-
-    /** 进出场费用 */
-    @Excel(name = "进出场费用")
-    private BigDecimal inOutExpense;
-
     public void setBudgetStaffId(Long budgetStaffId)
     {
         this.budgetStaffId = budgetStaffId;
@@ -113,24 +105,6 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return salary;
     }
-    public void setInOutPrice(BigDecimal inOutPrice) 
-    {
-        this.inOutPrice = inOutPrice;
-    }
-
-    public BigDecimal getInOutPrice() 
-    {
-        return inOutPrice;
-    }
-    public void setInOutExpense(BigDecimal inOutExpense) 
-    {
-        this.inOutExpense = inOutExpense;
-    }
-
-    public BigDecimal getInOutExpense() 
-    {
-        return inOutExpense;
-    }
 
     @Override
     public String toString() {
@@ -140,8 +114,6 @@ public class CmcBudgetStaff extends BaseEntity
             .append("userId", getUserId())
             .append("days", getDays())
             .append("staffCost", getStaffCost())
-            .append("inOutPrice", getInOutPrice())
-            .append("inOutExpense", getInOutExpense())
             .toString();
     }
 }

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

@@ -25,6 +25,10 @@ public class CmcDeviceScrap extends BaseEntity
     @Excel(name = "设备id")
     private Long deviceId;
 
+    /** 车辆id */
+    @Excel(name = "车辆id")
+    private Long carId;
+
     /** 原价值 */
     @Excel(name = "原价值")
     private BigDecimal cost;
@@ -64,6 +68,15 @@ public class CmcDeviceScrap extends BaseEntity
     {
         return deviceId;
     }
+    public void setCarId(Long carId)
+    {
+        this.carId = carId;
+    }
+
+    public Long getCarId()
+    {
+        return carId;
+    }
     public void setCost(BigDecimal cost) 
     {
         this.cost = cost;
@@ -115,6 +128,7 @@ public class CmcDeviceScrap extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceScrapId", getDeviceScrapId())
             .append("deviceId", getDeviceId())
+            .append("carId", getCarId())
             .append("cost", getCost())
             .append("scrapDate", getScrapDate())
             .append("reason", getReason())

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -44,14 +44,6 @@ public interface SysUserPostMapper
      */
     public int batchUserPost(List<SysUserPost> userPostList);
 
-    /**
-     * 查询驾驶员集合
-     *
-     * @param
-     * @return 驾驶员列表
-     */
-    public List<SysUser> selectDriverList();
-
     /**
      * 查询高级管理员集合
      *
@@ -61,20 +53,12 @@ public interface SysUserPostMapper
     public List<SysUser> selectGmAssistant(SysUser user);
 
     /**
-     * 查询总经理
-     *
-     * @param
-     * @return 总经理
-     */
-    public SysUser selectGm();
-
-    /**
-     * 查询专职安全员
+     * 根据岗位查询用户
      *
      * @param
-     * @return 专职安全员
+     * @return 用户列表
      */
-    public SysUser selectSafe();
+    public List<SysUser> selectUserListByPostName(String postName);
 
     /**
      * 查询部门主任

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -100,14 +100,6 @@ public interface ISysPostService
      */
     public int updatePost(SysPost post);
 
-    /**
-     * 查询驾驶员集合
-     *
-     * @param
-     * @return 驾驶员列表
-     */
-    public List<SysUser> selectDriverList();
-
     /**
      * 查询高级管理员集合
      *
@@ -117,20 +109,12 @@ public interface ISysPostService
     public List<SysUser> selectGmAssistant(SysUser user);
 
     /**
-     * 查询总经理
-     *
-     * @param
-     * @return 总经理
-     */
-    public SysUser selectGm();
-
-    /**
-     * 查询专职安全员
+     * 根据岗位查询用户
      *
      * @param
-     * @return 专职安全员
+     * @return 用户列表
      */
-    public SysUser selectSafe();
+    public List<SysUser> selectUserListByPostName(String postName);
 
     /**
      * 查询部门主任

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -178,17 +178,6 @@ public class SysPostServiceImpl implements ISysPostService
         return postMapper.updatePost(post);
     }
 
-    /**
-     * 查询驾驶员集合
-     *
-     * @param
-     * @return 驾驶员列表
-     */
-    @Override
-    public List<SysUser> selectDriverList() {
-        return userPostMapper.selectDriverList();
-    }
-
     /**
      * 查询高级管理员集合
      *
@@ -201,25 +190,14 @@ public class SysPostServiceImpl implements ISysPostService
     }
 
     /**
-     * 查询总经理
-     *
-     * @param
-     * @return 总经理
-     */
-    @Override
-    public SysUser selectGm() {
-        return userPostMapper.selectGm();
-    }
-
-    /**
-     * 查询专职安全员
+     * 根据岗位查询用户
      *
      * @param
-     * @return 总经理
+     * @return 用户列表
      */
     @Override
-    public SysUser selectSafe() {
-        return userPostMapper.selectSafe();
+    public List<SysUser> selectUserListByPostName(String postName) {
+        return userPostMapper.selectUserListByPostName(postName);
     }
 
     /**

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

@@ -10,8 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="days"    column="days"    />
         <result property="staffCost"    column="staff_cost"    />
-        <result property="inOutPrice"    column="in_out_price"    />
-        <result property="inOutExpense"    column="in_out_expense"    />
         <result property="remark"    column="remark"    />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
@@ -32,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.in_out_price, bs.in_out_expense, bs.remark from cmc_budget_staff as bs
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark from cmc_budget_staff as bs
         left join sys_user as u on u.user_id = bs.user_id
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
     </sql>
@@ -44,8 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and bs.user_id = #{userId}</if>
             <if test="days != null "> and bs.days = #{days}</if>
             <if test="staffCost != null "> and bs.staff_cost = #{staffCost}</if>
-            <if test="inOutPrice != null "> and bs.in_out_price = #{inOutPrice}</if>
-            <if test="inOutExpense != null "> and bs.in_out_expense = #{inOutExpense}</if>
         </where>
     </select>
     
@@ -62,8 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id,</if>
             <if test="days != null">days,</if>
             <if test="staffCost != null">staff_cost,</if>
-            <if test="inOutPrice != null">in_out_price,</if>
-            <if test="inOutExpense != null">in_out_expense,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -72,8 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">#{userId},</if>
             <if test="days != null">#{days},</if>
             <if test="staffCost != null">#{staffCost},</if>
-            <if test="inOutPrice != null">#{inOutPrice},</if>
-            <if test="inOutExpense != null">#{inOutExpense},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -85,8 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="days != null">days = #{days},</if>
             <if test="staffCost != null">staff_cost = #{staffCost},</if>
-            <if test="inOutPrice != null">in_out_price = #{inOutPrice},</if>
-            <if test="inOutExpense != null">in_out_expense = #{inOutExpense},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where budget_staff_id = #{budgetStaffId}

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

@@ -105,8 +105,8 @@
         <where>
             <if test="applier != null "> and ca.applier = #{applier}</if>
             <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
-            <if test="cars != null  and cars != ''"> and ca.cars = #{cars}</if>
-            <if test="drivers != null  and drivers != ''"> and ca.drivers = #{drivers}</if>
+            <if test="cars != null  and cars != ''"> and ca.cars like concat('%', #{cars}, '%')</if>
+            <if test="drivers != null  and drivers != ''"> and ca.drivers like concat('%', #{drivers}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>

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

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="applier != null "> and da.applier = #{applier}</if>
             <if test="useDept != null "> and da.use_dept = #{useDept}</if>
-            <if test="devices != null  and devices != ''"> and da.devices = #{devices}</if>
+            <if test="devices != null  and devices != ''"> and da.devices like concat('%', #{devices}, '%')</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>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceScrap" id="CmcDeviceScrapResult">
         <result property="deviceScrapId"    column="device_scrap_id"    />
         <result property="deviceId"    column="device_id"    />
+        <result property="carId"    column="car_id"    />
         <result property="cost"    column="cost"    />
         <result property="scrapDate"    column="scrap_date"    />
         <result property="reason"    column="reason"    />
@@ -16,13 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceScrapVo">
-        select device_scrap_id, device_id, cost, scrap_date, reason, deal, remark, document from cmc_device_scrap
+        select device_scrap_id, device_id, car_id, cost, scrap_date, reason, deal, remark, document from cmc_device_scrap
     </sql>
 
     <select id="selectCmcDeviceScrapList" parameterType="CmcDeviceScrap" resultMap="CmcDeviceScrapResult">
         <include refid="selectCmcDeviceScrapVo"/>
         <where>  
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="carId != null "> and car_id = #{carId}</if>
             <if test="cost != null "> and cost = #{cost}</if>
             <if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
@@ -41,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceScrapId != null">device_scrap_id,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="carId != null">car_id,</if>
             <if test="cost != null">cost,</if>
             <if test="scrapDate != null">scrap_date,</if>
             <if test="reason != null">reason,</if>
@@ -51,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceScrapId != null">#{deviceScrapId},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="carId != null">#{carId},</if>
             <if test="cost != null">#{cost},</if>
             <if test="scrapDate != null">#{scrapDate},</if>
             <if test="reason != null">#{reason},</if>
@@ -64,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_scrap
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="carId != null">car_id = #{carId},</if>
             <if test="cost != null">cost = #{cost},</if>
             <if test="scrapDate != null">scrap_date = #{scrapDate},</if>
             <if test="reason != null">reason = #{reason},</if>

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

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oa.mapper.CmcSupplyMapper">
-    
-    <resultMap type="CmcSupply" id="CmcSupplyResult">
-        <result property="supplyId"    column="supply_id"    />
-        <result property="supplyNumber"    column="supply_number"    />
-        <result property="code"    column="code"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="acquisitionTime"    column="acquisition_time"    />
-        <result property="cost"    column="cost"    />
-        <result property="expectLife"    column="expect_life"    />
-        <result property="series"    column="series"    />
-        <result property="brand"    column="brand"    />
-        <result property="dayCost"    column="day_cost"    />
-        <result property="place"    column="place"    />
-        <result property="remark"    column="remark"    />
-        <result property="manageDept"    column="manage_dept"    />
-    </resultMap>
-
-    <sql id="selectCmcSupplyVo">
-        select supply_id, supply_number, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, manage_dept from cmc_supply
-    </sql>
-
-    <select id="selectCmcSupplyList" parameterType="CmcSupply" resultMap="CmcSupplyResult">
-        <include refid="selectCmcSupplyVo"/>
-        <where>  
-            <if test="supplyNumber != null  and supplyNumber != ''"> and supply_number = #{supplyNumber}</if>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
-            <if test="cost != null "> and cost = #{cost}</if>
-            <if test="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="series != null  and series != ''"> and series = #{series}</if>
-            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
-            <if test="dayCost != null "> and day_cost = #{dayCost}</if>
-            <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="manageDept != null "> and manage_dept = #{manageDept}</if>
-        </where>
-    </select>
-    
-    <select id="selectCmcSupplyBySupplyId" parameterType="Long" resultMap="CmcSupplyResult">
-        <include refid="selectCmcSupplyVo"/>
-        where supply_id = #{supplyId}
-    </select>
-        
-    <insert id="insertCmcSupply" parameterType="CmcSupply" useGeneratedKeys="true" keyProperty="supplyId">
-        insert into cmc_supply
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="supplyNumber != null">supply_number,</if>
-            <if test="code != null">code,</if>
-            <if test="name != null">name,</if>
-            <if test="type != null">type,</if>
-            <if test="acquisitionTime != null">acquisition_time,</if>
-            <if test="cost != null">cost,</if>
-            <if test="expectLife != null">expect_life,</if>
-            <if test="series != null">series,</if>
-            <if test="brand != null">brand,</if>
-            <if test="dayCost != null">day_cost,</if>
-            <if test="place != null">place,</if>
-            <if test="remark != null">remark,</if>
-            <if test="manageDept != null">manage_dept,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="supplyNumber != null">#{supplyNumber},</if>
-            <if test="code != null">#{code},</if>
-            <if test="name != null">#{name},</if>
-            <if test="type != null">#{type},</if>
-            <if test="acquisitionTime != null">#{acquisitionTime},</if>
-            <if test="cost != null">#{cost},</if>
-            <if test="expectLife != null">#{expectLife},</if>
-            <if test="series != null">#{series},</if>
-            <if test="brand != null">#{brand},</if>
-            <if test="dayCost != null">#{dayCost},</if>
-            <if test="place != null">#{place},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="manageDept != null">#{manageDept},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCmcSupply" parameterType="CmcSupply">
-        update cmc_supply
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="supplyNumber != null">supply_number = #{supplyNumber},</if>
-            <if test="code != null">code = #{code},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
-            <if test="cost != null">cost = #{cost},</if>
-            <if test="expectLife != null">expect_life = #{expectLife},</if>
-            <if test="series != null">series = #{series},</if>
-            <if test="brand != null">brand = #{brand},</if>
-            <if test="dayCost != null">day_cost = #{dayCost},</if>
-            <if test="place != null">place = #{place},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="manageDept != null">manage_dept = #{manageDept},</if>
-        </trim>
-        where supply_id = #{supplyId}
-    </update>
-
-    <delete id="deleteCmcSupplyBySupplyId" parameterType="Long">
-        delete from cmc_supply where supply_id = #{supplyId}
-    </delete>
-
-    <delete id="deleteCmcSupplyBySupplyIds" parameterType="String">
-        delete from cmc_supply where supply_id in 
-        <foreach item="supplyId" collection="array" open="(" separator="," close=")">
-            #{supplyId}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -60,15 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDriverList" resultMap="SysUserResult">
 		select u.user_id, u.nick_name
 		from sys_user u left join sys_user_post up on u.user_id = up.user_id
-		where up.post_id = 27 and u.status = '0'
+		where up.post_id = 31 and u.status = '0'
 	</select>
 
 	<select id="selectGmAssistant" parameterType="SysUser" resultMap="SysUserResult">
 		select u.*, d.dept_name
 		from sys_user u
-				 left join sys_dept d on u.dept_id = d.dept_id
-				 left join sys_user_post up on u.user_id = up.user_id
-		where up.post_id = 11
+		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_post up on u.user_id = up.user_id
+		left join sys_post p on up.post_id = p.post_id
+		where p.post_name = "总经理助理"
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
@@ -86,52 +87,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
-	<select id="selectGm" resultMap="SysUserResult">
-		select u.user_id, u.nick_name
-		from sys_user u left join sys_user_post up on u.user_id = up.user_id
-		where up.post_id = 2
-	</select>
-
-	<select id="selectSafe" resultMap="SysUserResult">
-		select u.user_id, u.nick_name
-		from sys_user u left join sys_user_post up on u.user_id = up.user_id
-		where up.post_id = 20
+	<select id="selectUserListByPostName" parameterType="String" resultMap="SysUserResult">
+		select * from sys_user u
+		left join sys_user_post up on u.user_id = up.user_id
+		left join sys_post p on up.post_id = p.post_id
+		where p.post_name = #{param}
 	</select>
 
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
-		select r.user_id, r.nick_name from
-		(select u1.user_id, u1.nick_name, u.dept_id from
-		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
-		left join sys_user_post as up
-		on r.user_id = up.user_id
-		where up.post_id = 13
+		select u.user_id, u.nick_name from sys_user as u
+		left join sys_user_post as up on u.user_id = up.user_id
+		left join sys_post as p on up.post_id = p.post_id
+		where p.post_name = '主任' and u.user_id = #{param}
 	</select>
 
 	<select id="selectViceDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
-	select r.user_id, r.nick_name from
-	(select u1.user_id, u1.nick_name, u.dept_id from
-	sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
-	left join sys_user_post as up
-	on r.user_id = up.user_id
-	where up.post_id = 14 order by user_id desc limit 1
+		select u.user_id, u.nick_name from sys_user as u
+		left join sys_user_post as up on u.user_id = up.user_id
+		left join sys_post as p on up.post_id = p.post_id
+		where p.post_name = '副主任' and u.user_id = #{param} order by u.user_id desc limit 1
 	</select>
 
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
-		select r.user_id, r.nick_name, up.post_id from
-		(select user_id, nick_name, dept_id from
-		sys_user where dept_id = #{param}) as r
-		left join sys_user_post as up
-		on r.user_id = up.user_id
-		where up.post_id = 13
+		select u.user_id, u.nick_name from sys_user as u
+		left join sys_user_post as up on u.user_id = up.user_id
+		left join sys_post as p on up.post_id = p.post_id
+		where p.post_name = '副主任' and u.dept_id = #{param}
 	</select>
 
 	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
-		select r.user_id, r.nick_name, up.post_id from
-		(select user_id, nick_name, dept_id from
-		sys_user where dept_id = #{param}) as r
-		left join sys_user_post as up
-		on r.user_id = up.user_id
-		where up.post_id = 14 order by user_id desc limit 1
+		select u.user_id, u.nick_name from sys_user as u
+		left join sys_user_post as up on u.user_id = up.user_id
+		left join sys_post as p on up.post_id = p.post_id
+		where p.post_name = '副主任' and u.dept_id = #{param} order by u.user_id desc limit 1
 	</select>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">

oa-ui/src/api/system/post.js

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-03-07 17:33:37
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-14 14:44:34
+ * @LastEditTime: 2024-05-22 16:17:43
  */
 import request from '@/utils/request'
 
@@ -15,19 +15,12 @@ export function listPost(query) {
   })
 }
 
-// 查询驾驶员列表
-export function listDriver() {
+// 根据岗位查用户
+export function getUserByPost(query) {
   return request({
-    url: '/system/post/driverList',
-    method: 'get'
-  })
-}
-
-// 查询总经理
-export function getGm() {
-  return request({
-    url: '/system/post/gm',
-    method: 'get'
+    url: '/system/post/postName',
+    method: 'get',
+    params: query
   })
 }
 

oa-ui/src/api/system/role.js

@@ -20,7 +20,7 @@ export function getRole(roleId) {
 // 查询角色详细
 export function getUserByRole(roleId) {
   return request({
-    url: '/system/getUserByRole',
+    url: '/system/role/getUserByRole',
     method: 'get',    
     params: roleId
   })

oa-ui/src/router/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 16:24:43
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-22 13:51:01
  */
 /*
  * @Author: ysh
@@ -179,28 +179,28 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/car/expense',
+    path: '/car/detail',
     component: Layout,
     hidden: true,
     children: [
       {
         path: '',
-        component: () => import('@/views/oa/car/expense'),
-        name: 'carExpense',
+        component: () => import('@/views/oa/car/detail'),
+        name: 'carDetail',
         meta: { title: '车辆明细', icon: '' }
 
       }
     ]
   },
   {
-    path: '/device/approval',
+    path: '/device/detail',
     component: Layout,
     hidden: true,
     children: [
       {
         path: '',
-        component: () => import('@/views/oa/device/approval'),
-        name: 'deviceApproval',
+        component: () => import('@/views/oa/device/detail'),
+        name: 'deviceDetail',
         meta: { title: '设备明细', icon: '' }
 
       }

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

@@ -484,7 +484,7 @@ export default {
                 });
               }
               if (this.taskName == '技术部审核') {
-                getUserByRole(6).then(result => {
+                getUserByRole({ roleId: 6 }).then(result => {
                   this.$set(this.taskForm.variables, "approval", result.data[0]);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);

oa-ui/src/views/flowable/form/budget/components/chooseCar.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-27 11:10:16
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-27 14:56:23
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-22 17:55:15
 -->
 <template>
   <div>
@@ -25,8 +25,8 @@
       <el-table-column label="单日成本" align="center" prop="dayCost" />
     </el-table>
     <div style="text-align: right;">
-      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
-        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum" :page-size="queryParams.pageSize"
+        layout="total, prev, pager, next" :total="total">
       </el-pagination>
     </div>
     <div>
@@ -44,7 +44,7 @@
 
 <script>
 import { listCar } from "@/api/oa/car/car";
-import { listDriver } from "@/api/system/post";
+import { getUserByPost } from "@/api/system/post";
 export default {
   data() {
     return {
@@ -76,11 +76,8 @@ export default {
     },
     // 查询驾驶员列表
     getDriverList() {
-      listDriver({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.driverList = response.rows;
+      getUserByPost({ postName: '驾驶员' }).then(response => {
+        this.driverList = response.data;
       })
     },
     handleSelectionChange(val) {

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -253,7 +253,7 @@ import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByD
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
-import { getGm } from "@/api/system/post";
+import { getUserByPost } from "@/api/system/post";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -492,8 +492,8 @@ export default {
                 });
               }
               else if (this.taskName == '分管审核') {
-                getGm().then(res => {
-                  this.$set(this.taskForm.variables, "approval", res.data);
+                getUserByPost({ postName: '总经理' }).then(res => {
+                  this.$set(this.taskForm.variables, "approval", res.data[0].userId);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-14 18:14:03
+ * @LastEditTime: 2024-05-22 18:54:31
 -->
 
 <template>
@@ -16,19 +16,19 @@
               <!-- 申请人填写 -->
               <el-divider></el-divider>
               <el-row :gutter="20">
-                <el-col :span="6" :xs="24">
+                <el-col :span="7" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
                     <!-- <el-input v-model="form.user"></el-input> -->
                     {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" :xs="24">
+                <el-col :span="7" :xs="24">
                   <el-form-item label="所在部门：" prop="dept.deptName">
                     <!-- <el-input v-model="form.deptName"></el-input> -->
                     {{ form.dept.deptName }}
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" :xs="24">
+                <el-col :span="7" :xs="24">
                   <el-form-item label="申请时间：" prop="date">
                     <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" :disabled="taskName != '用车申请'">
@@ -73,7 +73,7 @@
                 </el-input>
               </el-form-item>
               <el-row>
-                <el-col :span="6" :xs="24">
+                <el-col :span="7" :xs="24">
                   <el-form-item label="乘车人数：" prop="passengers">
                     <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
                   </el-form-item>
@@ -92,7 +92,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" :xs="24">
+                <el-col :span="5" :xs="24">
                   <el-form-item label="共计:">
                     {{ form.days + '天' }}
                   </el-form-item>
@@ -243,12 +243,13 @@ import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
-import { listDriver, getGm } from "@/api/system/post";
+import { getUserByPost } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listUser } from '@/api/system/user';
+import { getUserByRole } from "@/api/system/role";
 export default {
   components: {
     flow
@@ -454,19 +455,28 @@ export default {
           this.$set(this.taskForm.variables, "dept", this.dept);
           if (res.data && this.dept != 0) {
             this.$set(this.taskForm.variables, "approval", res.data.userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack')
+            })
           } else if (this.dept == 102) {
-            getGm().then(result => {
-              this.$set(this.taskForm.variables, "approval", result.data);
+            getUserByPost({ postName: '总经理' }).then(result => {
+              this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              })
             })
           } else {
-            let userId = this.getChooseType()
-            this.$set(this.taskForm.variables, "approval", userId);
+            let postName = this.getChooseType()
+            getUserByPost({ postName: postName }).then(result => {
+              this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              })
+            })
           }
-
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack')
-          });
         })
       } else if (this.taskName == '部门审核') {
         getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
@@ -478,7 +488,7 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
-        getUserByRole(3).then(result => {
+        getUserByRole({ roleId: 4 }).then(result => {
           this.$set(this.taskForm.variables, "approvalList", result.data);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
@@ -493,11 +503,14 @@ export default {
       }
     },
     getChooseType() {
-      if (this.form.carUsage == '2' || this.form.carUsage == '3') {
-        return 4 // 4为党委书记
-      } else {
-        return 142  //142为团委书记
+      if (this.form.carUsage == '2') {
+        return '党总支书记'
+      }
+      else if (this.form.carUsage == '3') {
+        return '工会主席'
       }
+      else
+        return '团委书记'
     },
     // 查询项目列表
     getProjectList() {
@@ -533,11 +546,8 @@ export default {
 
     // 查询驾驶员列表
     getDriverList() {
-      listDriver({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.driverList = response.rows;
+      getUserByPost({ postName: '驾驶员' }).then(response => {
+        this.driverList = response.data;
       })
     },
     // 查询用户列表

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-14 18:16:09
+ * @LastEditTime: 2024-05-22 19:15:50
 -->
 
 <template>
@@ -165,8 +165,14 @@
                 </el-descriptions>
               </el-form-item>
               <el-divider></el-divider>
-              <el-form-item label="设备情况：" prop="remark" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入设备情况" v-model="form.remark"
+              <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>
+              <el-form-item label="备注：" prop="remark" label-width="120px">
+                <el-input type="textarea" :rows="2" placeholder="请输入备注" v-model="form.remark"
                   :disabled="taskName != '归还确认'">
                 </el-input>
               </el-form-item>
@@ -381,12 +387,12 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核') {
-        getUserByRole(5).then(result => {
+        getUserByRole({ roleId: 5 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
-          })
+          });
         });
       } else if (this.taskName == '安排设备') {
         complete(this.taskForm).then(response => {
@@ -394,12 +400,12 @@ export default {
           this.$emit('goBack')
         });
       } else if (this.taskName == '申请确认') {
-        getUserByRole(5).then(result => {
+        getUserByRole({ roleId: 5 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
-          })
+          });
         });
       } else {
         complete(this.taskForm).then(response => {
@@ -434,7 +440,8 @@ export default {
     getDeviceList() {
       listDevice({
         pageNum: 1,
-        pageSize: 99999999
+        pageSize: 99999999,
+        type: '仪器设备'
       }).then(res => {
         this.deviceList = res.rows
       })

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-14 18:13:20
+ * @LastEditTime: 2024-05-22 17:02:59
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -433,7 +433,7 @@ import { getPrice } from "@/api/oa/price/price";
 import ChoosePrice from "./components/choosePrice.vue";
 import { getUser } from "@/api/system/user";
 import { getUserByRole } from "@/api/system/role";
-import { getGm } from "@/api/system/post";
+import { getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import SettlePrint from './components/settlePrint.vue';
@@ -660,7 +660,7 @@ export default {
         if (vaild) {
           this.preserve();
           if (this.taskName == '结算发起') {
-            getUserByRole(5).then(res => {
+            getUserByRole({ roleId: 5 }).then(res => {
               this.getNextFlowNodeFn(res.data[0]);
             })
           } else if (this.taskName == '综合事务部处理') {
@@ -674,8 +674,8 @@ export default {
           } else if (this.taskName == '经营发展部校核') {
             this.getNextFlowNodeFn(null, this.deptId, true);
           } else if (this.taskName == '分管审核') {
-            getGm().then(res => {
-              this.getNextFlowNodeFn(res.data);
+            getUserByPost({ postName: '总经理' }).then(res => {
+              this.getNextFlowNodeFn(res.data[0].userId);
             })
           } else if (this.taskName == '总经理审批') {
             this.getNextFlowNodeFn();

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

@@ -1,372 +1,431 @@
-<template>
-  <div class="app-container">
-    <div class="header">
-      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
-      <h1>{{ '【' + carInfo.licensePlate + '】' }}车辆明细</h1>
-    </div>
-    <el-divider></el-divider>
-    <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
-          车牌号
-        </template>
-        {{ carInfo.licensePlate }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
-          品牌
-        </template>
-        {{ carInfo.brand }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
-          车型
-        </template>
-        {{ carInfo.series }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="cost" class="el-input__icon input-icon" />
-          总价（元）
-        </template>
-        {{ carInfo.cost }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          上牌时间
-        </template>
-        {{ parseTime(carInfo.acquisitionTime, '{y}-{m}-{d}') }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user-solid"></i>
-          驾驶员
-        </template>
-        {{ carInfo.driverUser ? carInfo.driverUser.nickName : '' }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          预计使用年限（年）
-        </template>
-        {{ carInfo.expectLife }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
-          预计行驶里程（万千米）
-        </template>
-        {{ carInfo.expectKm }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="JamYelpSquare" class="el-input__icon input-icon" />
-          是否为租车
-        </template>
-        {{ carInfo.isRent == '0' ? '否' : '是' }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
-          单日成本（元）
-        </template>
-        {{ carInfo.dayCost }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
-          备注
-        </template>
-        {{ carInfo.remark }}
-      </el-descriptions-item>
-    </el-descriptions>
-    <!-- 费用明细 -->
-    <el-divider></el-divider>
-
-    <el-card>
-      <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-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-            @click="handleDelete">删除</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-col>
-      </el-row>
-      <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
-        <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">
-          <template slot-scope="scope">
-            <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="费用金额" align="center" prop="expense">
-          <template slot-scope="scope">
-            {{ scope.row.expense + '元' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.occurDate }}
-          </template>
-        </el-table-column>
-        <el-table-column width="55" align="center" label="备注" 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: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>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
-    </el-card>
-    <!-- 添加明细 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="费用类型" prop="expenseType">
-          <el-select v-model="form.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="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" style="width:150px" /> <el-tag>元</el-tag>
-        </el-form-item>
-        <el-form-item label="发生日期" prop="occurDate">
-          <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择发生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注说明" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注说明" style="width:220px" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getCar } from '@/api/oa/car/car.js'
-import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
-export default {
-  data() {
-    let validateExpense = (rule, value, callback) => {
-      setTimeout(() => {
-        if (!value) {
-          return callback(new Error('请输入金额'));
-        }
-        if (!this.isNumber(Number(value))) {
-          callback(new Error('请输入数字值'));
-        } else {
-          callback();
-        }
-      }, 100)
-    }
-    return {
-      column: 4,
-      carInfo: {},
-      expenseList: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      total: 0,
-      multiple: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      title: '',
-      open: false,
-      form: {},
-      rules: {
-        expenseType: [
-          { required: true, message: '请选择费用类型', trigger: 'change' }
-        ],
-        expense: [
-          { validator: validateExpense, required: true, trigger: 'blur' },
-        ],
-        occurDate: [
-          { required: true, message: '请选择发生日期', trigger: 'change' },
-        ],
-      },
-      loading: false
-    }
-  },
-  created() {
-    if (this.$route.query) {
-      getCar(this.$route.query.carId).then(res => {
-        this.carInfo = res.data;
-      })
-      this.getList();
-    }
-    if (this.$store.state.app.device == 'desktop') {
-
-    } else {
-      this.column = 1
-    }
-  },
-  methods: {
-    getList() {
-      this.queryParams.carId = this.$route.query.carId
-      listCarExpense(this.queryParams).then(res => {
-        this.expenseList = res.rows;
-        this.total = res.total;
-      })
-    },
-    goBack() {
-      let obj = { path: "/car/expense" }
-      this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/car' });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.carExpenseId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加车辆明细";
-    },
-    handleUpdate(row) {
-      this.reset();
-      const carExpenseId = row.carExpenseId || this.ids
-      getCarExpense(carExpenseId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改车辆明细";
-      });
-    },
-    handleDelete(row) {
-      const carExpenseIds = row.carExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
-        return delCarExpense(carExpenseIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    handleExport() {
-      this.download('oa/carExpense/export', {
-        ...this.queryParams
-      }, `carExpense_${new Date().getTime()}.xlsx`)
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        carExpenseId: null,
-        carId: null,
-        expenseType: null,
-        expense: null,
-        occurDate: null,
-        remark: null,
-      };
-      this.resetForm("expenseForm");
-    },
-    submitForm() {
-      this.$refs["expenseForm"].validate(valid => {
-        if (valid) {
-          this.form.carId = this.$route.query.carId
-          if (this.form.carExpenseId != null) {
-            updateCarExpense(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addCarExpense(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    isNumber(value) {
-      return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
-    },
-    expenseTypeText(row) {
-      if (row == '0') {
-        return '保险费'
-      }
-      if (row == '1') {
-        return '维修/保养费'
-      }
-      if (row == '2') {
-        return '轮胎费'
-      }
-    },
-    typeStyle(row) {
-      if (row == '0') {
-        return 'primary'
-      }
-      if (row == '1') {
-        return 'warning'
-      }
-      if (row == '2') {
-        return 'success'
-      }
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.header {
-  position: relative;
-  text-align: center;
-
-  .back {
-    position: absolute;
-    left: 12px;
-    top: -10px;
-  }
-}
-
-.descriptions {
-  padding: 20px 50px;
-}
-
-
-::v-deep .el-descriptions-item__label.is-bordered-label {
-  color: #121212;
-  background: rgba($color: #46a6ff, $alpha: 0.1);
-  width: 200px;
-}
-
-::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
-  border: 1px solid #2d3f62;
-}
+<template>
+  <div class="app-container">
+    <div class="header">
+      <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
+      <h1>{{ '【' + carInfo.licensePlate + '】' }}车辆明细</h1>
+    </div>
+    <el-divider></el-divider>
+    <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
+          车牌号
+        </template>
+        {{ carInfo.licensePlate }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
+          品牌
+        </template>
+        {{ carInfo.brand }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
+          车型
+        </template>
+        {{ carInfo.series }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="cost" class="el-input__icon input-icon" />
+          总价（元）
+        </template>
+        {{ carInfo.cost }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          上牌时间
+        </template>
+        {{ parseTime(carInfo.acquisitionTime, '{y}-{m}-{d}') }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user-solid"></i>
+          驾驶员
+        </template>
+        {{ carInfo.driverUser ? carInfo.driverUser.nickName : '' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          预计使用年限（年）
+        </template>
+        {{ carInfo.expectLife }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
+          预计行驶里程（万千米）
+        </template>
+        {{ carInfo.expectKm }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="JamYelpSquare" class="el-input__icon input-icon" />
+          是否为租车
+        </template>
+        {{ carInfo.isRent == '0' ? '否' : '是' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          单日成本（元）
+        </template>
+        {{ carInfo.dayCost }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
+          备注
+        </template>
+        {{ carInfo.remark }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider></el-divider>
+    <el-row :gutter="20">
+      <!-- 费用明细 -->
+      <el-col :span="12" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <h3>维保记录</h3>
+          </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-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                @click="handleDelete">删除</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-col>
+            <el-col :span="1.5">
+              <el-button type="info" plain icon="el-icon-s-release" size="mini">前往报废</el-button>
+            </el-col>
+          </el-row>
+          <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
+            <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">
+              <template slot-scope="scope">
+                <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="费用金额" align="center" prop="expense">
+              <template slot-scope="scope">
+                {{ scope.row.expense + '元' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+              <template slot-scope="scope">
+                {{ scope.row.occurDate }}
+              </template>
+            </el-table-column>
+            <el-table-column width="55" align="center" label="备注" 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: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>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="expenseTotal > 0" :total="expenseTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+      </el-col>
+      <el-col :span="12" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <h3>派出任务</h3>
+          </div>
+          <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
+            <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="user.nickName">
+              <template slot-scope="scope">
+                {{ scope.row.applierUser ? scope.row.applierUser.nickName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="使用部门" align="center" prop="dept.deptName">
+              <template slot-scope="scope">
+                {{ scope.row.dept ? scope.row.dept.deptName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目编号" align="center" prop="project.projectNumber">
+              <template slot-scope="scope">
+                {{ scope.row.project ? scope.row.project.projectNumber : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称" align="center" prop="project.projectName">
+              <template slot-scope="scope">
+                {{ scope.row.project ? scope.row.project.projectName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="开始时间" align="center" prop="beginDate">
+              <template slot-scope="scope">
+                {{ scope.row.beginDate }}
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" align="center" prop="endDate">
+              <template slot-scope="scope">
+                {{ scope.row.endDate }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="approvalTotal > 0" :total="approvalTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- 添加明细 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="费用类型" prop="expenseType">
+          <el-select v-model="form.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="费用金额" prop="expense">
+          <el-input v-model="form.expense" placeholder="请输入费用金额" style="width:150px" /> <el-tag>元</el-tag>
+        </el-form-item>
+        <el-form-item label="发生日期" prop="occurDate">
+          <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择发生日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注说明" style="width:220px" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getCar } from '@/api/oa/car/car.js'
+import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
+import { listCarApproval } from "@/api/oa/car/carApproval";
+export default {
+  data() {
+    let validateExpense = (rule, value, callback) => {
+      setTimeout(() => {
+        if (!value) {
+          return callback(new Error('请输入金额'));
+        }
+        if (!this.isNumber(Number(value))) {
+          callback(new Error('请输入数字值'));
+        } else {
+          callback();
+        }
+      }, 100)
+    }
+    return {
+      column: 4,
+      carInfo: {},
+      expenseList: [],
+      approvalList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      expenseTotal: 0,
+      approvalTotal: 0,
+      multiple: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      title: '',
+      open: false,
+      form: {},
+      rules: {
+        expenseType: [
+          { required: true, message: '请选择费用类型', trigger: 'change' }
+        ],
+        expense: [
+          { validator: validateExpense, required: true, trigger: 'blur' },
+        ],
+        occurDate: [
+          { required: true, message: '请选择发生日期', trigger: 'change' },
+        ],
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      getCar(this.$route.query.carId).then(res => {
+        this.carInfo = res.data;
+      })
+      this.getList();
+    }
+    if (this.$store.state.app.device == 'desktop') {
+
+    } else {
+      this.column = 1
+    }
+  },
+  methods: {
+    getList() {
+      this.queryParams.carId = this.$route.query.carId;
+      listCarExpense(this.queryParams).then(res => {
+        this.expenseList = res.rows;
+        this.expenseTotal = res.total;
+      });
+      this.queryParams.cars = this.$route.query.carId;
+      listCarApproval(this.queryParams).then(res => {
+        this.approvalList = res.rows;
+        this.approvalTotal = res.total;
+      })
+    },
+    goBack() {
+      let obj = { path: "/car/detail" }
+      this.$tab.closeOpenPage(obj);
+      this.$router.push({ path: '/car' });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.carExpenseId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加车辆明细";
+    },
+    handleUpdate(row) {
+      this.reset();
+      const carExpenseId = row.carExpenseId || this.ids
+      getCarExpense(carExpenseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改车辆明细";
+      });
+    },
+    handleDelete(row) {
+      const carExpenseIds = row.carExpenseId || this.ids;
+      this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
+        return delCarExpense(carExpenseIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    handleExport() {
+      this.download('oa/carExpense/export', {
+        ...this.queryParams
+      }, `carExpense_${new Date().getTime()}.xlsx`)
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carExpenseId: null,
+        carId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null,
+        remark: null,
+      };
+      this.resetForm("expenseForm");
+    },
+    submitForm() {
+      this.$refs["expenseForm"].validate(valid => {
+        if (valid) {
+          this.form.carId = this.$route.query.carId
+          if (this.form.carExpenseId != null) {
+            updateCarExpense(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCarExpense(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isNumber(value) {
+      return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
+    },
+    expenseTypeText(row) {
+      if (row == '0') {
+        return '保险费'
+      }
+      if (row == '1') {
+        return '维修/保养费'
+      }
+      if (row == '2') {
+        return '轮胎费'
+      }
+    },
+    typeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  position: relative;
+  text-align: center;
+
+  .back {
+    position: absolute;
+    left: 12px;
+    top: -10px;
+  }
+}
+
+.descriptions {
+  padding: 20px 50px;
+}
+
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #121212;
+  background: rgba($color: #46a6ff, $alpha: 0.1);
+  width: 200px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #2d3f62;
+}
 </style>

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

@@ -139,7 +139,7 @@
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "@/api/oa/car/car";
-import { listDriver } from "@/api/system/post";
+import { getUserByPost } from "@/api/system/post";
 
 export default {
   name: "Car",
@@ -195,11 +195,8 @@ export default {
     },
     // 查询驾驶员列表
     getDriverList() {
-      listDriver({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.driverList = response.rows;
+      getUserByPost({ postName: '驾驶员' }).then(response => {
+        this.driverList = response.data;
       })
     },
     // 取消按钮
@@ -251,7 +248,7 @@ export default {
     // 新增明细按钮
     handleAddDetail(row) {
       this.$router.push({
-        path: '/car/expense',
+        path: '/car/detail',
         query: {
           carId: row.carId,
         }

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

@@ -84,75 +84,141 @@
         {{ deviceInfo.remark }}
       </el-descriptions-item>
     </el-descriptions>
-    <!-- 费用明细 -->
-    <el-divider></el-divider>
 
-    <el-deviced>
-      <div slot="header" class="clearfix">
-        <h3>设备使用记录</h3>
-      </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-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-            @click="handleDelete">删除</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-col>
-      </el-row>
-      <!-- 设备使用记录 -->
-      <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
-        <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="user.nickName">
-          <template slot-scope="scope">
-            {{ scope.row.applierUser ? scope.row.applierUser.nickName : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="使用部门" align="center" prop="dept.deptName">
-          <template slot-scope="scope">
-            {{ scope.row.dept ? scope.row.dept.deptName : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目编号" align="center" prop="project.projectNumber">
-          <template slot-scope="scope">
-            {{ scope.row.project ? scope.row.project.projectNumber : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" prop="project.projectName">
-          <template slot-scope="scope">
-            {{ scope.row.project ? scope.row.project.projectName : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" align="center" prop="beginDate">
-          <template slot-scope="scope">
-            {{ scope.row.beginDate }}
-          </template>
-        </el-table-column>
-        <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.returnDate }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['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>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
-    </el-deviced>
+    <el-divider></el-divider>
+    <el-row :gutter="20">
+      <!-- 维保记录 -->
+      <el-col :span="12" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <h3>维保记录</h3>
+          </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-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                @click="handleDelete">删除</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-col>
+            <el-col :span="1.5">
+              <el-button type="info" plain icon="el-icon-s-release" size="mini">前往报废</el-button>
+            </el-col>
+          </el-row>
+          <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
+            <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">
+              <template slot-scope="scope">
+                <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="费用金额" align="center" prop="expense">
+              <template slot-scope="scope">
+                {{ scope.row.expense + '元' }}
+              </template>
+            </el-table-column>
+            <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}}
+              </template>
+            </el-table-column>
+            <el-table-column width="55" align="center" label="备注" 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: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>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="expenseTotal > 0" :total="expenseTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </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-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-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                @click="handleDelete">删除</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-col>
+          </el-row>
+          <!-- 设备使用记录 -->
+          <el-table v-loading="loading" :data="approvalList" @selection-change="handleSelectionChange">
+            <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="user.nickName">
+              <template slot-scope="scope">
+                {{ scope.row.applierUser ? scope.row.applierUser.nickName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="使用部门" align="center" prop="dept.deptName">
+              <template slot-scope="scope">
+                {{ scope.row.dept ? scope.row.dept.deptName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目编号" align="center" prop="project.projectNumber">
+              <template slot-scope="scope">
+                {{ scope.row.project ? scope.row.project.projectNumber : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称" align="center" prop="project.projectName">
+              <template slot-scope="scope">
+                {{ scope.row.project ? scope.row.project.projectName : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="申请时间" align="center" prop="beginDate">
+              <template slot-scope="scope">
+                {{ scope.row.beginDate }}
+              </template>
+            </el-table-column>
+            <el-table-column label="归还时间" align="center" prop="returnDate" width="180">
+              <template slot-scope="scope">
+                {{ scope.row.returnDate }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                  v-hasPermi="['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>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </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">
@@ -229,8 +295,11 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      expenseTotal: 0,
       // cmc设备审批表格数据
       approvalList: [],
+      expenseList: [],
+      cardName: '',
       column: 4,
       deviceInfo: {},
       // 弹出层标题
@@ -247,11 +316,17 @@ export default {
       // 表单校验
       rules: {
       },
-      loading: false
+      loading: false,
+      routeType:''
     }
   },
   created() {
     if (this.$route.query) {
+      this.routeType = this.$route.query.type
+      if (this.$route.query.type == 'equipment')
+        this.cardName = '申领记录';
+      else
+        this.cardName = '移交记录';
       getDevice(this.$route.query.deviceId).then(res => {
         this.deviceInfo = res.data;
       })
@@ -272,9 +347,9 @@ export default {
       })
     },
     goBack() {
-      let obj = { path: "/device/approval" }
+      let obj = { path: "/device/detail" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/device' });
+      this.$router.push({ path: '/device/'+ this.routeType });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -368,6 +443,28 @@ export default {
     isNumber(value) {
       return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
     },
+    expenseTypeText(row) {
+      if (row == '0') {
+        return '保险费'
+      }
+      if (row == '1') {
+        return '维修/保养费'
+      }
+      if (row == '2') {
+        return '检定费'
+      }
+    },
+    typeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+    }
   },
 }
 </script>

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

@@ -1,290 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仪器id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入仪器id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="费用金额" prop="expense">
-        <el-input
-          v-model="queryParams.expense"
-          placeholder="请输入费用金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发生日期" prop="occurDate">
-        <el-date-picker clearable
-          v-model="queryParams.occurDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择发生日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:deviceExpense:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:deviceExpense:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:deviceExpense:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:deviceExpense:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="deviceExpenseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="仪器费用id" align="center" prop="deviceExpenseId" />
-      <el-table-column label="仪器id" align="center" prop="deviceId" />
-      <el-table-column label="费用类型" align="center" prop="expenseType" />
-      <el-table-column label="费用金额" align="center" prop="expense" />
-      <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.occurDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <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:deviceExpense:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:deviceExpense:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改cmc仪器费用对话框 -->
-    <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="仪器id" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入仪器id" />
-        </el-form-item>
-        <el-form-item label="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" />
-        </el-form-item>
-        <el-form-item label="发生日期" prop="occurDate">
-          <el-date-picker clearable
-            v-model="form.occurDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择发生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
-
-export default {
-  name: "DeviceExpense",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc仪器费用表格数据
-      deviceExpenseList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: null,
-        expenseType: null,
-        expense: null,
-        occurDate: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询cmc仪器费用列表 */
-    getList() {
-      this.loading = true;
-      listDeviceExpense(this.queryParams).then(response => {
-        this.deviceExpenseList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deviceExpenseId: null,
-        deviceId: null,
-        expenseType: null,
-        expense: null,
-        occurDate: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.deviceExpenseId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc仪器费用";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const deviceExpenseId = row.deviceExpenseId || this.ids
-      getDeviceExpense(deviceExpenseId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc仪器费用";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.deviceExpenseId != null) {
-            updateDeviceExpense(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDeviceExpense(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const deviceExpenseIds = row.deviceExpenseId || this.ids;
-      this.$modal.confirm('是否确认删除cmc仪器费用编号为"' + deviceExpenseIds + '"的数据项？').then(function() {
-        return delDeviceExpense(deviceExpenseIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/deviceExpense/export', {
-        ...this.queryParams
-      }, `deviceExpense_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>

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

@@ -186,7 +186,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         code: null,
-        type: null,
+        type: '仪器设备',
         acquisitionTime: null,
         cost: null,
         expectLife: null,
@@ -206,7 +206,6 @@ export default {
     /** 查询cmc设备信息列表 */
     getList() {
       this.loading = true;
-      this.queryParams.type = '仪器设备';
       listDevice(this.queryParams).then(response => {
         this.deviceList = response.rows;
         this.total = response.total;
@@ -256,8 +255,9 @@ export default {
     // 新增明细按钮
     handleAddDetail(row) {
       this.$router.push({
-        path: '/device/approval',
+        path: '/device/detail',
         query: {
+          type: 'equipment',
           deviceId: row.deviceId,
         }
       })

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

@@ -186,7 +186,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         code: null,
-        type: null,
+        type: '办公设备',
         acquisitionTime: null,
         cost: null,
         expectLife: null,
@@ -206,7 +206,6 @@ export default {
     /** 查询cmc设备信息列表 */
     getList() {
       this.loading = true;
-      this.queryParams.type = '办公设备';
       listDevice(this.queryParams).then(response => {
         this.deviceList = response.rows;
         this.total = response.total;
@@ -256,8 +255,9 @@ export default {
     // 新增明细按钮
     handleAddDetail(row) {
       this.$router.push({
-        path: '/device/approval',
+        path: '/device/detail',
         query: {
+          type: 'supply',
           deviceId: row.deviceId,
         }
       })