Merge remote-tracking branch 'gitlab/main'

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbAssetInformationController.java

@@ -22,6 +22,7 @@ import com.ruoyi.asset.domain.TbAssetInformation;
 import com.ruoyi.asset.service.ITbAssetInformationService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 资产信息Controller
@@ -108,7 +109,7 @@ public class TbAssetInformationController extends BaseController
      * 自定义字段
      */
     @PreAuthorize("@ss.hasPermi('asset:information:query')")
-    @Log(title = "资产信息字段自定义")
+    @Log(title = "资产信息字段自定义设置")
     @PostMapping("/setDiy")
     public AjaxResult setDiy(@RequestBody List<String> labels)
     {
@@ -119,10 +120,36 @@ public class TbAssetInformationController extends BaseController
      * 自定义字段
      */
     @PreAuthorize("@ss.hasPermi('asset:information:query')")
-    @Log(title = "资产信息字段自定义")
+    @Log(title = "资产信息字段自定义获取")
     @GetMapping("/getDiy")
     public AjaxResult getDiy()
     {
         return success(tbAssetInformationService.getDiy());
     }
+
+    /**
+     * 导入excel
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @Log(title = "资产信息导入", businessType = BusinessType.IMPORT) // todo
+    @PreAuthorize("@ss.hasPermi('asset:information:import')") // todo
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TbAssetInformation> util = new ExcelUtil<>(TbAssetInformation.class); // todo
+        List<TbAssetInformation> stuList = util.importExcel(file.getInputStream()); // todo
+        String operName = getUsername();
+        String message = tbAssetInformationService.importCon(stuList, updateSupport, operName); // todo
+        return AjaxResult.success(message);
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<TbAssetInformation> util = new ExcelUtil<>(TbAssetInformation.class); // todo
+        util.importTemplateExcel(response, "资产信息");
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -39,7 +39,7 @@ public class TbAssetInformation extends BaseEntity
     private String number;
 
     /** 图片路径 */
-    @Excel(name = "图片路径")
+    //@Excel(name = "图片路径")
     private String imageUrl;
 
     /** 资产分类编号 */
@@ -47,15 +47,15 @@ public class TbAssetInformation extends BaseEntity
     private String categoryNumber;
 
     /** 规格型号 */
-    @Excel(name = "规格型号")
+    //@Excel(name = "规格型号")
     private String specificationsModel;
 
     /** ABC分类 */
-    @Excel(name = "ABC分类")
+    //@Excel(name = "ABC分类")
     private String abcCategory;
 
     /** 管理状态，0：闲置 */
-    @Excel(name = "管理状态，0：闲置")
+    //@Excel(name = "管理状态，0：闲置")
     private Long manageStatus;
 
     /** 使用部门 */
@@ -67,7 +67,7 @@ public class TbAssetInformation extends BaseEntity
     private String department;
 
     /** 责任人 */
-    @Excel(name = "责任人")
+    //@Excel(name = "责任人")
     private String responsiblePerson;
 
     /** 所在位置编号 */
@@ -75,79 +75,79 @@ public class TbAssetInformation extends BaseEntity
     private String locationNumber;
 
     /** 资产性质 */
-    @Excel(name = "资产性质")
+    //@Excel(name = "资产性质")
     private String property;
 
     /** 购置日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "购置日期", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "购置日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date purchaseDate;
 
     /** 启用日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date commissioningDate;
 
     /** 原值（元） */
-    @Excel(name = "原值", readConverterExp = "元=")
+    //@Excel(name = "原值", readConverterExp = "元=")
     private Double originalValue;
 
     /** 使用年限 */
-    @Excel(name = "使用年限")
+   // @Excel(name = "使用年限")
     private Long durableYears;
 
     /** 净值（元） */
-    @Excel(name = "净值", readConverterExp = "元=")
+    //@Excel(name = "净值", readConverterExp = "元=")
     private Double netValue;
 
     /** 残值（元） */
-    @Excel(name = "残值", readConverterExp = "元=")
+   // @Excel(name = "残值", readConverterExp = "元=")
     private Double residualValue;
 
     /** 累计折旧（元） */
-    @Excel(name = "累计折旧", readConverterExp = "元=")
+   // @Excel(name = "累计折旧", readConverterExp = "元=")
     private Double accumulatedDepreciation;
 
     /** 最近折旧日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最近折旧日期", width = 30, dateFormat = "yyyy-MM-dd")
+    //@Excel(name = "最近折旧日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastDepreciationDate;
 
     /** 折旧方式，0：其他 */
-    @Excel(name = "折旧方式，0：其他")
+    //@Excel(name = "折旧方式，0：其他")
     private Long depreciationMethod;
 
     /** 合同编号 */
-    @Excel(name = "合同编号")
+    //@Excel(name = "合同编号")
     private String contractNumber;
 
     /** 出厂编号 */
-    @Excel(name = "出厂编号")
+   // @Excel(name = "出厂编号")
     private String factoryNumber;
 
     /** 制造商 */
-    @Excel(name = "制造商")
+    //@Excel(name = "制造商")
     private String manufacturer;
 
     /** 供应商 */
-    @Excel(name = "供应商")
+   // @Excel(name = "供应商")
     private String supplier;
 
     /** 资产用途 */
-    @Excel(name = "资产用途")
+   // @Excel(name = "资产用途")
     private String purpose;
 
     /** 维保到期日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "维保到期日期", width = 30, dateFormat = "yyyy-MM-dd")
+   // @Excel(name = "维保到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date maintenanceDate;
 
     /** 维修电话 */
-    @Excel(name = "维修电话")
+   // @Excel(name = "维修电话")
     private String maintenanceTel;
 
     /** 维修人员 */
-    @Excel(name = "维修人员")
+   // @Excel(name = "维修人员")
     private String maintenanceUser;
 
     /** 所属公司 */
@@ -155,47 +155,47 @@ public class TbAssetInformation extends BaseEntity
     private String corporation;
 
     /** 记录状态，0：未提交，1：已提交 */
-    @Excel(name = "记录状态，0：未提交，1：已提交")
+   // @Excel(name = "记录状态，0：未提交，1：已提交")
     private Long recordStatus;
 
     /** 预留字段a */
-    @Excel(name = "是否白名单")
+  //  @Excel(name = "是否白名单")
     private String isWhitelist;
 
     /** 预留字段b */
-    @Excel(name = "预留字段b")
+   // @Excel(name = "预留字段b")
     private String reservedColumnB;
 
     /** 预留字段c */
-    @Excel(name = "预留字段c")
+   // @Excel(name = "预留字段c")
     private String reservedColumnC;
 
     /** 预留字段d */
-    @Excel(name = "预留字段d")
+   // @Excel(name = "预留字段d")
     private String reservedColumnD;
 
     /** 预留字段e */
-    @Excel(name = "预留字段e")
+  //  @Excel(name = "预留字段e")
     private String reservedColumnE;
 
     /** 预留字段f */
-    @Excel(name = "预留字段f")
+  //  @Excel(name = "预留字段f")
     private String reservedColumnF;
 
     /** 预留字段g */
-    @Excel(name = "预留字段g")
+ //   @Excel(name = "预留字段g")
     private String reservedColumnG;
 
     /** 预留字段h */
-    @Excel(name = "预留字段h")
+   // @Excel(name = "预留字段h")
     private String reservedColumnH;
 
     /** 预留字段i */
-    @Excel(name = "预留字段i")
+   // @Excel(name = "预留字段i")
     private String reservedColumnI;
 
     /** 预留字段j */
-    @Excel(name = "预留字段j")
+   // @Excel(name = "预留字段j")
     private String reservedColumnJ;
 
 

ruoyi-admin/src/main/java/com/ruoyi/asset/mapper/TbAssetInformationMapper.java

@@ -67,4 +67,6 @@ public interface TbAssetInformationMapper
      * @return 结果
      */
     public int deleteTbAssetInformationByIds(Long[] ids);
+
+    public boolean updateProperty(TbAssetInformation information);
 }

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbAssetInformationService.java

@@ -73,4 +73,16 @@ public interface ITbAssetInformationService
     public boolean setDiy(List<String> labels);
 
     public List<String> getDiy();
+
+    public boolean updateProperty(TbAssetInformation information);
+
+    /**
+     * 导入用户数据
+     *
+     * @param stuList 用户数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @param operName 操作用户
+     * @return 结果
+     */
+    public String importCon(List<TbAssetInformation> stuList, Boolean isUpdateSupport, String operName);
 }

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbAssetInformationServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.List;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanValidators;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -14,6 +17,7 @@ import com.ruoyi.asset.domain.TbAssetInformation;
 import com.ruoyi.asset.service.ITbAssetInformationService;
 
 import javax.annotation.Resource;
+import javax.validation.Validator;
 
 /**
  * 资产信息Service业务层处理
@@ -30,6 +34,9 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
+    @Autowired
+    protected Validator validator;
+
     /**
      * 查询资产信息
      * 
@@ -124,4 +131,67 @@ public class TbAssetInformationServiceImpl implements ITbAssetInformationService
         List<String> labels = JSONUtil.toList(json, String.class);
         return labels;
     }
+
+    @Override
+    public boolean updateProperty(TbAssetInformation information) {
+        return tbAssetInformationMapper.updateProperty(information);
+    }
+
+    @Override
+    public String importCon(List<TbAssetInformation> stuList, Boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(stuList) || stuList.size() == 0)
+        {
+            throw new ServiceException("导入资产信息数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TbAssetInformation con : stuList)
+        {
+            try
+            {
+                // 验证是否存在这个用户
+                TbAssetInformation u = tbAssetInformationMapper.selectTbAssetInformationById(con.getId());
+                if (StringUtils.isNull(u))
+                {
+                    BeanValidators.validateWithException(validator, con);
+                    con.setCreateBy(operName);
+                    this.insertTbAssetInformation(con);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、编码 " + con.getNumber() + " 导入成功");
+                }
+                else if (isUpdateSupport)
+                {
+                    BeanValidators.validateWithException(validator, con);
+                    con.setUpdateBy(operName);
+                    this.updateTbAssetInformation(con);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、编码 " + con.getNumber() + " 更新成功");
+                }
+                else
+                {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、编码 " + con.getNumber() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、编码 " + con.getNumber() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/order/controller/TbOrderController.java

@@ -17,6 +17,7 @@ import com.ruoyi.asset.service.ITbAssetInformationService;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.order.domain.TbOrderDetail;
 import com.ruoyi.order.domain.dto.OrderDTO;
 import com.ruoyi.order.domain.dto.OrderTypeEnum;
 import com.ruoyi.order.service.ITbOrderDetailService;
@@ -62,6 +63,10 @@ public class TbOrderController extends BaseController
     @Resource
     private ITbOrderDetailService orderDetailService;
 
+    @Autowired
+    private ITbOrderDetailService tbOrderDetailService;
+
+
     /**
      * 查询资产单据列表
      */
@@ -201,13 +206,22 @@ public class TbOrderController extends BaseController
     }
 
     /**
-     * 审批资产单据
+     * 首页审批资产单据
      */
     @PreAuthorize("@ss.hasPermi('order:order:audit')")
     @Log(title = "资产单据", businessType = BusinessType.UPDATE)
     @PutMapping("/audit")
     public AjaxResult audit(@RequestBody TbOrder tbOrder)
     {
+        TbOrderDetail tbOrderDetail = new TbOrderDetail();
+        tbOrderDetail.setOrderNumber(tbOrder.getOrderNumber());
+        List<TbOrderDetail> tbOrderDetails = tbOrderDetailService.selectTbOrderDetailList(tbOrderDetail);
+        //修改对应资产管理状态
+        for (int j = 0; j < tbOrderDetails.size(); j++){
+            String assetNumber = tbOrderDetails.get(j).getAssetNumber();
+            TbAssetInformation information = TbAssetInformation.builder().number(assetNumber).manageStatus(tbOrder.getOrderType()).build();
+            tbAssetInformationService.updateProperty(information);
+        }
         return toAjax(tbOrderService.updateTbOrder(tbOrder));
     }
 
@@ -222,8 +236,19 @@ public class TbOrderController extends BaseController
         for (int i = 0; i<ids.length; i++){
             TbOrder tbOrder = tbOrderService.selectTbOrderById(ids[i]);
             if (tbOrder.getRecordStatus() == 1){
+                //修改状态为已审核
                 tbOrder.setRecordStatus(2L);
                 tbOrderService.updateTbOrder(tbOrder);
+                //查找对应资产编码
+                TbOrderDetail tbOrderDetail = new TbOrderDetail();
+                tbOrderDetail.setOrderNumber(tbOrder.getOrderNumber());
+                List<TbOrderDetail> tbOrderDetails = tbOrderDetailService.selectTbOrderDetailList(tbOrderDetail);
+                //修改对应资产管理状态
+                for (int j = 0; j < tbOrderDetails.size(); j++){
+                    String assetNumber = tbOrderDetails.get(j).getAssetNumber();
+                    TbAssetInformation information = TbAssetInformation.builder().number(assetNumber).manageStatus(tbOrder.getOrderType()).build();
+                    tbAssetInformationService.updateProperty(information);
+                }
             }
         }
         return toAjax(true);

ruoyi-admin/src/main/java/com/ruoyi/order/domain/TbOrderDetail.java

@@ -2,6 +2,10 @@ package com.ruoyi.order.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -92,88 +96,88 @@ public class TbOrderDetail extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setOrderNumber(String orderNumber) 
+    public void setOrderNumber(String orderNumber)
     {
         this.orderNumber = orderNumber;
     }
 
-    public String getOrderNumber() 
+    public String getOrderNumber()
     {
         return orderNumber;
     }
-    public void setAssetNumber(String assetNumber) 
+    public void setAssetNumber(String assetNumber)
     {
         this.assetNumber = assetNumber;
     }
 
-    public String getAssetNumber() 
+    public String getAssetNumber()
     {
         return assetNumber;
     }
-    public void setAllocationOldResponsiblePerson(String allocationOldResponsiblePerson) 
+    public void setAllocationOldResponsiblePerson(String allocationOldResponsiblePerson)
     {
         this.allocationOldResponsiblePerson = allocationOldResponsiblePerson;
     }
 
-    public String getAllocationOldResponsiblePerson() 
+    public String getAllocationOldResponsiblePerson()
     {
         return allocationOldResponsiblePerson;
     }
-    public void setAllocationOldLocationNumber(String allocationOldLocationNumber) 
+    public void setAllocationOldLocationNumber(String allocationOldLocationNumber)
     {
         this.allocationOldLocationNumber = allocationOldLocationNumber;
     }
 
-    public String getAllocationOldLocationNumber() 
+    public String getAllocationOldLocationNumber()
     {
         return allocationOldLocationNumber;
     }
-    public void setAllocationNewResponsiblePerson(String allocationNewResponsiblePerson) 
+    public void setAllocationNewResponsiblePerson(String allocationNewResponsiblePerson)
     {
         this.allocationNewResponsiblePerson = allocationNewResponsiblePerson;
     }
 
-    public String getAllocationNewResponsiblePerson() 
+    public String getAllocationNewResponsiblePerson()
     {
         return allocationNewResponsiblePerson;
     }
-    public void setAllocationNewLocationNumber(String allocationNewLocationNumber) 
+    public void setAllocationNewLocationNumber(String allocationNewLocationNumber)
     {
         this.allocationNewLocationNumber = allocationNewLocationNumber;
     }
 
-    public String getAllocationNewLocationNumber() 
+    public String getAllocationNewLocationNumber()
     {
         return allocationNewLocationNumber;
     }
-    public void setLendReturnDate(Date lendReturnDate) 
+    public void setLendReturnDate(Date lendReturnDate)
     {
         this.lendReturnDate = lendReturnDate;
     }
 
-    public Date getLendReturnDate() 
+    public Date getLendReturnDate()
     {
         return lendReturnDate;
     }
-    public void setLendActualReturnDate(Date lendActualReturnDate) 
+    public void setLendActualReturnDate(Date lendActualReturnDate)
     {
         this.lendActualReturnDate = lendActualReturnDate;
     }
 
-    public Date getLendActualReturnDate() 
+    public Date getLendActualReturnDate()
     {
         return lendActualReturnDate;
     }
-    public void setLendBySponsor(String lendBySponsor) 
+    public void setLendBySponsor(String lendBySponsor)
     {
         this.lendBySponsor = lendBySponsor;
     }
 
-    public String getLendBySponsor() 
+    public String getLendBySponsor()
     {
         return lendBySponsor;
     }

ruoyi-admin/src/main/resources/mapper/asset/TbAssetInformationMapper.xml

@@ -273,6 +273,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateProperty" parameterType="TbAssetInformation">
+        update tb_asset_information set manage_status = #{manageStatus} where number = #{number}
+    </update>
+
     <delete id="deleteTbAssetInformationById" parameterType="Long">
         delete from tb_asset_information where id = #{id}
     </delete>

ruoyi-ui/src/views/asset/information/index.vue

@@ -65,14 +65,6 @@
             ></el-option>
           </el-select>
       </el-form-item>
-      <el-form-item label="资产性质" prop="property">
-        <el-input
-          v-model="queryParams.property"
-          placeholder="请输入资产性质"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="所属公司" prop="corporation">
         <div style="display:inline-block; width: 183px;">
           <treeselect
@@ -83,6 +75,26 @@
               />
         </div>
       </el-form-item>
+      <el-form-item v-if="isExist('管理状态')" label="管理状态" prop="manageStatus">
+        <el-select v-model="queryParams.manageStatus" placeholder="请选择管理状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_manger_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="isExist('资产性质')" label="资产性质" prop="property">
+        <el-select v-model="queryParams.property" placeholder="请选择资产性质" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_asset_property"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="isExist('规格型号')" label="规格型号" prop="specificationsModel">
         <el-input
           v-model="queryParams.specificationsModel"
@@ -121,7 +133,7 @@
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="请选择启用日期">
-          </el-date-picker>  
+          </el-date-picker>
       </el-form-item>
       <el-form-item v-if="isExist('原值')" label="原值" prop="originalValue">
         <el-input
@@ -378,6 +390,17 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+        type="info"
+        plain
+        icon="el-icon-upload2"
+        size="mini"
+        @click="handleImport"
+        v-hasPermi="['asset:information:import']"
+        >导入</el-button>
+        <!-- v-hasPermi="['collegeManage:studentBase:import']" -->
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="primary"
           plain
           icon="el-icon-menu"
@@ -405,7 +428,6 @@
           <span>{{ scope.row.categoryNumber != null ? categoryName(scope.row.categoryNumber) : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="管理状态" align="center" prop="manageStatus" />
       <el-table-column label="使用部门" align="center" prop="userDepartment" >
         <template slot-scope="scope">
           <span>{{ scope.row.userDepartment != null ? companyName(scope.row.userDepartment) : ""}}</span>
@@ -427,10 +449,19 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column v-if="isExist('管理状态')" label="管理状态" align="center" prop="manageStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_manger_status" :value="scope.row.manageStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="isExist('资产性质')" label="资产性质" align="center" prop="property" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_asset_property" :value="scope.row.property"/>
+        </template>
+      </el-table-column>
       <el-table-column v-if="isExist('规格型号')" label="规格型号" align="center" prop="specificationsModel" />
       <el-table-column  v-if="isExist('ABC分类')" label="ABC分类" align="center" prop="abcCategory" />
       <el-table-column  v-if="isExist('责任人')" label="责任人" align="center" prop="responsiblePerson" />
-      <el-table-column  v-if="isExist('资产性质')" label="资产性质" align="center" prop="property" />
       <el-table-column  v-if="isExist('购置日期')" label="购置日期" align="center" prop="purchaseDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.purchaseDate, '{y}-{m}-{d}') }}</span>
@@ -502,7 +533,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -562,9 +593,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="资产性质" prop="property">
-          <el-input v-model="form.property" placeholder="请输入资产性质" />
-        </el-form-item>
         <el-form-item label="所属公司" prop="corporation">
               <treeselect
                 v-model="form.corporation"
@@ -576,6 +604,16 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
+        <el-form-item v-if="isExist('资产性质')" label="资产性质" prop="property">
+          <el-select v-model="form.property" placeholder="请选择资产性质" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_asset_property"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
         <el-form-item v-if="isExist('规格型号')" label="规格型号" prop="specificationsModel">
           <el-input v-model="form.specificationsModel" placeholder="请输入规格型号" />
         </el-form-item>
@@ -604,7 +642,7 @@
         <el-form-item  v-if="isExist('原值')" label="原值" prop="originalValue">
           <el-input v-model="form.originalValue" placeholder="请输入原值" />
         </el-form-item>
-        <el-form-item label="使用年限" prop="durableYears">
+        <el-form-item v-if="isExist('使用年限')" label="使用年限" prop="durableYears">
           <el-input v-model="form.durableYears" placeholder="请输入使用年限" />
         </el-form-item>
         <el-form-item  v-if="isExist('净值')" label="净值" prop="netValue">
@@ -713,6 +751,8 @@
   <template>
     <div>
       <el-checkbox-group v-model="checkList" mini>
+        <el-checkbox label="管理状态" border></el-checkbox>
+        <el-checkbox label="资产性质" border></el-checkbox>
         <el-checkbox label="规格型号" border></el-checkbox>
         <el-checkbox label="ABC分类" border></el-checkbox>
         <el-checkbox label="责任人" border></el-checkbox>
@@ -742,6 +782,34 @@
     <el-button @click="cancelDIY">取 消</el-button>
   </div>
 </el-dialog>
+<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -752,11 +820,13 @@ import { listLocation } from "@/api/asset/location";
 import ImageUploadTemp from "@/components/ImageUploadTemp"
 import { listDept } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
+import { getToken } from "@/utils/auth";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
+
 export default {
   name: "Information",
-  dicts: ['asset_record_status', 'sys_yes_no'],
+  dicts: ['asset_record_status', 'sys_yes_no', 'sys_manger_status', 'sys_asset_property'],
   components:{
     ImageUploadTemp,Treeselect
   },
@@ -864,7 +934,21 @@ export default {
         recordStatus: [
           { required: true, message: "记录状态不能为空", trigger: "change" }
         ],
-      }
+      },
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 1,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/asset/information/importData" // todo
+      },
     };
   },
   created() {
@@ -1053,6 +1137,32 @@ export default {
         }
       });
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "资产信息导入"; // todo
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('/asset/information/importTemplate', {
+      }, `stu_base_template_${new Date().getTime()}.xlsx`)  // todo
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

ruoyi-ui/src/views/index.vue

@@ -203,6 +203,28 @@
         </template>
       </el-table-column>
     </el-table>
+    <h3>待盘点信息</h3>
+    <el-table
+      :data="inventoryList"
+      height="260"
+      border
+      style="width: 100%"
+      :default-sort="{ prop: 'applicationDate', order: 'descending' }"
+    >
+    <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="资产盘点记录编号" align="center" prop="id" />
+      <el-table-column label="单据编号" align="center" prop="orderNumber" />
+      <el-table-column label="任务名称" align="center" prop="name" />
+      <el-table-column label="盘点部门" align="center" prop="inventoryDepartment" />
+      <el-table-column label="盘点人" align="center" prop="inventoryBy" />
+      <el-table-column label="盘点日期" align="center" prop="inventoryDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.inventoryDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点位置" align="center" prop="inventoryLocation" />
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
     <!-- 【调整】资产信息 -->
     <el-dialog
       title="资产调整"
@@ -223,6 +245,7 @@
 
 <script>
 import { listOrder, auditOrder } from "@/api/order/order";
+import { listInventory } from "@/api/inventory/inventory";
 
 export default {
   dicts: ["asset_order_type", "asset_record_status"],
@@ -236,6 +259,7 @@ export default {
       form: {},
       // 资产单据表格数据
       orderList: [],
+      inventoryList: [],
       // 资产原信息
       openAdjustment: false,
       adjustmentOriginalAssetInfo: null,
@@ -257,6 +281,9 @@ export default {
     /** 查询资产单据列表 */
     getList() {
       this.loading = true;
+      listInventory(this.queryParams).then(response => {
+        this.inventoryList = response.rows;
+      });
       listOrder(this.queryParams).then((response) => {
         this.orderList = response.rows;
         this.total = response.total;
@@ -307,6 +334,8 @@ export default {
     handleAudit(row, recordStatus) {
       this.reset();
       this.form.id = row.id;
+      this.form.orderNumber = row.orderNumber;
+      this.form.orderType = row.orderType;
       this.form.recordStatus = recordStatus;
       auditOrder(this.form).then((response) => {
         this.$modal.msgSuccess("操作成功");