修改资产调整，资产原信息自动录入

ruoyi-admin/pom.xml

@@ -61,6 +61,13 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <!--huTool-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.17</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -1,7 +1,12 @@
 package com.ruoyi.asset.controller;
 
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.asset.domain.TbAssetInformation;
+import com.ruoyi.asset.mapper.TbAssetInformationMapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TbAssetAdjustmentController extends BaseController
     @Autowired
     private ITbAssetAdjustmentService tbAssetAdjustmentService;
 
+    @Resource
+    private TbAssetInformationMapper tbAssetInformationMapper;
+
     /**
      * 查询资产调整列表
      */
@@ -77,6 +85,11 @@ public class TbAssetAdjustmentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TbAssetAdjustment tbAssetAdjustment)
     {
+        String assetNumber = tbAssetAdjustment.getAssetNumber();
+        TbAssetInformation tbAssetInformation = tbAssetInformationMapper.selectTbAssetInformationByAssetNumber(assetNumber);
+        String jsonStr = JSONUtil.toJsonStr(tbAssetInformation);
+        tbAssetAdjustment.setOriginalAssetInfo(jsonStr);
+
         return toAjax(tbAssetAdjustmentService.insertTbAssetAdjustment(tbAssetAdjustment));
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.asset.mapper;
 
 import java.util.List;
 import com.ruoyi.asset.domain.TbAssetInformation;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 资产信息Mapper接口
@@ -20,6 +21,15 @@ public interface TbAssetInformationMapper
     public TbAssetInformation selectTbAssetInformationById(Long id);
 
     /**
+     * 查询资产信息
+     *
+     * @param assetNumber 资产编号
+     * @return 资产信息
+     */
+    @Select("select * from tb_asset_information where number = #{assetNumber}")
+    TbAssetInformation selectTbAssetInformationByAssetNumber(String assetNumber);
+
+    /**
      * 查询资产信息列表
      * 
      * @param tbAssetInformation 资产信息

ruoyi-common/pom.xml

@@ -126,6 +126,13 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <!--huTool-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.17</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -151,9 +151,9 @@
         <el-form-item label="资产编号" prop="assetNumber">
           <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
         </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>

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

@@ -690,6 +690,7 @@ import { listLocation } from "@/api/asset/location";
 import ImageUploadTemp from "@/components/ImageUploadTemp"
 import { listDept } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Information",

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

@@ -1,28 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="位置编号" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入位置编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.number" 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-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <!-- <el-form-item label="所属公司" prop="company">
               <treeselect
@@ -33,151 +16,63 @@
               />
       </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-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="['asset:location:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['asset:location: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="['asset:location:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['asset:location: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="['asset:location:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['asset:location: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="['asset:location:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['asset:location:export']">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="locationList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="locationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
       <el-table-column label="位置编号" align="center" prop="number" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="所属公司" align="center" prop="company" >
+      <el-table-column label="所属公司" align="center" prop="company">
         <template slot-scope="scope">
-            <span>{{ scope.row.company != null ? companyName(scope.row.company) : "" }}</span>
+          <span>{{ scope.row.company != null ? companyName(scope.row.company) : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <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="['asset:location:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['asset:location:remove']"
-            >删除</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['asset:location:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['asset:location: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"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改所属位置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-form-item label="位置编号" prop="number">
-            <el-input v-model="form.number" placeholder="请输入位置编号" />
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入名称" />
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item label="所属公司" prop="company">
-              <treeselect
-                v-model="form.company"
-                :options="deptOptions"
-                :normalizer="normalizer"
-                placeholder="选择所属公司"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" />
-          </el-form-item>
-        </el-row>
+        <el-form-item label="位置编号" prop="number">
+          <el-input v-model="form.number" 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="company">
+          <treeselect v-model="form.company" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属公司" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -188,18 +83,13 @@
 </template>
 
 <script>
-import {
-  listLocation,
-  getLocation,
-  delLocation,
-  addLocation,
-  updateLocation,
-} from "@/api/asset/location";
-import { listDept } from "@/api/system/dept";
+import { listLocation, getLocation, delLocation, addLocation, updateLocation } from '@/api/asset/location'
+import { listDept } from '@/api/system/dept'
 import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: "Location",
+  name: 'Location',
   components: { Treeselect },
   data() {
     return {
@@ -221,7 +111,7 @@ export default {
       // 所属位置表格数据
       locationList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -236,63 +126,52 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        number: [
-          { required: true, message: "位置编号不能为空", trigger: "blur" },
-        ],
-        company: [
-          { required: true, message: "所属公司不能为空", trigger: "blur" },
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
-        updateTime: [
-          { required: true, message: "最后修改时间不能为空", trigger: "blur" },
-        ],
+        number: [{ required: true, message: '位置编号不能为空', trigger: 'blur' }],
+        company: [{ required: true, message: '所属公司不能为空', trigger: 'blur' }],
+        createBy: [{ required: true, message: '创建人不能为空', trigger: 'blur' }],
+        createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+        updateTime: [{ required: true, message: '最后修改时间不能为空', trigger: 'blur' }],
       },
-    };
+    }
   },
   created() {
-    this.getList();
-    
+    this.getList()
   },
   methods: {
     /** 查询所属位置列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listDept().then((response) => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, 'deptId')
         this.arr = response.data
-      });
+      })
       listLocation(this.queryParams).then((response) => {
-        this.locationList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.locationList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
         id: node.deptId,
         label: node.deptName,
         children: node.children,
-      };
+      }
     },
     //获取公司名
-    companyName(val){
-       let num = parseInt(val)
-       let arr2 = this.arr.filter(item => item.deptId===num);
-       return arr2[0].deptName
+    companyName(val) {
+      let num = parseInt(val)
+      let arr2 = this.arr.filter((item) => item.deptId === num)
+      return arr2[0].deptName
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -306,91 +185,91 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
+      this.ids = selection.map((item) => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
+      this.reset()
       if (row != undefined) {
-        this.form.parentId = row.deptId;
+        this.form.parentId = row.deptId
       }
-      this.open = true;
-      this.title = "添加所属位置";
+      this.open = true
+      this.title = '添加所属位置'
       listDept().then((response) => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
-      });
+        this.deptOptions = this.handleTree(response.data, 'deptId')
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
+      this.reset()
+      const id = row.id || this.ids
       getLocation(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改所属位置";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改所属位置'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
             updateLocation(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addLocation(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id || this.ids
       this.$modal
         .confirm('是否确认删除所属位置编号为"' + ids + '"的数据项？')
         .then(function () {
-          return delLocation(ids);
+          return delLocation(ids)
         })
         .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "asset/location/export",
+        'asset/location/export',
         {
           ...this.queryParams,
         },
         `location_${new Date().getTime()}.xlsx`
-      );
+      )
     },
   },
-};
+}
 </script>