办公用品表

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcSupply;
+import com.ruoyi.oa.service.ICmcSupplyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc用品信息Controller
+ * 
+ * @author cmc
+ * @date 2024-04-25
+ */
+@RestController
+@RequestMapping("/oa/supply")
+public class CmcSupplyController extends BaseController
+{
+    @Autowired
+    private ICmcSupplyService cmcSupplyService;
+
+    /**
+     * 查询cmc用品信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSupply cmcSupply)
+    {
+        startPage();
+        List<CmcSupply> list = cmcSupplyService.selectCmcSupplyList(cmcSupply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc用品信息列表
+     */
+    @Log(title = "cmc用品信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSupply cmcSupply)
+    {
+        List<CmcSupply> list = cmcSupplyService.selectCmcSupplyList(cmcSupply);
+        ExcelUtil<CmcSupply> util = new ExcelUtil<CmcSupply>(CmcSupply.class);
+        util.exportExcel(response, list, "cmc用品信息数据");
+    }
+
+    /**
+     * 获取cmc用品信息详细信息
+     */
+    @GetMapping(value = "/{supplyId}")
+    public AjaxResult getInfo(@PathVariable("supplyId") Long supplyId)
+    {
+        return success(cmcSupplyService.selectCmcSupplyBySupplyId(supplyId));
+    }
+
+    /**
+     * 新增cmc用品信息
+     */
+    @Log(title = "cmc用品信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSupply cmcSupply)
+    {
+        return toAjax(cmcSupplyService.insertCmcSupply(cmcSupply));
+    }
+
+    /**
+     * 修改cmc用品信息
+     */
+    @Log(title = "cmc用品信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSupply cmcSupply)
+    {
+        return toAjax(cmcSupplyService.updateCmcSupply(cmcSupply));
+    }
+
+    /**
+     * 删除cmc用品信息
+     */
+    @Log(title = "cmc用品信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{supplyIds}")
+    public AjaxResult remove(@PathVariable Long[] supplyIds)
+    {
+        return toAjax(cmcSupplyService.deleteCmcSupplyBySupplyIds(supplyIds));
+    }
+}

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

@@ -0,0 +1,253 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc用品信息对象 cmc_supply
+ * 
+ * @author cmc
+ * @date 2024-04-25
+ */
+public class CmcSupply extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 办公用品id */
+    private Long supplyId;
+
+    /** 办公用品编码 */
+    @Excel(name = "办公用品编码")
+    private String supplyNumber;
+
+    /** 出厂编号 */
+    @Excel(name = "出厂编号")
+    private String code;
+
+    /** 用品名称 */
+    @Excel(name = "用品名称")
+    private String name;
+
+    /** 用品类别 */
+    @Excel(name = "用品类别")
+    private String type;
+
+    /** 购置时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date acquisitionTime;
+
+    /** 购买价格 */
+    @Excel(name = "购买价格")
+    private BigDecimal cost;
+
+    /** 预计使用年限 */
+    @Excel(name = "预计使用年限")
+    private Long expectLife;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String series;
+
+    /** 用品品牌 */
+    @Excel(name = "用品品牌")
+    private String brand;
+
+    /** 单日成本 */
+    @Excel(name = "单日成本")
+    private BigDecimal dayCost;
+
+    /** 存放地点 */
+    @Excel(name = "存放地点")
+    private String place;
+
+    /** 校验周期（年） */
+    @Excel(name = "校验周期", readConverterExp = "年=")
+    private Long checkTerm;
+
+    /** 保修期（月） */
+    @Excel(name = "保修期", readConverterExp = "月=")
+    private Long warranty;
+
+    /** 校验日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "校验日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkTime;
+
+    /** 管理部门 */
+    @Excel(name = "管理部门")
+    private Long manageDept;
+
+    public void setSupplyId(Long supplyId) 
+    {
+        this.supplyId = supplyId;
+    }
+
+    public Long getSupplyId() 
+    {
+        return supplyId;
+    }
+    public void setSupplyNumber(String supplyNumber) 
+    {
+        this.supplyNumber = supplyNumber;
+    }
+
+    public String getSupplyNumber() 
+    {
+        return supplyNumber;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setAcquisitionTime(Date acquisitionTime) 
+    {
+        this.acquisitionTime = acquisitionTime;
+    }
+
+    public Date getAcquisitionTime() 
+    {
+        return acquisitionTime;
+    }
+    public void setCost(BigDecimal cost) 
+    {
+        this.cost = cost;
+    }
+
+    public BigDecimal getCost() 
+    {
+        return cost;
+    }
+    public void setExpectLife(Long expectLife) 
+    {
+        this.expectLife = expectLife;
+    }
+
+    public Long getExpectLife() 
+    {
+        return expectLife;
+    }
+    public void setSeries(String series) 
+    {
+        this.series = series;
+    }
+
+    public String getSeries() 
+    {
+        return series;
+    }
+    public void setBrand(String brand) 
+    {
+        this.brand = brand;
+    }
+
+    public String getBrand() 
+    {
+        return brand;
+    }
+    public void setDayCost(BigDecimal dayCost) 
+    {
+        this.dayCost = dayCost;
+    }
+
+    public BigDecimal getDayCost() 
+    {
+        return dayCost;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setCheckTerm(Long checkTerm) 
+    {
+        this.checkTerm = checkTerm;
+    }
+
+    public Long getCheckTerm() 
+    {
+        return checkTerm;
+    }
+    public void setWarranty(Long warranty) 
+    {
+        this.warranty = warranty;
+    }
+
+    public Long getWarranty() 
+    {
+        return warranty;
+    }
+    public void setCheckTime(Date checkTime) 
+    {
+        this.checkTime = checkTime;
+    }
+
+    public Date getCheckTime() 
+    {
+        return checkTime;
+    }
+    public void setManageDept(Long manageDept) 
+    {
+        this.manageDept = manageDept;
+    }
+
+    public Long getManageDept() 
+    {
+        return manageDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("supplyId", getSupplyId())
+            .append("supplyNumber", getSupplyNumber())
+            .append("code", getCode())
+            .append("name", getName())
+            .append("type", getType())
+            .append("acquisitionTime", getAcquisitionTime())
+            .append("cost", getCost())
+            .append("expectLife", getExpectLife())
+            .append("series", getSeries())
+            .append("brand", getBrand())
+            .append("dayCost", getDayCost())
+            .append("place", getPlace())
+            .append("remark", getRemark())
+            .append("checkTerm", getCheckTerm())
+            .append("warranty", getWarranty())
+            .append("checkTime", getCheckTime())
+            .append("manageDept", getManageDept())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSupply;
+
+/**
+ * cmc用品信息Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-25
+ */
+public interface CmcSupplyMapper 
+{
+    /**
+     * 查询cmc用品信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return cmc用品信息
+     */
+    public CmcSupply selectCmcSupplyBySupplyId(Long supplyId);
+
+    /**
+     * 查询cmc用品信息列表
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return cmc用品信息集合
+     */
+    public List<CmcSupply> selectCmcSupplyList(CmcSupply cmcSupply);
+
+    /**
+     * 新增cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    public int insertCmcSupply(CmcSupply cmcSupply);
+
+    /**
+     * 修改cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    public int updateCmcSupply(CmcSupply cmcSupply);
+
+    /**
+     * 删除cmc用品信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return 结果
+     */
+    public int deleteCmcSupplyBySupplyId(Long supplyId);
+
+    /**
+     * 批量删除cmc用品信息
+     * 
+     * @param supplyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSupplyBySupplyIds(Long[] supplyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSupply;
+
+/**
+ * cmc用品信息Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-25
+ */
+public interface ICmcSupplyService 
+{
+    /**
+     * 查询cmc用品信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return cmc用品信息
+     */
+    public CmcSupply selectCmcSupplyBySupplyId(Long supplyId);
+
+    /**
+     * 查询cmc用品信息列表
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return cmc用品信息集合
+     */
+    public List<CmcSupply> selectCmcSupplyList(CmcSupply cmcSupply);
+
+    /**
+     * 新增cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    public int insertCmcSupply(CmcSupply cmcSupply);
+
+    /**
+     * 修改cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    public int updateCmcSupply(CmcSupply cmcSupply);
+
+    /**
+     * 批量删除cmc用品信息
+     * 
+     * @param supplyIds 需要删除的cmc用品信息主键集合
+     * @return 结果
+     */
+    public int deleteCmcSupplyBySupplyIds(Long[] supplyIds);
+
+    /**
+     * 删除cmc用品信息信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return 结果
+     */
+    public int deleteCmcSupplyBySupplyId(Long supplyId);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcSupplyMapper;
+import com.ruoyi.oa.domain.CmcSupply;
+import com.ruoyi.oa.service.ICmcSupplyService;
+
+/**
+ * cmc用品信息Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-25
+ */
+@Service
+public class CmcSupplyServiceImpl implements ICmcSupplyService 
+{
+    @Autowired
+    private CmcSupplyMapper cmcSupplyMapper;
+
+    /**
+     * 查询cmc用品信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return cmc用品信息
+     */
+    @Override
+    public CmcSupply selectCmcSupplyBySupplyId(Long supplyId)
+    {
+        return cmcSupplyMapper.selectCmcSupplyBySupplyId(supplyId);
+    }
+
+    /**
+     * 查询cmc用品信息列表
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return cmc用品信息
+     */
+    @Override
+    public List<CmcSupply> selectCmcSupplyList(CmcSupply cmcSupply)
+    {
+        return cmcSupplyMapper.selectCmcSupplyList(cmcSupply);
+    }
+
+    /**
+     * 新增cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSupply(CmcSupply cmcSupply)
+    {
+        return cmcSupplyMapper.insertCmcSupply(cmcSupply);
+    }
+
+    /**
+     * 修改cmc用品信息
+     * 
+     * @param cmcSupply cmc用品信息
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSupply(CmcSupply cmcSupply)
+    {
+        return cmcSupplyMapper.updateCmcSupply(cmcSupply);
+    }
+
+    /**
+     * 批量删除cmc用品信息
+     * 
+     * @param supplyIds 需要删除的cmc用品信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSupplyBySupplyIds(Long[] supplyIds)
+    {
+        return cmcSupplyMapper.deleteCmcSupplyBySupplyIds(supplyIds);
+    }
+
+    /**
+     * 删除cmc用品信息信息
+     * 
+     * @param supplyId cmc用品信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSupplyBySupplyId(Long supplyId)
+    {
+        return cmcSupplyMapper.deleteCmcSupplyBySupplyId(supplyId);
+    }
+}

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

@@ -0,0 +1,130 @@
+<?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="checkTerm"    column="check_term"    />
+        <result property="warranty"    column="warranty"    />
+        <result property="checkTime"    column="check_time"    />
+        <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, check_term, warranty, check_time, 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="checkTerm != null "> and check_term = #{checkTerm}</if>
+            <if test="warranty != null "> and warranty = #{warranty}</if>
+            <if test="checkTime != null "> and check_time = #{checkTime}</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="checkTerm != null">check_term,</if>
+            <if test="warranty != null">warranty,</if>
+            <if test="checkTime != null">check_time,</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="checkTerm != null">#{checkTerm},</if>
+            <if test="warranty != null">#{warranty},</if>
+            <if test="checkTime != null">#{checkTime},</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="checkTerm != null">check_term = #{checkTerm},</if>
+            <if test="warranty != null">warranty = #{warranty},</if>
+            <if test="checkTime != null">check_time = #{checkTime},</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-ui/src/api/oa/supply/supply.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc用品信息列表
+export function listSupply(query) {
+  return request({
+    url: '/oa/supply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc用品信息详细
+export function getSupply(supplyId) {
+  return request({
+    url: '/oa/supply/' + supplyId,
+    method: 'get'
+  })
+}
+
+// 新增cmc用品信息
+export function addSupply(data) {
+  return request({
+    url: '/oa/supply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc用品信息
+export function updateSupply(data) {
+  return request({
+    url: '/oa/supply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc用品信息
+export function delSupply(supplyId) {
+  return request({
+    url: '/oa/supply/' + supplyId,
+    method: 'delete'
+  })
+}

oa-ui/src/assets/icons/svg/desktop.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="1714012227825" class="icon" viewBox="0 0 4257 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2057" xmlns:xlink="http://www.w3.org/1999/xlink" width="831.4453125" height="200"><path d="M1633.307598 735.652979h-256.530279c-5.739491-0.124772-11.229438 1.996345-15.346899 5.989034-4.117461 3.992689-6.363348 9.482637-6.363348 15.222127v161.953455c0 5.739491 2.370659 11.229438 6.363348 15.222127 4.117461 3.992689 9.607408 6.113805 15.346899 5.989034H1633.307598c5.739491 0.124772 11.229438-1.996345 15.346899-5.989034 4.117461-3.992689 6.363348-9.482637 6.363349-15.222127V756.739369c0-5.739491-2.370659-11.229438-6.363349-15.222128-4.117461-3.992689-9.607408-6.113805-15.346899-5.864262z m0-258.651395h-256.530279c-11.603753 0-21.08639 9.482637-21.086389 21.08639V660.041428c0 5.739491 2.370659 11.229438 6.363348 15.222128 4.117461 3.992689 9.607408 6.113805 15.346899 5.989033H1633.307598c5.739491 0.124772 11.229438-1.996345 15.346899-5.989033 4.117461-3.992689 6.363348-9.482637 6.363349-15.222128V498.087974c0-5.739491-2.370659-11.229438-6.363349-15.222128-4.117461-3.867918-9.607408-5.989034-15.346899-5.864262z m0 0" fill="#2c2c2c" p-id="2058"></path><path d="M2215.865902 308.934324H1928.641825l-43.545266-26.576337V254.533934h126.518338c10.605581-0.124772 20.836847-4.616547 28.198367-12.22761 7.361521-7.611064 11.478981-17.967101 11.229438-28.572682v-172.18472c0.124772-10.605581-3.867918-20.961618-11.229438-28.572682-7.361521-7.611064-17.592787-12.102839-28.198367-12.227611h-315.671987c-10.605581 0.124772-20.836847 4.616547-28.198368 12.227611-7.361521 7.611064-11.478981 17.967101-11.229438 28.572682v172.18472c-0.124772 10.605581 3.867918 20.961618 11.229438 28.572682 7.361521 7.611064 17.592787 12.102839 28.198368 12.22761h127.890825v28.572682l-43.545267 26.576338H1444.777807v-4.117461l-5.489948-18.341416c-4.367004-15.845985-4.367004-32.565371 0-48.286585l9.482637-26.576337c5.240405-15.721214 7.361521-32.440599 6.113805-49.035214v-25.827708c-2.495431-14.972584-16.2203-25.453393-31.317656-23.831363h-68.000487c-13.974412 0.623858-25.578165 11.229438-27.200195 25.20385v25.827708c-1.247715 16.594614 0.873401 33.189229 6.113805 49.035214l9.482637 26.576337c4.367004 15.845985 4.367004 32.565371 0 48.286585l-5.489947 18.341416v4.11746h-162.702084c-13.101011 0.374315-23.831363 10.730352-24.455221 23.831364v68.000487c0 13.600097 10.855124 24.829536 24.455221 25.203851h24.455221c13.600097 0.374315 24.455221 11.478981 24.455221 25.20385v544.378214c0 13.600097 10.855124 24.829536 24.455221 25.20385h24.455222c13.600097-0.374315 24.455221-11.478981 24.455221-25.20385V453.170221c0-13.600097 10.855124-24.829536 24.455221-25.203851h745.135616c13.600097 0.374315 24.455221 11.478981 24.455221 25.203851v544.378213c0 13.600097 10.855124 24.829536 24.455221 25.203851h24.455221c13.600097-0.374315 24.455221-11.478981 24.455221-25.203851V453.170221c0-13.600097 10.855124-24.829536 24.455222-25.203851h24.455221c6.987206 0 13.724869-2.869745 18.590959-8.11015 4.741318-5.115633 7.236749-12.102839 6.612891-19.090045v-68.000487c0.124772-13.101011-10.605581-23.457049-23.706592-23.831364z m0 0" fill="#2c2c2c" p-id="2059"></path><path d="M2049.794987 498.087974c0-5.739491-2.370659-11.229438-6.363348-15.222128-4.117461-3.992689-9.607408-6.113805-15.346899-5.989034H1772.178318c-5.739491-0.124772-11.229438 1.996345-15.346899 5.989034-4.117461 3.992689-6.363348 9.482637-6.363348 15.222128v420.604849c0 5.739491 2.370659 11.229438 6.363348 15.222128 4.117461 3.992689 9.607408 6.113805 15.346899 5.989033h255.906422c5.739491 0.124772 11.229438-1.996345 15.346899-5.989033 4.117461-3.992689 6.363348-9.482637 6.363348-15.222128V498.087974z m0 0" fill="#2c2c2c" p-id="2060"></path></svg>

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

@@ -817,10 +817,10 @@ export default {
               }
               else if (this.commentOpen == true && this.meetingOpen == false) {
                 let approvalList = [];
-                for (let commment of this.commentList) {
-                  commment.contractId = this.form.contractId
-                  addContractComment(commment);
-                  approvalList.push(commment.userId)
+                for (let comment of this.commentList) {
+                  comment.contractId = this.form.contractId
+                  addContractComment(comment);
+                  approvalList.push(comment.userId)
                 }
                 this.$set(this.taskForm.variables, "approvalList", approvalList);
                 this.$set(this.taskForm.variables, "commentType", '2');

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

@@ -0,0 +1,453 @@
+<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="办公用品编码" prop="supplyNumber">
+        <el-input
+          v-model="queryParams.supplyNumber"
+          placeholder="请输入办公用品编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出厂编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入出厂编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用品名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入用品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="购置时间" prop="acquisitionTime">
+        <el-date-picker clearable
+          v-model="queryParams.acquisitionTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择购置时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="购买价格" prop="cost">
+        <el-input
+          v-model="queryParams.cost"
+          placeholder="请输入购买价格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计使用年限" prop="expectLife">
+        <el-input
+          v-model="queryParams.expectLife"
+          placeholder="请输入预计使用年限"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="series">
+        <el-input
+          v-model="queryParams.series"
+          placeholder="请输入规格型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用品品牌" prop="brand">
+        <el-input
+          v-model="queryParams.brand"
+          placeholder="请输入用品品牌"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单日成本" prop="dayCost">
+        <el-input
+          v-model="queryParams.dayCost"
+          placeholder="请输入单日成本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="存放地点" prop="place">
+        <el-input
+          v-model="queryParams.place"
+          placeholder="请输入存放地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="校验周期" prop="checkTerm">
+        <el-input
+          v-model="queryParams.checkTerm"
+          placeholder="请输入校验周期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保修期" prop="warranty">
+        <el-input
+          v-model="queryParams.warranty"
+          placeholder="请输入保修期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="校验日期" prop="checkTime">
+        <el-date-picker clearable
+          v-model="queryParams.checkTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择校验日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="管理部门" prop="manageDept">
+        <el-input
+          v-model="queryParams.manageDept"
+          placeholder="请输入管理部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:supply: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:supply: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:supply: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:supply:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="supplyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="办公用品id" align="center" prop="supplyId" />
+      <el-table-column label="办公用品编码" align="center" prop="supplyNumber" />
+      <el-table-column label="出厂编号" align="center" prop="code" />
+      <el-table-column label="用品名称" align="center" prop="name" />
+      <el-table-column label="用品类别" align="center" prop="type" />
+      <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="购买价格" align="center" prop="cost" />
+      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
+      <el-table-column label="规格型号" align="center" prop="series" />
+      <el-table-column label="用品品牌" align="center" prop="brand" />
+      <el-table-column label="单日成本" align="center" prop="dayCost" />
+      <el-table-column label="存放地点" align="center" prop="place" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="校验周期" align="center" prop="checkTerm" />
+      <el-table-column label="保修期" align="center" prop="warranty" />
+      <el-table-column label="校验日期" align="center" prop="checkTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理部门" align="center" prop="manageDept" />
+      <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:supply:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:supply: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="办公用品编码" prop="supplyNumber">
+          <el-input v-model="form.supplyNumber" placeholder="请输入办公用品编码" />
+        </el-form-item>
+        <el-form-item label="出厂编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入出厂编号" />
+        </el-form-item>
+        <el-form-item label="用品名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入用品名称" />
+        </el-form-item>
+        <el-form-item label="购置时间" prop="acquisitionTime">
+          <el-date-picker clearable
+            v-model="form.acquisitionTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择购置时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="购买价格" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入购买价格" />
+        </el-form-item>
+        <el-form-item label="预计使用年限" prop="expectLife">
+          <el-input v-model="form.expectLife" placeholder="请输入预计使用年限" />
+        </el-form-item>
+        <el-form-item label="规格型号" prop="series">
+          <el-input v-model="form.series" placeholder="请输入规格型号" />
+        </el-form-item>
+        <el-form-item label="用品品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入用品品牌" />
+        </el-form-item>
+        <el-form-item label="单日成本" prop="dayCost">
+          <el-input v-model="form.dayCost" placeholder="请输入单日成本" />
+        </el-form-item>
+        <el-form-item label="存放地点" prop="place">
+          <el-input v-model="form.place" placeholder="请输入存放地点" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="校验周期" prop="checkTerm">
+          <el-input v-model="form.checkTerm" placeholder="请输入校验周期" />
+        </el-form-item>
+        <el-form-item label="保修期" prop="warranty">
+          <el-input v-model="form.warranty" placeholder="请输入保修期" />
+        </el-form-item>
+        <el-form-item label="校验日期" prop="checkTime">
+          <el-date-picker clearable
+            v-model="form.checkTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择校验日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="管理部门" prop="manageDept">
+          <el-input v-model="form.manageDept" 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 { listSupply, getSupply, delSupply, addSupply, updateSupply } from "@/api/oa/supply/supply";
+
+export default {
+  name: "Supply",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc用品信息表格数据
+      supplyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplyNumber: null,
+        code: null,
+        name: null,
+        type: null,
+        acquisitionTime: null,
+        cost: null,
+        expectLife: null,
+        series: null,
+        brand: null,
+        dayCost: null,
+        place: null,
+        checkTerm: null,
+        warranty: null,
+        checkTime: null,
+        manageDept: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc用品信息列表 */
+    getList() {
+      this.loading = true;
+      listSupply(this.queryParams).then(response => {
+        this.supplyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        supplyId: null,
+        supplyNumber: null,
+        code: null,
+        name: null,
+        type: null,
+        acquisitionTime: null,
+        cost: null,
+        expectLife: null,
+        series: null,
+        brand: null,
+        dayCost: null,
+        place: null,
+        remark: null,
+        checkTerm: null,
+        warranty: null,
+        checkTime: null,
+        manageDept: 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.supplyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc用品信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const supplyId = row.supplyId || this.ids
+      getSupply(supplyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc用品信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.supplyId != null) {
+            updateSupply(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSupply(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const supplyIds = row.supplyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc用品信息编号为"' + supplyIds + '"的数据项？').then(function() {
+        return delSupply(supplyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/supply/export', {
+        ...this.queryParams
+      }, `supply_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>