设备基本信息更新

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

@@ -1,97 +0,0 @@
-package com.ruoyi.web.controller.oa;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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

@@ -1,210 +0,0 @@
-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 = "管理部门")
-    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 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("manageDept", getManageDept())
-            .toString();
-    }
-}

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

@@ -1,61 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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

@@ -1,93 +0,0 @@
-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-ui/src/api/oa/supply/supply.js

@@ -1,44 +0,0 @@
-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/views/oa/device/index.vue

@@ -206,6 +206,7 @@ export default {
     /** 查询cmc设备信息列表 */
     getList() {
       this.loading = true;
+      this.queryParams.type = '仪器设备';
       listDevice(this.queryParams).then(response => {
         this.deviceList = response.rows;
         this.total = response.total;

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

@@ -1,93 +1,12 @@
 <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-input v-model="queryParams.code" 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="manageDept">
-        <el-input
-          v-model="queryParams.manageDept"
-          placeholder="请输入管理部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="设备名称" prop="name">
+        <el-input v-model="queryParams.name" 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>
@@ -97,143 +16,138 @@
 
     <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-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:device: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-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:device: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-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:device: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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:device: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 v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="办公用品id" align="center" prop="supplyId" />
-      <el-table-column label="办公用品编码" align="center" prop="supplyNumber" />
+      <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
       <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="name" />
+      <el-table-column label="设备类别" align="center" prop="type" />
+      <el-table-column label="规格型号" align="center" prop="series" />
       <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="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="brand" />
+      <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" />
+      <el-table-column label="管理部门" align="center" prop="dept.deptName" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <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>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddDetail(scope.row)"
+            v-hasPermi="['oa:car:edit']">添加明细</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:device:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"
+            @click="handleDelete(scope.row)" v-hasPermi="['oa:device: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="manageDept">
-          <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
+    <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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="出厂编号" prop="code">
+              <el-input v-model="form.code" placeholder="请输入出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <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-col>
+          <el-col :span="12">
+            <el-form-item label="规格型号" prop="series">
+              <el-input v-model="form.series" placeholder="请输入规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="预计使用年限" prop="expectLife">
+              <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
+              <span>年</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="购买价格" prop="cost">
+              <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
+              <span>元</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备品牌" prop="brand">
+              <el-input v-model="form.brand" placeholder="请输入设备品牌" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单日成本" prop="dayCost">
+              <el-input v-model="form.dayCost" placeholder="请输入单日成本" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="存放地点" prop="place">
+              <el-input v-model="form.place" placeholder="请输入存放地点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备类别" prop="place">
+              <el-input v-model="form.type" placeholder="请输入设备类别" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="管理部门" prop="dept.deptName">
+          <el-input v-model="form.deptName" placeholder="请输入管理部门" />
         </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -243,10 +157,10 @@
 </template>
 
 <script>
-import { listSupply, getSupply, delSupply, addSupply, updateSupply } from "@/api/oa/supply/supply";
+import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/oa/device/device";
 
 export default {
-  name: "Supply",
+  name: "Device",
   data() {
     return {
       // 遮罩层
@@ -261,8 +175,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // cmc用品信息表格数据
-      supplyList: [],
+      // cmc设备信息表格数据
+      deviceList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -271,18 +185,12 @@ export default {
       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,
-        manageDept: null
+        series: null
       },
       // 表单参数
       form: {},
@@ -295,11 +203,12 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询cmc用品信息列表 */
+    /** 查询cmc设备信息列表 */
     getList() {
       this.loading = true;
-      listSupply(this.queryParams).then(response => {
-        this.supplyList = response.rows;
+      this.queryParams.type = '办公设备';
+      listDevice(this.queryParams).then(response => {
+        this.deviceList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -312,20 +221,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        supplyId: null,
-        supplyNumber: null,
+        deviceId: null,
         code: null,
-        name: null,
         type: null,
         acquisitionTime: null,
         cost: null,
         expectLife: null,
-        series: null,
-        brand: null,
-        dayCost: null,
-        place: null,
-        remark: null,
-        manageDept: null
+        series: null
       };
       this.resetForm("form");
     },
@@ -341,38 +243,47 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.supplyId)
-      this.single = selection.length!==1
+      this.ids = selection.map(item => item.deviceId)
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc用品信息";
+      this.title = "添加设备信息";
+    },
+    // 新增明细按钮
+    handleAddDetail(row) {
+      this.$router.push({
+        path: '/device/approval',
+        query: {
+          deviceId: row.deviceId,
+        }
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const supplyId = row.supplyId || this.ids
-      getSupply(supplyId).then(response => {
+      const deviceId = row.deviceId || this.ids
+      getDevice(deviceId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc用品信息";
+        this.title = "修改设备信息";
       });
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.supplyId != null) {
-            updateSupply(this.form).then(response => {
+          if (this.form.deviceId != null) {
+            updateDevice(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addSupply(this.form).then(response => {
+            addDevice(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -383,19 +294,20 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const supplyIds = row.supplyId || this.ids;
-      this.$modal.confirm('是否确认删除cmc用品信息编号为"' + supplyIds + '"的数据项？').then(function() {
-        return delSupply(supplyIds);
+      const deviceIds = row.deviceId || this.ids;
+      const code = row.code
+      this.$modal.confirm('是否确认删除设备编号为【"' + code + '"】的设备数据？').then(function () {
+        return delDevice(deviceIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('oa/supply/export', {
+      this.download('oa/device/export', {
         ...this.queryParams
-      }, `supply_${new Date().getTime()}.xlsx`)
+      }, `device_${new Date().getTime()}.xlsx`)
     }
   }
 };