资产调整新增审核和提交按钮功能，增加资产调拨dto模块

ruoyi-admin/pom.xml

@@ -68,6 +68,11 @@
             <version>5.7.17</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -94,6 +94,30 @@ public class TbAssetAdjustmentController extends BaseController
     }
 
     /**
+     * 提交资产调整
+     */
+    @PreAuthorize("@ss.hasPermi('asset:adjustment:submit')")
+    @Log(title = "资产调整提交", businessType = BusinessType.UPDATE)
+    @PutMapping("/submit")
+    public AjaxResult submit(@RequestBody TbAssetAdjustment tbAssetAdjustment)
+    {
+        tbAssetAdjustment.setRecordStatus(1L);
+        return toAjax(tbAssetAdjustmentService.updateTbAssetAdjustment(tbAssetAdjustment));
+    }
+
+    /**
+     * 审核资产调整
+     */
+    @PreAuthorize("@ss.hasPermi('asset:adjustment:audit')")
+    @Log(title = "资产调整审核", businessType = BusinessType.UPDATE)
+    @PutMapping("/audit")
+    public AjaxResult audit(@RequestBody TbAssetAdjustment tbAssetAdjustment)
+    {
+        tbAssetAdjustment.setRecordStatus(2L);
+        return toAjax(tbAssetAdjustmentService.updateTbAssetAdjustment(tbAssetAdjustment));
+    }
+
+    /**
      * 修改资产调整
      */
     @PreAuthorize("@ss.hasPermi('asset:adjustment:edit')")

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/dto/TbAssetAdjustmentDTO.java

@@ -0,0 +1,43 @@
+package com.ruoyi.asset.domain.dto;
+
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TbAssetAdjustmentDTO {
+    /** 编号 */
+    private Long id;
+
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String[] assetNumber;
+
+    /** 资产原信息，以JSON字符串格式存入提取 */
+    @Excel(name = "资产原信息，以JSON字符串格式存入提取")
+    private String originalAssetInfo;
+
+    /** 调整原因 */
+    @Excel(name = "调整原因")
+    private String reason;
+
+    /** 调整单号 */
+    @Excel(name = "调整单号")
+    private String orderNumber;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private String preparedBy;
+
+    /** 制单部门 */
+    @Excel(name = "制单部门")
+    private String preparedDepartment;
+
+    /** 记录状态，0：未提交，1：已提交 */
+    @Excel(name = "记录状态，0：未提交，1：已提交")
+    private Long recordStatus;
+}

ruoyi-admin/src/main/java/com/ruoyi/change/controller/TbAssetAllocationDTOController.java

@@ -0,0 +1,28 @@
+package com.ruoyi.change.controller;
+
+import com.ruoyi.change.domain.dto.TbAssetAllocationDTO;
+import com.ruoyi.change.service.ITbAssetAllocationDTOService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+public class TbAssetAllocationDTOController extends BaseController {
+    @Autowired
+    private ITbAssetAllocationDTOService tbAssetAllocationDTOService;
+
+    /**
+     * 查询资产调拨列表
+     */
+    @PreAuthorize("@ss.hasPermi('change:allocation:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbAssetAllocationDTO tbAssetAllocationDTO)
+    {
+        startPage();
+        List<TbAssetAllocationDTO> list = tbAssetAllocationDTOService.selectTbAssetAllocationList(tbAssetAllocationDTO);
+        return getDataTable(list);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/change/domain/dto/TbAssetAllocationDTO.java

@@ -0,0 +1,97 @@
+package com.ruoyi.change.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TbAssetAllocationDTO {
+    /** 编号 */
+    private Long id;
+
+    /** 调拨单号 */
+    @Excel(name = "调拨单号")
+    private String orderNumber;
+
+    /** 调出部门 */
+    @Excel(name = "调出部门")
+    private String callOutDepartment;
+
+    /** 调出经办人 */
+    @Excel(name = "调出经办人")
+    private String callOutBy;
+
+    /** 调出日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调出日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date callOutDate;
+
+    /** 调入部门 */
+    @Excel(name = "调入部门")
+    private String callInDepartment;
+
+    /** 调入经办人 */
+    @Excel(name = "调入经办人")
+    private String callInBy;
+
+    /** 调入日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调入日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date callInDate;
+
+    /** 资产总原值（元） */
+    @Excel(name = "资产总原值", readConverterExp = "元=")
+    private String assetTotalOriginalValue;
+
+    /** 资产总净值（元） */
+    @Excel(name = "资产总净值", readConverterExp = "元=")
+    private String assetTotalNetValue;
+
+    /** 调拨说明 */
+    @Excel(name = "调拨说明")
+    private String reason;
+
+    /** 制单人 */
+    @Excel(name = "制单人")
+    private String preparedBy;
+
+    /** 制单部门 */
+    @Excel(name = "制单部门")
+    private String preparedDepartment;
+
+    /** 所属公司 */
+    @Excel(name = "所属公司")
+    private String corporation;
+
+    /** 记录状态 */
+    @Excel(name = "记录状态")
+    private Long recordStatus;
+
+    /** 资产编号 */
+    @Excel(name = "资产编号")
+    private String assetNumber;
+
+    /** 旧管理人 */
+    @Excel(name = "旧管理人")
+    private String oldResponsiblePerson;
+
+    /** 旧功能位置编号 */
+    @Excel(name = "旧功能位置编号")
+    private String oldLocationNumber;
+
+    /** 新管理人 */
+    @Excel(name = "新管理人")
+    private String newResponsiblePerson;
+
+    /** 新功能位置编号 */
+    @Excel(name = "新功能位置编号")
+    private String newLocationNumber;
+}

ruoyi-admin/src/main/java/com/ruoyi/change/mapper/TbAssetAllocationDTOMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.change.mapper;
+
+import com.ruoyi.change.domain.dto.TbAssetAllocationDTO;
+
+import java.util.List;
+
+public interface TbAssetAllocationDTOMapper {
+    /**
+     * 查询资产调拨列表
+     *
+     * @param tbAssetAllocationDTO 资产调拨
+     * @return 资产调拨集合
+     */
+    public List<TbAssetAllocationDTO> selectTbAssetAllocationList(TbAssetAllocationDTO tbAssetAllocationDTO);
+}

ruoyi-admin/src/main/java/com/ruoyi/change/service/ITbAssetAllocationDTOService.java

@@ -0,0 +1,15 @@
+package com.ruoyi.change.service;
+
+import com.ruoyi.change.domain.dto.TbAssetAllocationDTO;
+
+import java.util.List;
+
+public interface ITbAssetAllocationDTOService {
+    /**
+     * 查询资产调拨列表
+     *
+     * @param tbAssetAllocationDTO 资产调拨
+     * @return 资产调拨集合
+     */
+    public List<TbAssetAllocationDTO> selectTbAssetAllocationList(TbAssetAllocationDTO tbAssetAllocationDTO);
+}

ruoyi-admin/src/main/java/com/ruoyi/change/service/impl/TbAssetAllocationDTOServiceImpl.java

@@ -0,0 +1,19 @@
+package com.ruoyi.change.service.impl;
+
+import com.ruoyi.change.domain.dto.TbAssetAllocationDTO;
+import com.ruoyi.change.mapper.TbAssetAllocationDTOMapper;
+import com.ruoyi.change.service.ITbAssetAllocationDTOService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public class TbAssetAllocationDTOServiceImpl implements ITbAssetAllocationDTOService {
+    @Autowired
+    private TbAssetAllocationDTOMapper tbAssetAllocationDTOMapper;
+
+
+    @Override
+    public List<TbAssetAllocationDTO> selectTbAssetAllocationList(TbAssetAllocationDTO tbAssetAllocationDTO) {
+        return tbAssetAllocationDTOMapper.selectTbAssetAllocationList(tbAssetAllocationDTO);
+    }
+}

ruoyi-admin/src/main/resources/mapper/change/TbAssetAllocationDTOMapper.xml

@@ -0,0 +1,29 @@
+<?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.change.mapper.TbAssetAllocationDTOMapper">
+    <select id="selectTbAssetAllocationList" parameterType="TbAssetAllocationDTO" resultType="TbAssetAllocationDTO">
+        SELECT a.id,
+               a.order_number orderNumber,
+               a.call_out_department callOutDepartment,
+               a.call_out_by callOutBy,
+               a.call_out_date callOutDate,
+               a.call_in_department callInDepartment,
+               a.call_in_by callInBy,
+               a.call_in_date callInDate,
+               a.asset_total_original_value assetTotalOriginalValue,
+               a.asset_total_net_value assetTotalNetValue,
+               a.reason,
+               a.prepared_by preparedBy,
+               a.prepared_department preparedDepartment,
+               a.corporation,
+               a.record_status recordStatus,
+               a.new_responsible_person newResponsiblePerson,
+               a.new_location_number newLocationNumber,
+               b.asset_number assetNumber,
+               b.old_responsible_person oldResponsiblePerson,
+               b.old_location_number oldLocationNumber,
+
+    </select>
+
+</mapper>

ruoyi-ui/src/api/asset/adjustment.js

@@ -26,6 +26,25 @@ export function addAdjustment(data) {
   })
 }
 
+// 提交资产调整
+export function submitAdjustment(data) {
+  return request({
+    url: '/asset/adjustment/submit',
+    method: 'put',
+    data: data
+  })
+}
+
+
+// 审核资产调整
+export function auditAdjustment(data) {
+  return request({
+    url: '/asset/adjustment/audit',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改资产调整
 export function updateAdjustment(data) {
   return request({

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

@@ -17,14 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="调整单号" prop="orderNumber">
+      <!-- <el-form-item label="调整单号" prop="orderNumber">
         <el-input
           v-model="queryParams.orderNumber"
           placeholder="请输入调整单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="制单人" prop="preparedBy">
         <el-input
           v-model="queryParams.preparedBy"
@@ -33,14 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="制单部门" prop="preparedDepartment">
+      <!-- <el-form-item label="制单部门" prop="preparedDepartment">
         <el-input
           v-model="queryParams.preparedDepartment"
           placeholder="请输入制单部门"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="记录状态" prop="recordStatus">
         <el-select v-model="queryParams.recordStatus" placeholder="请选择记录状态" clearable>
           <el-option
@@ -81,6 +81,28 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          type="info"
+          plain
+          icon="el-icon-position"
+          size="mini"
+          :disabled="single"
+          @click="submit"
+          v-hasPermi="['asset:adjustment:submit']"
+        >提交</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-check"
+          size="mini"
+          :disabled="single"
+          @click="audit"
+          v-hasPermi="['asset:adjustment:audit']"
+        >审核</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
           type="danger"
           plain
           icon="el-icon-delete"
@@ -103,15 +125,27 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="adjustmentList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="adjustmentList" @selection-change="handleSelectionChange" v-if="arr">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="资产编号" align="center" prop="assetNumber" />
-      <el-table-column label="资产原信息" align="center" prop="originalAssetInfo" />
+      <el-table-column label="资产编号" align="center" prop="assetNumber" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.assetNumber != null ? assetName(scope.row.assetNumber) : ""}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="资产原信息" align="center" prop="originalAssetInfo" >
+        <template slot-scope="scope">
+          <div>{{test(scope.row.originalAssetInfo) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="调整原因" align="center" prop="reason" />
-      <el-table-column label="调整单号" align="center" prop="orderNumber" />
+      <!-- <el-table-column label="调整单号" align="center" prop="orderNumber" /> -->
       <el-table-column label="制单人" align="center" prop="preparedBy" />
-      <el-table-column label="制单部门" align="center" prop="preparedDepartment" />
+      <el-table-column label="制单部门" align="center" prop="preparedDepartment">
+        <template slot-scope="scope">
+          <span v-if="scope.row.preparedDepartment">{{ scope.row.preparedDepartment != null ? deptName(scope.row.preparedDepartment) : ""}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="记录状态" align="center" prop="recordStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>
@@ -149,24 +183,36 @@
     <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="assetNumber">
-          <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
+          <el-select v-model="form.assetNumber" filterable placeholder="请选择资产编号">
+            <el-option
+              v-for="item in informationList"
+              :key="item.number"
+              :label="item.name"
+              :value="item.number"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <!-- <el-form-item label="资产原信息" prop="originalAssetInfo">
+        <el-form-item label="资产原信息" prop="originalAssetInfo">
           <el-input v-model="form.originalAssetInfo" type="textarea" placeholder="请输入内容" />
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="调整原因" prop="reason">
           <el-input v-model="form.reason" placeholder="请输入调整原因" />
         </el-form-item>
-        <el-form-item label="调整单号" prop="orderNumber">
+        <!-- <el-form-item label="调整单号" prop="orderNumber">
           <el-input v-model="form.orderNumber" placeholder="请输入调整单号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="制单人" prop="preparedBy">
           <el-input v-model="form.preparedBy" placeholder="请输入制单人" />
         </el-form-item>
         <el-form-item label="制单部门" prop="preparedDepartment">
-          <el-input v-model="form.preparedDepartment" placeholder="请输入制单部门" />
+          <treeselect
+                v-model="form.preparedDepartment"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择制单部门"
+              />
         </el-form-item>
-        <el-form-item label="记录状态" prop="recordStatus">
+        <!-- <el-form-item label="记录状态" prop="recordStatus">
           <el-select v-model="form.recordStatus" placeholder="请选择记录状态">
             <el-option
               v-for="dict in dict.type.asset_record_status"
@@ -175,7 +221,7 @@
               :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -186,11 +232,18 @@
 </template>
 
 <script>
-import { listAdjustment, getAdjustment, delAdjustment, addAdjustment, updateAdjustment } from "@/api/asset/adjustment";
+import { listAdjustment, getAdjustment, delAdjustment, addAdjustment, updateAdjustment, submitAdjustment, auditAdjustment } from "@/api/asset/adjustment";
+import { listDept } from "@/api/system/dept";
+import { listInformation } from "@/api/asset/information";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Adjustment",
   dicts: ['asset_record_status'],
+  components:{
+    Treeselect
+  },
   data() {
     return {
       // 遮罩层
@@ -205,8 +258,13 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 部门树选项
+      deptOptions: [],
+      arr: [],
       // 资产调整表格数据
       adjustmentList: [],
+      // 资产信息表格数据
+      informationList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -227,9 +285,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        assetNumber: [
-          { required: true, message: "资产编号不能为空", trigger: "blur" }
-        ],
+        // assetNumber: [
+        //   { required: true, message: "资产编号不能为空", trigger: "blur" }
+        // ],
         originalAssetInfo: [
           { required: true, message: "资产原信息", trigger: "blur" }
         ],
@@ -249,15 +307,50 @@ export default {
     this.getList();
   },
   methods: {
+    test(val) {
+      const json = JSON.parse(val)
+      console.log(json)
+    },
     /** 查询资产调整列表 */
     getList() {
       this.loading = true;
+      listDept().then((response) => {
+        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.arr = response.data
+      });
+      listInformation().then(response => {
+        this.informationList = response.rows;
+      });
       listAdjustment(this.queryParams).then(response => {
         this.adjustmentList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children,
+      };
+    },
+    //获取公司名
+    deptName(val){
+       let num = parseInt(val)
+       let arr2 = this.arr.filter(item => item.deptId===num);
+       if (arr2) {
+        return arr2[0].deptName
+       }
+    },
+    //获取资产名
+    assetName(val){
+      let arr2 = this.informationList.filter(item => item.number===val);
+      return arr2[0].name
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -309,6 +402,29 @@ export default {
         this.title = "修改资产调整";
       });
     },
+    submit(row){
+      this.reset();
+      const id = row.id || this.ids
+      getAdjustment(id).then(response => {
+        submitAdjustment(response.data).then(response => {
+              this.$modal.msgSuccess("提交成功");
+              this.open = false;
+              this.getList();
+            });
+      });
+    },
+    /**审核按钮 */
+    audit(row){
+      this.reset();
+      const id = row.id || this.ids
+      getAdjustment(id).then(response => {
+        auditAdjustment(response.data).then(response => {
+              this.$modal.msgSuccess("审核成功");
+              this.open = false;
+              this.getList();
+            });
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

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

@@ -127,6 +127,7 @@
 <script>
 import { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/asset/category";
 
+
 export default {
   name: "Category",
   data() {