修改设备明细的资料

oa-back/ruoyi-admin/src/main/resources/application.yml

   # 版权年份
   copyrightYear: 2023
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/cmc/Java-server/综合办公/uploadPath
+#  profile: /home/cmc/Java-server/综合办公/
+  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

oa-ui/src/assets/icons/svg/dept.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 256 256"><path fill="currentColor" d="M164.38 181.1a52 52 0 1 0-72.76 0a75.89 75.89 0 0 0-30 28.89a12 12 0 0 0 20.78 12a53 53 0 0 1 91.22 0a12 12 0 1 0 20.78-12a75.89 75.89 0 0 0-30.02-28.89M100 144a28 28 0 1 1 28 28a28 28 0 0 1-28-28m147.21 9.59a12 12 0 0 1-16.81-2.39c-8.33-11.09-19.85-19.59-29.33-21.64a12 12 0 0 1-1.82-22.91a20 20 0 1 0-24.78-28.3a12 12 0 1 1-21-11.6a44 44 0 1 1 73.28 48.35a92.18 92.18 0 0 1 22.85 21.69a12 12 0 0 1-2.39 16.8m-192.28-24c-9.48 2.05-21 10.55-29.33 21.65a12 12 0 0 1-19.19-14.45a92.37 92.37 0 0 1 22.85-21.69a44 44 0 1 1 73.28-48.35a12 12 0 1 1-21 11.6a20 20 0 1 0-24.78 28.3a12 12 0 0 1-1.82 22.91Z"/></svg>

oa-ui/src/assets/icons/svg/key.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M12 10q1.25 0 2.125-.875T15 7q0-1.25-.875-2.125T12 4q-1.25 0-2.125.875T9 7q0 1.25.875 2.125T12 10m.05 13L8 19l2-2l-2-2l2-2v-.35q-1.8-.625-2.9-2.175T6 7q0-2.5 1.75-4.25T12 1q2.5 0 4.25 1.75T18 7q0 2.025-1.15 3.538T14 12.65V21z"/></svg>

oa-ui/src/assets/icons/svg/place.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path fill="currentColor" d="M12 2c-4.2 0-8 3.22-8 8.2c0 3.18 2.45 6.92 7.34 11.23c.38.33.95.33 1.33 0C17.55 17.12 20 13.38 20 10.2C20 5.22 16.2 2 12 2m0 10c-1.1 0-2-.9-2-2s.9-2 2-2s2 .9 2 2s-.9 2-2 2"/></svg>

oa-ui/src/router/index.js

  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-13 10:38:15
+ * @LastEditTime: 2024-03-15 14:18:00
  */
 import Vue from 'vue'
 import Router from 'vue-router'
       {
         path: '',
         component: () => import('@/views/oa/device/expense'),
-        name: 'carExpense',
+        name: 'deviceExpense',
         meta: { title: '设备明细', icon: '' }
 
       }

oa-ui/src/views/oa/device/expense.vue

   <div class="app-container">
     <div class="header">
       <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
-      <h1>{{ '【' + deviceInfo.licensePlate + '】' }}设备明细</h1>
+      <h1>{{ '【' + deviceInfo.name + '】' }}设备明细</h1>
     </div>
     <el-divider></el-divider>
     <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
-          车牌号
+          <svg-icon slot="prefix" icon-class="key" class="el-input__icon input-icon" />
+          出厂编号
         </template>
-        {{ deviceInfo.licensePlate }}
+        {{ deviceInfo.code }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
-          品牌
+          <svg-icon slot="prefix" icon-class="dict" class="el-input__icon input-icon" />
+          设备名称
         </template>
-        {{ deviceInfo.brand }}
+        {{ deviceInfo.name }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
-          系列
+          <svg-icon slot="prefix" icon-class="bug" class="el-input__icon input-icon" />
+          设备类别
         </template>
-        {{ deviceInfo.series }}
+        {{ deviceInfo.type }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="cost" class="el-input__icon input-icon" />
-          总价
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          购买价格
         </template>
         {{ deviceInfo.cost }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
-          上牌时间
+          购置时间
         </template>
         {{ parseTime(deviceInfo.acquisitionTime, '{y}-{m}-{d}') }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <i class="el-icon-user-solid"></i>
-          驾驶员
+          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
+          设备品牌
         </template>
-        {{ deviceInfo.driver }}
+        {{ deviceInfo.brand }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
-          预计行驶里程（万千米）
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          单日成本
         </template>
-        {{ deviceInfo.expectKm }}
+        {{ deviceInfo.dayCost }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="JamYelpSquare" class="el-input__icon input-icon" />
-          是否为租车
+          <svg-icon slot="prefix" icon-class="place" class="el-input__icon input-icon" />
+          存放地点
         </template>
-        {{ deviceInfo.isRent == '0' ? '否' : '是' }}
+        {{ deviceInfo.place }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
-          单日成本
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          校验周期（年）
         </template>
-        {{ deviceInfo.dayCost }}
+        {{ deviceInfo.checkTerm }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          保修期（月）
+        </template>
+        {{ deviceInfo.warranty }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          校验日期
+        </template>
+        {{ parseTime(deviceInfo.checkTime, '{y}-{m}-{d}') }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
+          管理部门
+        </template>
+        {{ deviceInfo.manageDept }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
     <el-divider></el-divider>
 
     <el-card>
+      <div slot="header" class="clearfix">
+        <h3>设备使用记录</h3>
+      </div>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
         </el-col>
       </el-row>
+      <!-- 设备使用记录 -->
       <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="index" width="55" align="center" label="序号" />
-        <el-table-column label="费用类型" align="center" prop="expenseType">
+        <el-table-column label="项目编号" align="center" prop="projectNumber">
           <template slot-scope="scope">
             <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="费用金额" align="center" prop="expense">
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            {{ scope.row.expense }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" align="center" prop="expense">
           <template slot-scope="scope">
-            {{ scope.row.expense + '元' }}
+            {{ scope.row.expense }}
           </template>
         </el-table-column>
-        <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+        <el-table-column label="归还时间" align="center" prop="occurDate" width="180">
           <template slot-scope="scope">
             {{ scope.row.occurDate }}
           </template>
       })
     },
     goBack() {
-      let obj = { path: "/car/expense" }
+      let obj = { path: "/device/expense" }
       this.$tab.closeOpenPage(obj);
-      this.$router.push({ path: '/car' });
+      this.$router.push({ path: '/device' });
     },
     /** 搜索按钮操作 */
     handleQuery() {

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

             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="管理部门" prop="manageDept">
-              <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
+            <el-form-item label="设备类别" prop="place">
+              <el-input v-model="form.type" placeholder="请输入设备类别" />
             </el-form-item>
 
           </el-col>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
+            <el-form-item label="管理部门" prop="manageDept">
+              <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">