新增设备管理明细

oa-ui/src/router/index.js

@@ -186,6 +186,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/device/expense',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/oa/device/expense'),
+        name: 'carExpense',
+        meta: { title: '设备明细', icon: '' }
+
+      }
+    ]
+  }
 ]
 
 // 动态路由，基于用户权限动态去加载

oa-ui/src/views/flowable/form/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-13 14:17:12
+ * @LastEditTime: 2024-03-14 09:33:02
 -->
 <!--
  * @Author: wrh
@@ -93,25 +93,25 @@
               </el-row>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px"  v-if="taskName != '工会审核'">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"  v-if="taskName != '工会审核'">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <!-- 工会审核意见 -->
-              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="taskName == '工会审核'">
+              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="taskForm.procDefName == '用车审批（工会）'">
                 <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
                   :disabled="taskName != '工会审核'">
                 </el-input>
               </el-form-item>
               <!-- 安排用车意见 -->
-              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px">
+              <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px" v-if="taskForm.procDefName == '用车审批'">
                 <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment"
                   :disabled="taskName != '安排用车'">
                 </el-input>
@@ -343,7 +343,7 @@ export default {
       this.loading = true
       listProject({
         pageNum: 1,
-        pageSize: 9999999999
+        pageSize: 99999999
       }).then(response => {
         this.projectList = response.rows;
       })
@@ -364,7 +364,7 @@ export default {
     getCarList() {
       listCar({
         pageNum: 1,
-        pageSize: 9999999999
+        pageSize: 99999999
       }).then(response => {
         this.carList = response.rows;
       })
@@ -374,7 +374,7 @@ export default {
     getDriverList() {
       listDriver({
         pageNum: 1,
-        pageSize: 9999999999
+        pageSize: 99999999
       }).then(response => {
         this.driverList = response.rows;
       })

oa-ui/src/views/flowable/task/todo/index.vue

@@ -18,9 +18,9 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+        <!-- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:deployment:remove']">删除
-        </el-button>
+        </el-button> -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

oa-ui/src/views/index.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-12 17:28:04
+ * @LastEditTime: 2024-03-14 14:22:50
 -->
 
 <template>
   <div class="app-container home">
     <el-row style="height:350px;" :gutter="20">
-      <el-col :span="8">
+      <el-col :span="6">
         <div class="header">个人信息</div>
         <div class="user-wrapper">
           <div class="avatar">
@@ -17,28 +17,33 @@
           <div class="username">
             <div>{{ user.nickName }}</div>
             <div style="font-size: 14px;color:#bbb;font-weight:lighter;">
-              <el-tag type="warning">{{ user.postLevel == null ? '未设置职位': user.postLevel}}</el-tag>
+              <el-tag type="warning">{{ post.length == 0 ? '未设置职位' : post.join(' / ') }}</el-tag>
             </div>
           </div>
           <div class="user-info">
-            <table>
-              <tr>
-                <td>部门</td>
-                <td></td>
-              </tr>
-            </table>
+            <el-row :gutter="20" style="margin:10px">
+              <el-col :span="10" style="text-align: right;">所属部门：</el-col>
+              <el-col :span="14" style="text-align: left;">{{ user.dept.deptName }}</el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="10" style="text-align: right;">技术职称：</el-col>
+              <el-col :span="14" style="text-align: left;">{{ user.titles }}</el-col>
+            </el-row>
           </div>
         </div>
       </el-col>
-      <el-col :span="16" :xs="24">
+      <el-col :span="18" :xs="24">
         <div class="header">快捷入口</div>
         <div class="nav-wrapper">
           <div class="nav-item" v-for="nav in navItem" @click="goToPath(nav.id)">
-            <div class="nav-logo" :style="{ 'background-color': nav.bgColor, 'box-shadow': nav.boxShadow }">
-              <div class="icon">
-                <svg-icon slot="prefix" :icon-class="nav.icon" class="el-input__icon input-icon" />
+            <el-badge :value="formartBadge(nav.id)" :max="99" class="item">
+              <div class="nav-logo" :style="{ 'background-color': nav.bgColor, 'box-shadow': nav.boxShadow }">
+                <div class="icon">
+                  <svg-icon slot="prefix" :icon-class="nav.icon" class="el-input__icon input-icon" />
+                </div>
               </div>
-            </div>
+            </el-badge>
+
             <div class="nav-text">{{ nav.name }}</div>
           </div>
         </div>
@@ -57,6 +62,26 @@
       <el-col :span="8">
         <div class="header">公告</div>
         <div class="notice-content">
+          <el-table v-loading="noticeLoading" :data="noticeList" height="320px">
+            <!-- <el-table-column label="序号" align="center" prop="noticeId" width="100" /> -->
+            <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+            <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div style="text-align: right;margin-top: 20px;">
+            <el-pagination @current-change="getNotice" :current-page.sync="noticeQueryParams.pageNum"
+              :page-size="noticeQueryParams.pageSize" layout="total, prev, pager, next,jumper" :total="noticeTotal">
+            </el-pagination>
+          </div>
 
         </div>
       </el-col>
@@ -72,29 +97,42 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { getUserProfile } from "@/api/system/user";
+import { getUserProfile, getUser } from "@/api/system/user";
 import { listProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
 import { finishedList } from "@/api/flowable/finished";
-import Calendar from '@/components/Calendar'
+import Calendar from '@/components/Calendar';
+import { listNotice } from "@/api/system/notice";
 export default {
+  dicts: ['sys_notice_status', 'sys_notice_type'],
   components: {
     Calendar
   },
   computed: {
-    ...mapGetters(["avatar"]),
+    ...mapGetters(["avatar", "userId"]),
   },
   created() {
-    this.getUser();
+    this.getUserbyId();
     this.getDetail();
     this.getProject();
+    this.getNotice();
   },
   data() {
     return {
       times: new Date(),
-      user: {},
+      user: {
+        dept: {}
+      },
+      post: [],
       noticeData: [],
       projectData: [],
+      noticeList: [],// 公告表格数据
+      noticeTotal: 0,
+      noticeLoading: true,
+      noticeQueryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
       projectQueryParams: {
         pageNum: 1,
         pageSize: 16
@@ -161,22 +199,27 @@ export default {
         this.$router.push({ path: "/device" });
       }
     },
-    getUser() {
-      getUserProfile().then(response => {
+    getUserbyId() {
+      getUser(this.userId).then(response => {
         this.user = response.data;
-        console.log(this.user);
-        // for (let d of this.dict.type.sys_user_engineerlevel) {
-        //   if (d.value == response.data.engineerLevel) {
-        //     console.log(d);
-        //     this.engineerLevel = d.label
-        //   }
-        // }
-        // for (let t of this.dict.type.sys_user_titles) {
-        //   if (t.value == response.data.titles) {
-        //     console.log(t);
-        //     this.titles = t.label
-        //   }
-        // }
+        for (let p of response.posts) {
+          for (let ids of response.postIds) {
+            if (p.postId == ids) {
+              this.post.push(p.postName)
+            }
+          }
+        }
+        this.getDicts("sys_user_titles").then(res => {
+          console.log(res);
+          if (this.user.titles != "" && this.user.titles != null && this.user.titles != undefined) {
+            let titles = this.user.titles.split(',');
+            let arr = []
+            for (let t of titles) {
+              arr.push(res.data[t].dictLabel)
+            }
+            this.user.titles = arr.join(' / ')
+          }
+        })
       });
     },
     // 获取项目列表
@@ -191,8 +234,7 @@ export default {
       todoList({
         pageNum: 1,
         pageSize: 10,
-        name: null,
-        category: 'assess'
+        name: null
       }).then(response => {
         this.detail = response.data.total;
       });
@@ -214,6 +256,21 @@ export default {
         this.finish = response.data.total;
       })
     },
+    // 获取公告列表
+    getNotice() {
+      listNotice(this.noticeQueryParams).then(response => {
+        this.noticeList = response.rows;
+        this.noticeTotal = response.total;
+        this.noticeLoading = false;
+      });
+    },
+    formartBadge(id) {
+      if (id == 2) {
+        return this.detail
+      } else {
+        return null
+      }
+    }
   }
 }
 </script>
@@ -296,7 +353,13 @@ export default {
     font-family: '微软雅黑';
   }
 
-  .user-info {}
+  .user-info {
+    text-align: center;
+
+    table {
+      margin: 0 auto;
+    }
+  }
 }
 
 .notice-content {
@@ -304,6 +367,7 @@ export default {
   height: 400px;
   background-color: #ffffff;
   border-radius: 15px;
+  padding: 20px 15px 0;
 }
 
 .calendar-warpper {
@@ -323,9 +387,11 @@ export default {
 ::v-deep .el-calendar-table .el-calendar-day {
   height: 39px;
   text-align: center;
-  line-height: 22px;
+  line-height: 26px;
+}
+::v-deep .el-calendar-table .el-calendar-day:hover {
+  color: #242d42;
 }
-
 ::v-deep .el-calendar__body {
   padding: 15px 31px 10px;
 }
@@ -336,10 +402,18 @@ export default {
 
 ::v-deep .el-calendar-table td.is-today {
   background-color: #1890ff;
+  border-radius: 10px;
   color: #ffffff;
+  box-shadow: 0 0 10px rgba($color: #1890ff, $alpha: 0.2);
 }
 
 ::v-deep .el-calendar-table td.is-selected {
-  color: #242d42;
+  // color: #242d42;
+}
+::v-deep .el-calendar-table td{
+  border-right: none;
+}
+::v-deep .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th{
+  background-color: #ffffff;
 }
-</style>
+</style>

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

@@ -86,7 +86,7 @@
     </el-descriptions>
     <!-- 费用明细 -->
     <el-divider></el-divider>
-    
+
     <el-card>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
@@ -145,7 +145,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="费用金额" prop="expense">
-          <el-input v-model="form.expense" placeholder="请输入费用金额" />
+          <el-input v-model="form.expense" placeholder="请输入费用金额" style="width:150px" /> <el-tag>元</el-tag>
         </el-form-item>
         <el-form-item label="发生日期" prop="occurDate">
           <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
@@ -233,6 +233,8 @@ export default {
       })
     },
     goBack() {
+      let obj = { path: "/car/expense" }
+      this.$tab.closeOpenPage(obj);
       this.$router.push({ path: '/car' });
     },
     /** 搜索按钮操作 */

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

@@ -62,6 +62,7 @@
         </template>
       </el-table-column>
       <el-table-column label="单日成本" align="center" prop="dayCost" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" width="200px">
 
         <template slot-scope="scope">

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

@@ -0,0 +1,371 @@
+<template>
+  <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>
+    </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" />
+          车牌号
+        </template>
+        {{ deviceInfo.licensePlate }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="Branding" class="el-input__icon input-icon" />
+          品牌
+        </template>
+        {{ deviceInfo.brand }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="PhAppStoreLogoFill" class="el-input__icon input-icon" />
+          系列
+        </template>
+        {{ deviceInfo.series }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="cost" 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>
+          驾驶员
+        </template>
+        {{ deviceInfo.driver }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="date" class="el-input__icon input-icon" />
+          预计使用年限
+        </template>
+        {{ deviceInfo.expectLife }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="car" class="el-input__icon input-icon" />
+          预计行驶里程（万千米）
+        </template>
+        {{ deviceInfo.expectKm }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="JamYelpSquare" class="el-input__icon input-icon" />
+          是否为租车
+        </template>
+        {{ deviceInfo.isRent == '0' ? '否' : '是' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="TeenyiconsYenSolid" class="el-input__icon input-icon" />
+          单日成本
+        </template>
+        {{ deviceInfo.dayCost }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <svg-icon slot="prefix" icon-class="remark" class="el-input__icon input-icon" />
+          备注
+        </template>
+        {{ deviceInfo.remark }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <!-- 费用明细 -->
+    <el-divider></el-divider>
+
+    <el-card>
+      <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-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+            @click="handleUpdate">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+            @click="handleDelete">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <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">
+          <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">
+          <template slot-scope="scope">
+            {{ scope.row.expense + '元' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="发生日期" align="center" prop="occurDate" width="180">
+          <template slot-scope="scope">
+            {{ scope.row.occurDate }}
+          </template>
+        </el-table-column>
+        <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="['oa:carExpense:edit']">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['oa:carExpense: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" />
+    </el-card>
+    <!-- 添加明细 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="expenseForm" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="费用类型" prop="expenseType">
+          <el-select v-model="form.expenseType" placeholder="请选择" clearable>
+            <el-option label="保险费" value="0"></el-option>
+            <el-option label="维修/保养费" value="1"></el-option>
+            <el-option label="轮胎费" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费用金额" prop="expense">
+          <el-input v-model="form.expense" placeholder="请输入费用金额" style="width:150px" /> <el-tag>元</el-tag>
+        </el-form-item>
+        <el-form-item label="发生日期" prop="occurDate">
+          <el-date-picker clearable v-model="form.occurDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择发生日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getCar } from '@/api/oa/car/car.js'
+import { getDevice } from '@/api/oa/device/device.js'
+import { listCarExpense, getCarExpense, delCarExpense, addCarExpense, updateCarExpense } from "@/api/oa/car/carExpense";
+export default {
+  data() {
+    let validateExpense = (rule, value, callback) => {
+      setTimeout(() => {
+        if (!value) {
+          return callback(new Error('请输入金额'));
+        }
+        if (!this.isNumber(Number(value))) {
+          callback(new Error('请输入数字值'));
+        } else {
+          callback();
+        }
+      }, 100)
+    }
+    return {
+      column: 4,
+      deviceInfo: {},
+      expenseList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      multiple: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      title: '',
+      open: false,
+      form: {},
+      rules: {
+        expenseType: [
+          { required: true, message: '请选择费用类型', trigger: 'change' }
+        ],
+        expense: [
+          { validator: validateExpense, required: true, trigger: 'blur' },
+        ],
+        occurDate: [
+          { required: true, message: '请选择发生日期', trigger: 'change' },
+        ],
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.$route.query) {
+      getDevice(this.$route.query.deviceId).then(res => {
+        console.log(res);
+        this.deviceInfo = res.data;
+      })
+      this.getList();
+    }
+    if (this.$store.state.app.device == 'desktop') {
+
+    } else {
+      this.column = 1
+    }
+  },
+  methods: {
+    getList() {
+      this.queryParams.carId = this.$route.query.carId
+      listCarExpense(this.queryParams).then(res => {
+        console.log(res);
+        this.expenseList = res.rows;
+        this.total = res.total;
+      })
+    },
+    goBack() {
+      let obj = { path: "/car/expense" }
+      this.$tab.closeOpenPage(obj);
+      this.$router.push({ path: '/car' });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.carExpenseId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加车辆明细";
+    },
+    handleUpdate(row) {
+      this.reset();
+      const carExpenseId = row.carExpenseId || this.ids
+      getCarExpense(carExpenseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改车辆明细";
+      });
+    },
+    handleDelete(row) {
+      debugger
+      const carExpenseIds = row.carExpenseId || this.ids;
+      this.$modal.confirm('是否确认删除车辆费用编号为"' + carExpenseIds + '"的数据项？').then(function () {
+        return delCarExpense(carExpenseIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    handleExport() {
+      this.download('oa/carExpense/export', {
+        ...this.queryParams
+      }, `carExpense_${new Date().getTime()}.xlsx`)
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carExpenseId: null,
+        carId: null,
+        expenseType: null,
+        expense: null,
+        occurDate: null
+      };
+      this.resetForm("expenseForm");
+    },
+    submitForm() {
+      this.$refs["expenseForm"].validate(valid => {
+        if (valid) {
+          this.form.carId = this.$route.query.carId
+          if (this.form.carExpenseId != null) {
+            updateCarExpense(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCarExpense(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isNumber(value) {
+      return typeof value === 'number' && /^\d+(\.\d+)?$/.test(value);
+    },
+    expenseTypeText(row) {
+      if (row == '0') {
+        return '保险费'
+      }
+      if (row == '1') {
+        return '维修/保养费'
+      }
+      if (row == '2') {
+        return '轮胎费'
+      }
+    },
+    typeStyle(row) {
+      if (row == '0') {
+        return 'primary'
+      }
+      if (row == '1') {
+        return 'warning'
+      }
+      if (row == '2') {
+        return 'success'
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.header {
+  position: relative;
+  text-align: center;
+
+  .back {
+    position: absolute;
+    left: 12px;
+    top: -10px;
+  }
+}
+
+.descriptions {
+  padding: 20px 50px;
+}
+
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #121212;
+  background: rgba($color: #46a6ff, $alpha: 0.1);
+  width: 200px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #2d3f62;
+}
+</style>

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

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备编号" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入设备编号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="出厂编号" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入出厂编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item label="设备系列" prop="series">
-        <el-input v-model="queryParams.series" placeholder="请输入设备系列" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -37,28 +37,39 @@
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
-      <el-table-column label="设备编号" align="center" prop="code" />
+      <el-table-column label="出厂编号" align="center" prop="code" />
+      <el-table-column label="设备名称" align="center" prop="name" />
       <el-table-column label="设备类别" align="center" prop="type" />
-      <el-table-column label="设备系列" align="center" prop="series" />
+      <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总价" align="center" prop="cost">
+      <el-table-column label="购买价格" align="center" prop="cost">
 
         <template slot-scope="scope">
           {{ scope.row.cost + '万元' }}
         </template>
       </el-table-column>
       <el-table-column label="预计使用年限" align="center" prop="expectLife" />
+      <el-table-column label="设备品牌" align="center" prop="brand" />
+      <el-table-column label="单日成本" align="center" prop="dayCost" />
+      <el-table-column label="存放地点" align="center" prop="place" />
+      <el-table-column label="校验周期（年）" align="center" prop="checkTerm" />
+      <el-table-column label="保修期（月）" align="center" prop="warranty" />
+      <el-table-column label="校验日期" align="center" prop="checkTime" />
+      <el-table-column label="管理部门" align="center" prop="manageDept" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <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-plus" @click="handleAddDetail(scope.row)"
+            v-hasPermi="['oa:car:edit']">添加明细</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:device:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:device:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"
+            @click="handleDelete(scope.row)" v-hasPermi="['oa:device:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -67,31 +78,106 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc设备信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="设备编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入设备编号" />
-        </el-form-item>
-        <el-form-item label="设备系列" prop="series">
-          <el-input v-model="form.series" placeholder="请输入设备系列" />
-        </el-form-item>
-        <el-form-item label="设备类别" prop="type">
-          <el-input v-model="form.type" placeholder="请输入设备类别" />
-        </el-form-item>
-        <el-form-item label="购置时间" prop="acquisitionTime">
-          <el-date-picker clearable v-model="form.acquisitionTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择购置时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总价" prop="cost">
-          <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
-          <span>万元</span>
-        </el-form-item>
-        <el-form-item label="预计使用年限" prop="expectLife">
-          <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
-          <span>年</span>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="出厂编号" prop="code">
+              <el-input v-model="form.code" placeholder="请输入出厂编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="购置时间" prop="acquisitionTime">
+              <el-date-picker clearable v-model="form.acquisitionTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择购置时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规格型号" prop="series">
+              <el-input v-model="form.series" placeholder="请输入规格型号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="预计使用年限" prop="expectLife">
+              <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
+              <span>年</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="购买价格" prop="cost">
+              <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" />
+              <span>万元</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备品牌" prop="brand">
+              <el-input v-model="form.brand" placeholder="请输入设备品牌" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单日成本" prop="dayCost">
+              <el-input v-model="form.dayCost" placeholder="请输入单日成本" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="存放地点" prop="place">
+              <el-input v-model="form.place" placeholder="请输入存放地点" />
+            </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">
+          <el-col :span="12">
+            <el-form-item label="校验周期" prop="checkTerm">
+              <el-input v-model="form.checkTerm" placeholder="请输入校验周期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="校验日期" prop="checkTime">
+              <el-date-picker clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择校验日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="保修期" prop="warranty">
+              <el-input v-model="form.warranty" placeholder="请输入保修期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -196,6 +282,16 @@ export default {
       this.open = true;
       this.title = "添加设备信息";
     },
+    // 新增明细按钮
+    handleAddDetail(row) {
+      console.log(row);
+      this.$router.push({
+        path: '/device/expense',
+        query: {
+          deviceId: row.deviceId,
+        }
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();