耗材首页显示

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -731,19 +731,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
                     .moveActivityIdsToSingleActivityId(currentIds, lastHistoricTaskDefinitionKey).changeState();
-            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
-            List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
-                    .processInstanceId(task.getProcessInstanceId())
-                    .taskDefinitionKey(lastHistoricTaskDefinitionKey)
-                    .list();
-            String taskAssignee = "";
-            for (HistoricTaskInstance hti: htiTargetList) {
-                if (!hti.getId().equals(currentTaskId)) {
-                    taskAssignee = hti.getAssignee();
-                    break;
-                }
-            }
-            taskService.setAssignee(currentTaskId, taskAssignee);
+//            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+//            List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
+//                    .processInstanceId(task.getProcessInstanceId())
+//                    .taskDefinitionKey(lastHistoricTaskDefinitionKey)
+//                    .list();
+//            String taskAssignee = "";
+//            for (HistoricTaskInstance hti: htiTargetList) {
+//                if (!hti.getId().equals(currentTaskId)) {
+//                    taskAssignee = hti.getAssignee();
+//                    break;
+//                }
+//            }
+//            taskService.setAssignee(currentTaskId, taskAssignee);
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -22,7 +23,12 @@ public class CmcMaterialBuy extends BaseEntity
     private Integer buyId;
 
     /** 耗材id */
-    @Excel(name = "耗材id")
+    @Excel(name = "耗材名称")
+    private String name;
+    @Excel(name = "品牌")
+    private String brand;
+    @Excel(name = "系列")
+    private String series;
     private Integer materialId;
 
     /** 采购日期 */
@@ -48,8 +54,13 @@ public class CmcMaterialBuy extends BaseEntity
 
     /** 采购人 */
     @Excel(name = "采购人")
+    private String buyUserName;
     private Long buyer;
 
+    private SysUser buyUser;
+
+    private CmcMaterial material;
+
     public void setBuyId(Integer buyId) 
     {
         this.buyId = buyId;
@@ -59,6 +70,21 @@ public class CmcMaterialBuy extends BaseEntity
     {
         return buyId;
     }
+
+    public void setMaterial(CmcMaterial material)
+    {
+        this.material = material;
+        if (material != null) {
+            this.brand = material.getBrand();
+            this.series = material.getSeries();
+            this.name = material.getName();
+        }
+    }
+
+    public CmcMaterial getMaterial()
+    {
+        return material;
+    }
     public void setMaterialId(Integer materialId) 
     {
         this.materialId = materialId;
@@ -122,6 +148,16 @@ public class CmcMaterialBuy extends BaseEntity
     {
         return buyer;
     }
+    public void setBuyUser(SysUser buyUser)
+    {
+        this.buyUser = buyUser;
+        this.buyUserName = buyUser == null ? "" : buyUser.getNickName();
+    }
+
+    public SysUser getBuyUser()
+    {
+        return buyUser;
+    }
 
     @Override
     public String toString() {

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

@@ -2,6 +2,8 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -21,7 +23,12 @@ public class CmcMaterialGive extends BaseEntity
     private Integer giveId;
 
     /** 耗材id */
-    @Excel(name = "耗材id")
+    @Excel(name = "耗材名称")
+    private String name;
+    @Excel(name = "品牌")
+    private String brand;
+    @Excel(name = "系列")
+    private String series;
     private Integer materialId;
 
     /** 发放时间 */
@@ -31,16 +38,24 @@ public class CmcMaterialGive extends BaseEntity
 
     /** 领用人 */
     @Excel(name = "领用人")
-    private Long accpter;
+    private String acceptUserName;
+    private Long accepter;
 
     /** 领用部门 */
     @Excel(name = "领用部门")
+    private String deptName;
     private Long useDept;
 
     /** 领用数量 */
     @Excel(name = "领用数量")
     private Double giveNum;
 
+    private SysUser acceptUser;
+
+    private SysDept dept;
+
+    private CmcMaterial material;
+
     public void setGiveId(Integer giveId) 
     {
         this.giveId = giveId;
@@ -55,10 +70,23 @@ public class CmcMaterialGive extends BaseEntity
         this.materialId = materialId;
     }
 
-    public Integer getMaterialId() 
-    {
+    public Integer getMaterialId() {
         return materialId;
     }
+    public void setMaterial(CmcMaterial material)
+    {
+        this.material = material;
+        if (material != null) {
+            this.brand = material.getBrand();
+            this.series = material.getSeries();
+            this.name = material.getName();
+        }
+    }
+
+    public CmcMaterial getMaterial()
+    {
+        return material;
+    }
     public void setGiveTime(Date giveTime) 
     {
         this.giveTime = giveTime;
@@ -68,14 +96,24 @@ public class CmcMaterialGive extends BaseEntity
     {
         return giveTime;
     }
-    public void setAccpter(Long accpter) 
+    public void setAccepter(Long accepter) 
     {
-        this.accpter = accpter;
+        this.accepter = accepter;
     }
 
-    public Long getAccpter() 
+    public Long getAccepter() 
     {
-        return accpter;
+        return accepter;
+    }
+    public void setAcceptUser(SysUser acceptUser)
+    {
+        this.acceptUser = acceptUser;
+        this.acceptUserName = acceptUser == null ? "" : acceptUser.getNickName();
+    }
+
+    public SysUser getAcceptUser()
+    {
+        return acceptUser;
     }
     public void setUseDept(Long useDept) 
     {
@@ -86,6 +124,16 @@ public class CmcMaterialGive extends BaseEntity
     {
         return useDept;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setGiveNum(Double giveNum) 
     {
         this.giveNum = giveNum;
@@ -102,7 +150,7 @@ public class CmcMaterialGive extends BaseEntity
             .append("giveId", getGiveId())
             .append("materialId", getMaterialId())
             .append("giveTime", getGiveTime())
-            .append("accpter", getAccpter())
+            .append("accepter", getAccepter())
             .append("useDept", getUseDept())
             .append("giveNum", getGiveNum())
             .append("remark", getRemark())

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

@@ -29,12 +29,11 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name from cmc_device as d left join sys_dept as dept
+        select d.device_id, d.device_number, d.code, d.name, d.type, d.acquisition_time, d.cost, d.expect_life, d.series, d.brand, d.day_cost, d.place, d.remark, d.manage_dept, d.status, dept.dept_name from cmc_device as d left join sys_dept as dept on dept.dept_id = d.manage_dept
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
-        on dept.dept_id = d.manage_dept
         <where>
             <if test="deviceNumber != null  and deviceNumber != ''"> and d.device_number like concat('%', #{deviceNumber}, '%')</if>
             <if test="code != null  and code != ''"> and d.code like concat('%', #{code}, '%')</if>
@@ -54,7 +53,6 @@
 
     <select id="selectCmcDeviceByDeviceId" parameterType="Integer" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
-        on dept.dept_id = d.manage_dept
         where d.device_id = #{deviceId}
     </select>
 

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

@@ -14,28 +14,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="amount"    column="amount"    />
         <result property="buyer"    column="buyer"    />
         <result property="remark"    column="remark"    />
+        <association property="buyUser"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="material"    javaType="CmcMaterial"         resultMap="CmcMaterialResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="buy_nick_name"    />
+    </resultMap>
+
+    <resultMap type="CmcMaterial" id="CmcMaterialResult">
+        <result property="materialId"    column="material_id"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcMaterialBuyVo">
-        select buy_id, material_id, buy_time, place, total_num, price, amount, buyer, remark from cmc_material_buy
+        select mb.buy_id, mb.material_id, mb.buy_time, mb.place, mb.total_num, mb.price, mb.amount, mb.buyer, mb.remark, u.nick_name as buy_nick_name, m.brand, m.name, m.series from cmc_material_buy as mb
+        left join sys_user as u on u.user_id = mb.buyer
+        left join cmc_material as m on m.material_id = mb.material_id
     </sql>
 
     <select id="selectCmcMaterialBuyList" parameterType="CmcMaterialBuy" resultMap="CmcMaterialBuyResult">
         <include refid="selectCmcMaterialBuyVo"/>
         <where>  
-            <if test="materialId != null "> and material_id = #{materialId}</if>
-            <if test="buyTime != null "> and buy_time = #{buyTime}</if>
-            <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="totalNum != null "> and total_num = #{totalNum}</if>
-            <if test="price != null "> and price = #{price}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="buyer != null "> and buyer = #{buyer}</if>
+            <if test="materialId != null "> and mb.material_id = #{materialId}</if>
+            <if test="buyTime != null "> and mb.buy_time = #{buyTime}</if>
+            <if test="place != null  and place != ''"> and mb.place = #{place}</if>
+            <if test="totalNum != null "> and mb.total_num = #{totalNum}</if>
+            <if test="price != null "> and mb.price = #{price}</if>
+            <if test="amount != null "> and mb.amount = #{amount}</if>
+            <if test="buyer != null "> and mb.buyer = #{buyer}</if>
         </where>
     </select>
     
     <select id="selectCmcMaterialBuyByBuyId" parameterType="Integer" resultMap="CmcMaterialBuyResult">
         <include refid="selectCmcMaterialBuyVo"/>
-        where buy_id = #{buyId}
+        where mb.buy_id = #{buyId}
     </select>
         
     <insert id="insertCmcMaterialBuy" parameterType="CmcMaterialBuy" useGeneratedKeys="true" keyProperty="buyId">

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

@@ -8,30 +8,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="giveId"    column="give_id"    />
         <result property="materialId"    column="material_id"    />
         <result property="giveTime"    column="give_time"    />
-        <result property="accpter"    column="accpter"    />
+        <result property="accepter"    column="accepter"    />
         <result property="useDept"    column="use_dept"    />
         <result property="giveNum"    column="give_num"    />
         <result property="remark"    column="remark"    />
+        <association property="acceptUser"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
+        <association property="material"    javaType="CmcMaterial"         resultMap="CmcMaterialResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="accept_nick_name"    />
+    </resultMap>
+
+    <resultMap id="deptResult" type="SysDept">
+        <id     property="deptId"    column="dept_id"     />
+        <result property="deptName"  column="dept_name"   />
+    </resultMap>
+
+    <resultMap type="CmcMaterial" id="CmcMaterialResult">
+        <result property="materialId"    column="material_id"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
     </resultMap>
 
     <sql id="selectCmcMaterialGiveVo">
-        select give_id, material_id, give_time, accpter, use_dept, give_num, remark from cmc_material_give
+        select mg.give_id, mg.material_id, mg.give_time, mg.accepter, mg.use_dept, mg.give_num, mg.remark, d.dept_name, u.nick_name as accept_nick_name, m.brand, m.name, m.series from cmc_material_give as mg
+        left join sys_user as u on u.user_id = mg.accepter
+        left join sys_dept as d on d.dept_id = mg.use_dept
+        left join cmc_material as m on m.material_id = mg.material_id
     </sql>
 
     <select id="selectCmcMaterialGiveList" parameterType="CmcMaterialGive" resultMap="CmcMaterialGiveResult">
         <include refid="selectCmcMaterialGiveVo"/>
         <where>  
-            <if test="materialId != null "> and material_id = #{materialId}</if>
-            <if test="giveTime != null "> and give_time = #{giveTime}</if>
-            <if test="accpter != null "> and accpter = #{accpter}</if>
-            <if test="useDept != null "> and use_dept = #{useDept}</if>
-            <if test="giveNum != null "> and give_num = #{giveNum}</if>
+            <if test="materialId != null "> and mg.material_id = #{materialId}</if>
+            <if test="giveTime != null "> and mg.give_time = #{giveTime}</if>
+            <if test="accepter != null "> and mg.accepter = #{accepter}</if>
+            <if test="useDept != null "> and mg.use_dept = #{useDept}</if>
+            <if test="giveNum != null "> and mg.give_num = #{giveNum}</if>
         </where>
     </select>
     
     <select id="selectCmcMaterialGiveByGiveId" parameterType="Integer" resultMap="CmcMaterialGiveResult">
         <include refid="selectCmcMaterialGiveVo"/>
-        where give_id = #{giveId}
+        where mg.give_id = #{giveId}
     </select>
         
     <insert id="insertCmcMaterialGive" parameterType="CmcMaterialGive" useGeneratedKeys="true" keyProperty="giveId">
@@ -39,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="materialId != null">material_id,</if>
             <if test="giveTime != null">give_time,</if>
-            <if test="accpter != null">accpter,</if>
+            <if test="accepter != null">accepter,</if>
             <if test="useDept != null">use_dept,</if>
             <if test="giveNum != null">give_num,</if>
             <if test="remark != null">remark,</if>
@@ -47,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialId != null">#{materialId},</if>
             <if test="giveTime != null">#{giveTime},</if>
-            <if test="accpter != null">#{accpter},</if>
+            <if test="accepter != null">#{accepter},</if>
             <if test="useDept != null">#{useDept},</if>
             <if test="giveNum != null">#{giveNum},</if>
             <if test="remark != null">#{remark},</if>
@@ -59,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="materialId != null">material_id = #{materialId},</if>
             <if test="giveTime != null">give_time = #{giveTime},</if>
-            <if test="accpter != null">accpter = #{accpter},</if>
+            <if test="accepter != null">accepter = #{accepter},</if>
             <if test="useDept != null">use_dept = #{useDept},</if>
             <if test="giveNum != null">give_num = #{giveNum},</if>
             <if test="remark != null">remark = #{remark},</if>

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

@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
-		order by u.user_id
+		order by u.dept_id, u.user_id
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">

oa-ui/src/assets/icons/svg/buy.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722582011242" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6299" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M955.963733 278.755556L307.4304 273.066667c-17.066667 0-34.133333 17.066667-34.133333 34.133333s17.066667 34.133333 34.133333 34.133333l603.022222 5.688889-136.533333 233.244445H284.674844L227.785956 204.8c0-22.755556-22.755556-39.822222-79.644445-73.955556-5.688889-5.688889-11.377778-5.688889-17.066667-11.377777-17.066667-11.377778-34.133333-22.755556-56.888888-34.133334-11.377778-5.688889-22.755556-11.377778-22.755556-17.066666-17.066667-11.377778-34.133333-5.688889-45.511111 11.377777-11.377778 17.066667-5.688889 34.133333 11.377778 45.511112 5.688889 0 11.377778 5.688889 22.755555 11.377777l51.2 34.133334c5.688889 5.688889 11.377778 5.688889 17.066667 11.377777 17.066667 11.377778 34.133333 22.755556 45.511111 28.444445 5.688889 5.688889 5.688889 5.688889 11.377778 5.688889l91.022222 534.755555v11.377778c0 17.066667 17.066667 34.133333 34.133333 34.133333h28.444445c-28.444444 17.066667-45.511111 51.2-45.511111 85.333334 0 56.888889 45.511111 108.088889 108.088889 108.088889s108.088889-45.511111 108.088888-108.088889c0-34.133333-17.066667-68.266667-45.511111-85.333334h244.622223c-28.444444 17.066667-45.511111 51.2-45.511112 85.333334 0 56.888889 45.511111 108.088889 108.088889 108.088889 56.888889 0 108.088889-45.511111 108.088889-108.088889 0-34.133333-17.066667-68.266667-45.511111-85.333334h51.2c17.066667 0 34.133333-17.066667 34.133333-34.133333s-17.066667-34.133333-34.133333-34.133333H313.119289l-17.066667-85.333334H796.674844c11.377778 0 28.444444-11.377778 28.444445-22.755555l159.288889-295.822222c11.377778-22.755556-5.688889-45.511111-28.444445-45.511111zM375.697067 927.288889c-22.755556 0-45.511111-17.066667-45.511111-45.511111 0-22.755556 17.066667-45.511111 45.511111-45.511111 22.755556 0 45.511111 17.066667 45.511111 45.511111 0 22.755556-17.066667 45.511111-45.511111 45.511111z m375.466666 0c-22.755556 0-45.511111-17.066667-45.511111-45.511111 0-22.755556 17.066667-45.511111 45.511111-45.511111 22.755556 0 45.511111 17.066667 45.511111 45.511111 0 22.755556-22.755556 45.511111-45.511111 45.511111zM159.519289 210.488889l5.688889 5.688889 5.688889 5.688889c-5.688889-5.688889-11.377778-5.688889-11.377778-11.377778z" p-id="6300"></path></svg>

oa-ui/src/assets/icons/svg/material.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722581283457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4329" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M774.4 774.4l-86.4-6.4v-80h44.8v-131.2H294.4v131.2h44.8v86.4H249.6c-57.6 0-89.6-51.2-86.4-112v-227.2c0-57.6 28.8-96 86.4-96h524.8c57.6 0 86.4 38.4 86.4 96v227.2c0 54.4-28.8 112-86.4 112z m-438.4-480V233.6c0-38.4 32-70.4 70.4-70.4h208c38.4 0 70.4 32 70.4 70.4v60.8H336z m307.2 566.4h-262.4v-262.4h262.4v262.4z m-86.4-172.8h-86.4v44.8h86.4v-44.8z m0 86.4h-86.4v44.8h86.4v-44.8z" p-id="4330"></path></svg>

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 14:50:10
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-01 17:13:20
 -->
 <template>
   <div class="app-container">
@@ -11,7 +11,7 @@
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
-          <el-row :gutter="20">择
+          <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
                 <el-button type="primary" size="mini" @click="tbOpen = true"

oa-ui/src/views/oa/material/buy.vue

@@ -111,8 +111,11 @@
 
     <el-table v-loading="loading" :data="materialBuyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耗材购买id" align="center" prop="buyId" />
-      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <!-- <el-table-column label="耗材购买id" align="center" prop="buyId" /> -->
+      <!-- <el-table-column label="耗材id" align="center" prop="materialId" /> -->      
+      <el-table-column label="耗材品牌" align="center" prop="material.brand" />
+      <el-table-column label="耗材名称" align="center" prop="material.name" />
+      <el-table-column label="规格型号" align="center" prop="material.series" />
       <el-table-column label="采购日期" align="center" prop="buyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.buyTime, '{y}-{m}-{d}') }}</span>
@@ -122,7 +125,7 @@
       <el-table-column label="采购数量" align="center" prop="totalNum" />
       <el-table-column label="单价" align="center" prop="price" />
       <el-table-column label="总价" align="center" prop="amount" />
-      <el-table-column label="采购人" align="center" prop="buyer" />
+      <el-table-column label="采购人" align="center" prop="buyUser.nickName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -221,7 +224,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         materialId: null,
         buyTime: null,
         place: null,

oa-ui/src/views/oa/material/give.vue

@@ -17,9 +17,9 @@
           placeholder="请选择发放时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="领用人" prop="accpter">
+      <el-form-item label="领用人" prop="accepter">
         <el-input
-          v-model="queryParams.accpter"
+          v-model="queryParams.accepter"
           placeholder="请输入领用人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -95,15 +95,18 @@
 
     <el-table v-loading="loading" :data="materialGiveList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="耗材发放id" align="center" prop="giveId" />
-      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <!-- <el-table-column label="耗材发放id" align="center" prop="giveId" /> -->
+      <!-- <el-table-column label="耗材id" align="center" prop="materialId" /> -->
+      <el-table-column label="耗材品牌" align="center" prop="material.brand" />
+      <el-table-column label="耗材名称" align="center" prop="material.name" />
+      <el-table-column label="规格型号" align="center" prop="material.series" />
       <el-table-column label="发放时间" align="center" prop="giveTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.giveTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="领用人" align="center" prop="accpter" />
-      <el-table-column label="领用部门" align="center" prop="useDept" />
+      <el-table-column label="领用人" align="center" prop="acceptUser.nickName" />
+      <el-table-column label="领用部门" align="center" prop="dept.deptName" />
       <el-table-column label="领用数量" align="center" prop="giveNum" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -148,8 +151,8 @@
             placeholder="请选择发放时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="领用人" prop="accpter">
-          <el-input v-model="form.accpter" placeholder="请输入领用人" />
+        <el-form-item label="领用人" prop="accepter">
+          <el-input v-model="form.accepter" placeholder="请输入领用人" />
         </el-form-item>
         <el-form-item label="领用部门" prop="useDept">
           <el-input v-model="form.useDept" placeholder="请输入领用部门" />
@@ -197,10 +200,10 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         materialId: null,
         giveTime: null,
-        accpter: null,
+        accepter: null,
         useDept: null,
         giveNum: null,
       },
@@ -235,7 +238,7 @@ export default {
         giveId: null,
         materialId: null,
         giveTime: null,
-        accpter: null,
+        accepter: null,
         useDept: null,
         giveNum: null,
         remark: null

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

@@ -201,7 +201,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         name: null,
         type: null,
         series: null,