Procházet zdrojové kódy

修改设备明细的资料

余思翰 před 1 rokem
rodič
revize
7fc52c983c

+ 2
- 1
oa-back/ruoyi-admin/src/main/resources/application.yml Zobrazit soubor

@@ -7,7 +7,8 @@ cmc:
7 7
   # 版权年份
8 8
   copyrightYear: 2023
9 9
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
10
-  profile: /home/cmc/Java-server/综合办公/uploadPath
10
+#  profile: /home/cmc/Java-server/综合办公/
11
+  profile: D:/ruoyi/uploadPath
11 12
   # 获取ip地址开关
12 13
   addressEnabled: false
13 14
   # 验证码类型 math 数字计算 char 字符验证

+ 1
- 0
oa-ui/src/assets/icons/svg/dept.svg Zobrazit soubor

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

+ 1
- 0
oa-ui/src/assets/icons/svg/key.svg Zobrazit soubor

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

+ 1
- 0
oa-ui/src/assets/icons/svg/place.svg Zobrazit soubor

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

+ 2
- 2
oa-ui/src/router/index.js Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-01-03 09:23:11
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-03-13 10:38:15
5
+ * @LastEditTime: 2024-03-15 14:18:00
6 6
  */
7 7
 import Vue from 'vue'
8 8
 import Router from 'vue-router'
@@ -194,7 +194,7 @@ export const constantRoutes = [
194 194
       {
195 195
         path: '',
196 196
         component: () => import('@/views/oa/device/expense'),
197
-        name: 'carExpense',
197
+        name: 'deviceExpense',
198 198
         meta: { title: '设备明细', icon: '' }
199 199
 
200 200
       }

+ 61
- 31
oa-ui/src/views/oa/device/expense.vue Zobrazit soubor

@@ -2,51 +2,51 @@
2 2
   <div class="app-container">
3 3
     <div class="header">
4 4
       <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
5
-      <h1>{{ '【' + deviceInfo.licensePlate + '】' }}设备明细</h1>
5
+      <h1>{{ '【' + deviceInfo.name + '】' }}设备明细</h1>
6 6
     </div>
7 7
     <el-divider></el-divider>
8 8
     <el-descriptions class="descriptions" :column="column" border style="text-align: center;">
9 9
       <el-descriptions-item>
10 10
         <template slot="label">
11
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
12
-          车牌
11
+          <svg-icon slot="prefix" icon-class="key" class="el-input__icon input-icon" />
12
+          出厂编
13 13
         </template>
14
-        {{ deviceInfo.licensePlate }}
14
+        {{ deviceInfo.code }}
15 15
       </el-descriptions-item>
16 16
       <el-descriptions-item>
17 17
         <template slot="label">
18
-          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
19
-          品牌
18
+          <svg-icon slot="prefix" icon-class="dict" class="el-input__icon input-icon" />
19
+          设备名称
20 20
         </template>
21
-        {{ deviceInfo.brand }}
21
+        {{ deviceInfo.name }}
22 22
       </el-descriptions-item>
23 23
       <el-descriptions-item>
24 24
         <template slot="label">
25
-          <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
26
-          系列
25
+          <svg-icon slot="prefix" icon-class="bug" class="el-input__icon input-icon" />
26
+          设备类别
27 27
         </template>
28
-        {{ deviceInfo.series }}
28
+        {{ deviceInfo.type }}
29 29
       </el-descriptions-item>
30 30
       <el-descriptions-item>
31 31
         <template slot="label">
32
-          <svg-icon slot="prefix" icon-class="cost" class="el-input__icon input-icon" />
33
-          总价
32
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
33
+          购买价格
34 34
         </template>
35 35
         {{ deviceInfo.cost }}
36 36
       </el-descriptions-item>
37 37
       <el-descriptions-item>
38 38
         <template slot="label">
39 39
           <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
40
-          上牌时间
40
+          购置时间
41 41
         </template>
42 42
         {{ parseTime(deviceInfo.acquisitionTime, '{y}-{m}-{d}') }}
43 43
       </el-descriptions-item>
44 44
       <el-descriptions-item>
45 45
         <template slot="label">
46
-          <i class="el-icon-user-solid"></i>
47
-          驾驶员
46
+          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
47
+          设备品牌
48 48
         </template>
49
-        {{ deviceInfo.driver }}
49
+        {{ deviceInfo.brand }}
50 50
       </el-descriptions-item>
51 51
       <el-descriptions-item>
52 52
         <template slot="label">
@@ -57,24 +57,45 @@
57 57
       </el-descriptions-item>
58 58
       <el-descriptions-item>
59 59
         <template slot="label">
60
-          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
61
-          预计行驶里程(万千米)
60
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
61
+          单日成本
62 62
         </template>
63
-        {{ deviceInfo.expectKm }}
63
+        {{ deviceInfo.dayCost }}
64 64
       </el-descriptions-item>
65 65
       <el-descriptions-item>
66 66
         <template slot="label">
67
-          <svg-icon slot="prefix" icon-class="JamYelpSquare" class="el-input__icon input-icon" />
68
-          是否为租车
67
+          <svg-icon slot="prefix" icon-class="place" class="el-input__icon input-icon" />
68
+          存放地点
69 69
         </template>
70
-        {{ deviceInfo.isRent == '0' ? '否' : '是' }}
70
+        {{ deviceInfo.place }}
71 71
       </el-descriptions-item>
72 72
       <el-descriptions-item>
73 73
         <template slot="label">
74
-          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
75
-          单日成本
74
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
75
+          校验周期(年)
76 76
         </template>
77
-        {{ deviceInfo.dayCost }}
77
+        {{ deviceInfo.checkTerm }}
78
+      </el-descriptions-item>
79
+      <el-descriptions-item>
80
+        <template slot="label">
81
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
82
+          保修期(月)
83
+        </template>
84
+        {{ deviceInfo.warranty }}
85
+      </el-descriptions-item>
86
+      <el-descriptions-item>
87
+        <template slot="label">
88
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
89
+          校验日期
90
+        </template>
91
+        {{ parseTime(deviceInfo.checkTime, '{y}-{m}-{d}') }}
92
+      </el-descriptions-item>
93
+      <el-descriptions-item>
94
+        <template slot="label">
95
+          <svg-icon slot="prefix" icon-class="dept" class="el-input__icon input-icon" />
96
+          管理部门
97
+        </template>
98
+        {{ deviceInfo.manageDept }}
78 99
       </el-descriptions-item>
79 100
       <el-descriptions-item>
80 101
         <template slot="label">
@@ -88,6 +109,9 @@
88 109
     <el-divider></el-divider>
89 110
 
90 111
     <el-card>
112
+      <div slot="header" class="clearfix">
113
+        <h3>设备使用记录</h3>
114
+      </div>
91 115
       <el-row :gutter="10" class="mb8">
92 116
         <el-col :span="1.5">
93 117
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
@@ -104,20 +128,26 @@
104 128
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
105 129
         </el-col>
106 130
       </el-row>
131
+      <!-- 设备使用记录 -->
107 132
       <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionChange">
108 133
         <el-table-column type="selection" width="55" align="center" />
109 134
         <el-table-column type="index" width="55" align="center" label="序号" />
110
-        <el-table-column label="费用类型" align="center" prop="expenseType">
135
+        <el-table-column label="项目编号" align="center" prop="projectNumber">
111 136
           <template slot-scope="scope">
112 137
             <el-tag :type="typeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType) }}</el-tag>
113 138
           </template>
114 139
         </el-table-column>
115
-        <el-table-column label="费用金额" align="center" prop="expense">
140
+        <el-table-column label="项目名称" align="center" prop="projectName">
141
+          <template slot-scope="scope">
142
+            {{ scope.row.expense }}
143
+          </template>
144
+        </el-table-column>
145
+        <el-table-column label="申请时间" align="center" prop="expense">
116 146
           <template slot-scope="scope">
117
-            {{ scope.row.expense + '元' }}
147
+            {{ scope.row.expense }}
118 148
           </template>
119 149
         </el-table-column>
120
-        <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
150
+        <el-table-column label="归还时间" align="center" prop="occurDate" width="180">
121 151
           <template slot-scope="scope">
122 152
             {{ scope.row.occurDate }}
123 153
           </template>
@@ -234,9 +264,9 @@ export default {
234 264
       })
235 265
     },
236 266
     goBack() {
237
-      let obj = { path: "/car/expense" }
267
+      let obj = { path: "/device/expense" }
238 268
       this.$tab.closeOpenPage(obj);
239
-      this.$router.push({ path: '/car' });
269
+      this.$router.push({ path: '/device' });
240 270
     },
241 271
     /** 搜索按钮操作 */
242 272
     handleQuery() {

+ 5
- 3
oa-ui/src/views/oa/device/index.vue Zobrazit soubor

@@ -139,8 +139,8 @@
139 139
             </el-form-item>
140 140
           </el-col>
141 141
           <el-col :span="12">
142
-            <el-form-item label="管理部门" prop="manageDept">
143
-              <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
142
+            <el-form-item label="设备类别" prop="place">
143
+              <el-input v-model="form.type" placeholder="请输入设备类别" />
144 144
             </el-form-item>
145 145
 
146 146
           </el-col>
@@ -166,7 +166,9 @@
166 166
             </el-form-item>
167 167
           </el-col>
168 168
           <el-col :span="12">
169
-
169
+            <el-form-item label="管理部门" prop="manageDept">
170
+              <el-input v-model="form.manageDept" placeholder="请输入管理部门" />
171
+            </el-form-item>
170 172
           </el-col>
171 173
         </el-row>
172 174
         <el-row :gutter="20">

Loading…
Zrušit
Uložit