修改主页

oa-ui/src/assets/styles/sidebar.scss

@@ -24,8 +24,8 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    -webkit-box-shadow: 2px 0 20px rgba(0,21,41,.15);
+    box-shadow: 2px 0 20px rgba(0,21,41,.15);
 
     // reset element-ui css
     .horizontal-collapse-transition {

oa-ui/src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -23,7 +23,7 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-      </template>
+      </template> -->
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-02-29 17:24:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-05 10:55:59
+ * @LastEditTime: 2024-03-06 17:24:51
 -->
 
 <template>
@@ -74,13 +74,13 @@
         <el-divider></el-divider>
         <!-- 综合事务部管理人员填写 -->
 
-        <el-form-item label="车牌号：">
+        <el-form-item label="车牌号："  v-if="taskName != '用车申请'">
           <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="驾驶员：">
+        <el-form-item label="驾驶员："  v-if="taskName != '用车申请'">
           <!-- <el-select v-model="form.driver" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
@@ -90,6 +90,9 @@
           </el-checkbox-group>
         </el-form-item>
       </el-form>
+      <el-row style="text-align: center;" v-if="taskName == '用车申请'">
+        <el-button type="primary" @click="submit">提交申请</el-button>
+      </el-row>
     </div>
   </div>
 </template>
@@ -99,6 +102,12 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar } from "@/api/oa/car/car";
 import { listDriver } from "@/api/system/post";
 export default {
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    }
+  },
   created() {
     this.form.user = this.$store.getters.name;
     this.form.deptName = this.$store.getters.deptName;
@@ -111,7 +120,7 @@ export default {
       form: {
         date: new Date(),
         day: '',
-        driver:[]
+        driver: []
       },
       projectList: [],
       carList: [],
@@ -121,6 +130,9 @@ export default {
     }
   },
   methods: {
+    submit(){
+      this.$emit('submit',form)
+    },
     // 查询项目列表
     getProjectList() {
       this.loading = true

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

@@ -22,8 +22,8 @@
             v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
             v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
-          <car-form v-else-if="taskForm.procDefName == '用车审批'"></car-form>
-          <el-row type="flex" justify="center" v-show="isShowApprove">
+          <car-form :taskName="taskName" v-else-if="taskForm.procDefName == '用车审批'" @submit="handleComplete"></car-form>
+          <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
             </el-button>
@@ -534,7 +534,6 @@ export default {
     },
     // 是否显示审批通过
     isShowApprove(){
-      debugger
       if(this.taskName == '员工填报' || this.taskName == '用车申请'){
         return false
       }else{

oa-ui/src/views/index.vue

@@ -2,156 +2,48 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-27 14:12:01
+ * @LastEditTime: 2024-03-06 16:14:12
 -->
+
 <template>
   <div class="app-container home">
-    <div class="left">
-      <!-- 用户信息 -->
-      <div class="user-info">
-        <el-row align="bottom" :gutter="40">
-          <el-col :span="4">
-            <h3 style="font-weight: bold;text-align: right;font-size: 18px;"> {{ user.nickName }}，您好！ </h3>
-            <!-- <h2 style="text-align: right;font-size: 24px;font-weight: bold;"> {{ 10 }}℃ </h2> -->
-            <el-row style="font-size:12px;text-align: right;"> {{ "2024-01-22" }} {{ "星期一" }} </el-row>
-          </el-col>
-          <el-col :span="4" style="text-align: center;">
+    <el-row style="height:350px;" :gutter="20">
+      <el-col :span="8">
+        <div class="header">个人信息</div>
+        <div class="user-wrapper">
+          <div class="avatar">
             <img :src="avatar" class="user-avatar" />
-          </el-col>
-          <el-col :span="16">
-            <el-row style="font-size: 20px;font-weight: bold;margin-bottom: 20px;">
-              {{ user.nickName }} <el-tag type="warning">{{ titles }}</el-tag>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <el-row class="userinfo-item">
-                  入职时间
-                </el-row>
-                <el-row class="userinfo-data">
-                  {{ user.entryDate != null ? user.entryDate.substring(0, 7) : user.entryDate }}
-                </el-row>
-              </el-col>
-              <el-col :span="4">
-                <el-row class="userinfo-item">
-                  工龄
-                </el-row>
-                <el-row class="userinfo-data">
-                  {{ getObtainSeniority(user.entryDate) }}
-                </el-row>
-              </el-col>
-              <el-col :span="4">
-                <el-row class="userinfo-item">
-                  所在部门
-                </el-row>
-                <el-row class="userinfo-data">
-                  {{ user.dept ? user.dept.deptName : '' }}
-                </el-row>
-              </el-col>
-              <el-col :span="4">
-                <el-row class="userinfo-item">
-                  岗级
-                </el-row>
-                <el-row class="userinfo-data">
-                  {{ engineerLevel }}
-                </el-row>
-              </el-col>
-              <el-col :span="4">
-                <el-row class="userinfo-item">
-                  技术职称
-                </el-row>
-                <el-row class="userinfo-data">
-                  {{ titles }}
-                </el-row>
-              </el-col>
-            </el-row>
-          </el-col>
-        </el-row>
-      </div>
-      <!-- 快捷菜单 -->
-      <el-row class="meau" type="flex">
-        <el-col :span="12" class="meau-left">
-          <div class="titles">
-            <span class="title-line"></span>
-            <span class="title-text">快捷菜单</span>
-            <span class="title-more">更多</span>
           </div>
-          <el-row style="text-align: center;">
-            <el-col :span="4" class="item" style="background-color: #42b983;padding:3px" @click.native="gotoTask">
-              <el-row class="item-icon"><i class="el-icon-tickets"></i></el-row>
-              <el-row>新建申请</el-row>
-            </el-col>
-            <!-- <el-col :span="4" class="item" style="background-color: #40A9FF;padding:3px">
-              <el-row class="item-icon"><i class="el-icon-s-order"></i></el-row>
-              <el-row>已办任务</el-row>
-            </el-col> -->
-          </el-row>
-        </el-col>
-        <el-col :span="12" class="meau-right">
-          <div class="titles">
-            <span class="title-line"></span>
-            <span class="title-text">我的待办</span>
+          <div class="username">
+            {{  user.nickName }}
           </div>
-          <el-row>
-            <el-col :span="6" class="db-item" @click.native="$router.push({ path: '/task/todo' })">
-              <el-row class="db-text">考核待审</el-row>
-              <el-row class="db-number">{{ detail }}</el-row>
-            </el-col>
-            <el-col :span="6" class="db-item" @click.native="$router.push({ path: '/task/finished' })">
-              <el-row class="db-text">已办任务</el-row>
-              <el-row class="db-number">{{ finish }}</el-row>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-      <!-- 公告列表和日历 -->
-      <el-row class="notice">
-        <el-col :span="16">
-          <div class="titles">
-            <span class="title-line"></span>
-            <span class="title-text">公告列表</span>
+        </div>
+      </el-col>
+      <el-col :span="15" :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" />
+              </div>
+            </div>
+            <div class="nav-text">{{ nav.name }}</div>
           </div>
-          <el-table :data="noticeData" style="width: 100%">
-            <el-table-column prop="type" label="公告分类">
-            </el-table-column>
-            <el-table-column prop="name" label="公告标题">
-            </el-table-column>
-            <el-table-column prop="time" label="发布时间">
-            </el-table-column>
-          </el-table>
-        </el-col>
-        <el-col :span="8">
-          <el-calendar v-model="times" style="margin-top: 80px;">
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="8">
+        <div class="header">日历</div>
+        <div class="calendar">
+          <el-calendar v-model="times">
           </el-calendar>
-        </el-col>
-      </el-row>
-    </div>
-    <div class="right">
-      <div class="titles">
-        <span class="title-line"></span>
-        <span class="title-text">项目列表</span>
-      </div>
-      <el-table :data="projectData" style="width: 100%">
-        <el-table-column prop="isFinshed" label="状态" width="90px">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
-              {{ scope.row.isFinished == '0' ? '进行中' : '已结束' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="projectNumber" label="项目编号" width="90px">
-        </el-table-column>
-        <el-table-column prop="projectLeader" label="项目负责人" width="90px">
-        </el-table-column>
-        <el-table-column prop="projectName" label="项目名称">
-        </el-table-column>
-      </el-table>
-      <div style="text-align: right;margin-top: 20px;">
-        <el-pagination @current-change="getProject" :current-page.sync="projectQueryParams.pageNum"
-          :page-size="projectQueryParams.pageSize" layout="total, prev, pager, next,jumper" :total="projectTotal">
-        </el-pagination>
-      </div>
-
-    </div>
+        </div>
+      </el-col>
+      <el-col></el-col>
+      <el-col></el-col>
+    </el-row>
   </div>
 </template>
 
@@ -161,17 +53,19 @@ import { getUserProfile } from "@/api/system/user";
 import { listProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
 import { finishedList } from "@/api/flowable/finished";
-import { getDicts as getDicts, getData } from '@/api/system/dict/data'
 export default {
-  name: "index",
   computed: {
     ...mapGetters(["avatar"]),
   },
-  dicts: ['sys_user_engineerlevel', 'sys_user_titles'],
+  created() {
+    this.getUser();
+    this.getDetail();
+    this.getProject();
+  },
   data() {
     return {
+      times: new Date(),
       user: {},
-      weather: {},
       noticeData: [],
       projectData: [],
       projectQueryParams: {
@@ -179,45 +73,86 @@ export default {
         pageSize: 16
       },
       projectTotal: 0,
-      times: new Date(),
       detail: 0,
       finish: 0,
       engineerLevel: '',
       titles: '',
-    };
-  },
-  created() {
-    this.getUser();
-    this.getDetail();
-    this.getProject();
+      navItem: [
+        {
+          id: 1,
+          name: '发起流程',
+          icon: 'cascader',
+          bgColor: '#785aee',
+          boxShadow: '0 5px 20px rgba(120,90,238,0.5)'
+        }, {
+          id: 2,
+          name: '待办任务',
+          icon: 'log',
+          bgColor: '#e66794',
+          boxShadow: '0 5px 20px rgba(230,103,148,0.5)'
+        }, {
+          id: 3,
+          name: '已办任务',
+          icon: 'excel',
+          bgColor: '#6389f4',
+          boxShadow: '0 5px 20px rgba(99,137,244,0.5)'
+        }, {
+          id: 4,
+          name: '项目管理',
+          icon: 'dict',
+          bgColor: '#e64c56',
+          boxShadow: '0 5px 20px rgba(230,76,86,0.5)'
+        }, {
+          id: 5,
+          name: '车辆管理',
+          icon: 'car',
+          bgColor: '#eeb62f',
+          boxShadow: '0 5px 20px rgba(238,182,47,0.5)'
+        }, {
+          id: 6,
+          name: '设备管理',
+          icon: 'lock',
+          bgColor: '#0be1bd',
+          boxShadow: '0 5px 20px rgba(11,225,189,0.5)'
+        }
+      ]
+    }
   },
   methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
+    goToPath(id) {
+      if (id == 1) {
+        this.$router.push({ path: "/task/process" });
+      } else if (id == 2) {
+        this.$router.push({ path: "/task/todo" });
+      } else if (id == 3) {
+        this.$router.push({ path: "/task/finished" });
+      } else if (id == 4) {
+        this.$router.push({ path: "/project" });
+      } else if (id == 5) {
+        this.$router.push({ path: "/car" });
+      } else if (id == 6) {
+        this.$router.push({ path: "/device" });
+      }
     },
     getUser() {
       getUserProfile().then(response => {
         this.user = response.data;
-        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
-          }
-        }
+        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
+        //   }
+        // }
       });
     },
-    gotoTask() {
-      this.$router.push({ path: "/task/process" });
-    },
-    goTodo() {
-      this.$router.push({ path: "/task/todo" });
-    },
+    // 获取项目列表
     getProject() {
       listProject(this.projectQueryParams).then(response => {
         this.projectData = response.rows;
@@ -252,161 +187,95 @@ export default {
         this.finish = response.data.total;
       })
     },
-    // 获取工龄
-    getObtainSeniority(entryDate) {
-      if (entryDate != "" && entryDate != undefined && entryDate != null) {
-        let curYear = new Date();
-        let e = entryDate.substring(0, 4);
-        return (curYear.getFullYear() - parseInt(e)) + '年'
-      }
-
-
-    }
-  },
-};
+  }
+}
 </script>
 
 <style scoped lang="scss">
 .home {
-  display: flex;
-  background-color: #f5f5f5;
+  padding: 20px 40px;
+  background-color: #f0f4f7;
+  width: 100%;
+  // height: calc(100vh - 100px);
 }
 
-.left {
-  flex: 2;
-  margin-right: 20px;
-
-  .user-info {
-    width: 100%;
-    height: 160px;
-    padding: 10px;
-    margin-bottom: 20px;
-    background-color: #fff;
-
-    .user-avatar {
-      width: 120px;
-      height: 120px;
-      border-radius: 50%;
-    }
-
-    .userinfo-item {
-      font-size: 18px;
-      font-family: 'Times New Roman', '黑体', Times, serif, ;
-      font-weight: bold;
-      color: #6D6D6D;
-      margin: 5px;
-    }
+.header {
+  font-size: 20px;
+  line-height: 60px;
+}
 
-    .userinfo-data {
-      font-size: 14px;
-      font-family: '微软雅黑';
-      font-weight: bold;
-      margin: 5px;
-    }
-  }
+.nav-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
 
-  .meau {
-    height: 150px;
-    margin-bottom: 20px;
+  .nav-item {
+    background-color: #ffffff;
+    max-width: 240px;
+    flex-grow: 1;
+    height: 120px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    padding: 0 30px;
+    margin-bottom: 10px;
 
-    .meau-left {
-      background-color: #fff;
-      padding: 0px 20px 10px;
+    .nav-logo {
+      width: 55px;
+      height: 55px;
+      border-radius: 10px;
       margin-right: 20px;
-    }
-
-    .meau-right {
-      background-color: #fff;
-      padding: 0px 20px 10px;
-      margin-left: 20px;
-
-      .db-item {
-        text-align: center;
-        background-color: #F5F5F5;
-        padding: 10px 20px;
-        margin: 0 5px;
-        cursor: pointer;
-
-        .db-text {}
+      text-align: center;
+      line-height: 55px;
 
-        .db-number {
-          font-weight: bold;
-          color: #e67153;
-          line-height: 30px;
-          font-size: 19px;
-        }
+      .icon {
+        font-size: 27px;
+        color: #ffffff;
       }
     }
 
-    .item {
-      color: #fff;
-      margin: 0 10px;
-      cursor: pointer;
-    }
-
-    .item-icon {
-      width: 100%;
-      height: 100%;
-      text-align: center;
+    .nav-text {
+      font-size: 18px;
 
-      i {
-        display: inline-block;
-        font-size: 40px;
-        color: #fff;
-      }
     }
   }
 
-  .notice {
-    padding: 0px 20px 10px;
-    background-color: #fff;
+  .nav-item:hover {
+    cursor: pointer;
+    box-shadow: 0 0 15px rgba($color: #242d42, $alpha: 0.1);
   }
 }
 
-.right {
-  padding: 0px 20px 10px;
-  background-color: #fff;
-  flex: 1;
-}
-
-.border {
-  border: 1px solid #CDCDCD;
-}
+.user-wrapper {
+  background-color: #ffffff;
+  height: 267px;
+  border-radius: 10px;
 
-.titles {
-  line-height: 55px;
-  vertical-align: middle;
-  font-weight: bold;
-  position: relative;
-  margin-bottom: 10px;
+  .avatar {
+    text-align: center;
+    padding: 10px 0;
 
-  .title-line {
-    position: absolute;
-    top: 50%;
-    left: 0;
-    transform: translate(0%, -50%);
-    width: 5px;
-    height: 30px;
-    background-color: #42b983;
+    .user-avatar {
+      width: 100px;
+      height: 100px;
+      border-radius: 50%;
+    }
   }
 
-  .title-text {
-    display: inline-block;
-    padding-left: 15px;
+  .username {
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    font-family: '微软雅黑';
   }
+}
 
-  .title-more {
-    position: absolute;
-    top: 50%;
-    right: 0;
-    transform: translate(0%, -50%);
-    color: #40A9FF;
-    font-size: 14px;
-    cursor: pointer;
-  }
 
-  .title-more:hover {
-    color: #e4b82a;
-  }
+.calendar {
+  height: 300px;
+}
+
+::v-deep .el-calendar-table .el-calendar-day {
+  height: 32px;
 }
 </style>

oa-ui/src/views/login.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-21 17:20:33
+ * @LastEditTime: 2024-03-05 17:52:02
 -->
 <template>
   <el-row class="login-wrapper">
@@ -42,7 +42,7 @@
       </el-form-item> -->
         <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
         <el-form-item style="width:100%;">
-          <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+          <el-button :loading="loading" size="medium" type="primary" style="width:100%;border-radius: 30px;box-shadow: 0 5px 10px  rgba(0,0,0,0.3);"
             @click.native.prevent="handleLogin">
             <span v-if="!loading">登 录</span>
             <span v-else>登 录 中...</span>

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

@@ -5,9 +5,9 @@
         <el-input v-model="queryParams.licensePlate" placeholder="请输入车牌号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item label="驾驶员" prop="driver">
+      <!-- <el-form-item label="驾驶员" prop="driver">
         <el-input v-model="queryParams.driver" placeholder="请输入驾驶员" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -35,20 +35,25 @@
     </el-row>
     <el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="车辆id" align="center" prop="carId" />
+      <!-- <el-table-column label="车辆id" align="center" prop="carId" /> -->
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
-      <el-table-column label="驾驶员" align="center" prop="driver" />
+      <!-- <el-table-column label="驾驶员" align="center" prop="driver" /> -->
       <el-table-column label="车系" align="center" prop="series" />
       <el-table-column label="车级" align="center" prop="level" />
-      <el-table-column label="购卖时间" align="center" prop="time" />
-      <el-table-column label="购买金额" align="center" prop="cost" />
+      <el-table-column label="购卖时间" align="center" prop="acquisitionTime" />
+      <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="driver" /> -->
       <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:car:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;" @click="handleDelete(scope.row)"
             v-hasPermi="['oa:car:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -69,20 +74,21 @@
         <el-form-item label="车级" prop="level">
           <el-input v-model="form.level" placeholder="请输入车级" />
         </el-form-item>
-        <el-form-item label="购卖时间" prop="time">
-          <el-date-picker v-model="form.time" type="date" placeholder="选择日期" format="yyyy-MM-dd"
+        <el-form-item label="购卖时间" prop="acquisitionTime">
+          <el-date-picker v-model="form.acquisitionTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
             value-format="yyyy-MM-dd">
           </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="请输入金额" /><el-tag
-            type="warning">万元</el-tag>
+        <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="请输入" />
+          <el-input v-model="form.expectLife" placeholder="请输入年限"  style="width:130px;margin-right:10px;" />
+          <span>年</span>
         </el-form-item>
         <el-form-item label="驾驶员" prop="driver">
-          <el-select v-model="form.driver" filterable  placeholder="请选择" clearable>
+          <el-select v-model="form.driver" filterable placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
           </el-select>
@@ -229,7 +235,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const carIds = row.carId || this.ids;
-      this.$modal.confirm('是否确认删除cmc车辆信息编号为"' + carIds + '"的数据项？').then(function () {
+      const licensePlate = row.licensePlate
+      this.$modal.confirm('是否确认删除车牌号为【"' + licensePlate + '"】的车辆数据？').then(function () {
         return delCar(carIds);
       }).then(() => {
         this.getList();

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

@@ -2,44 +2,11 @@
   <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>
-      <el-form-item label="购置时间" prop="acquisitionTime">
-        <el-date-picker clearable
-          v-model="queryParams.acquisitionTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择购置时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总价" prop="cost">
-        <el-input
-          v-model="queryParams.cost"
-          placeholder="请输入总价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预计使用年限" prop="expectLife">
-        <el-input
-          v-model="queryParams.expectLife"
-          placeholder="请输入预计使用年限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <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-input v-model="queryParams.series" 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>
@@ -49,113 +16,80 @@
 
     <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="['oa:device:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:device: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="['oa:device:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:device: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="['oa:device:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:device: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="['oa:device:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:device:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <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="设备id" align="center" prop="deviceId" /> -->
       <el-table-column label="设备编号" align="center" prop="code" />
       <el-table-column label="设备类别" align="center" prop="type" />
+      <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="series" />
       <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:device:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:device:remove']"
-          >删除</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>
         </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" />
 
     <!-- 添加或修改cmc设备信息对话框 -->
     <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 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"
+          <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 v-model="form.cost" placeholder="请输入总价" />
+          <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="请输入预计使用年限" />
-        </el-form-item>
-        <el-form-item label="设备系列" prop="series">
-          <el-input v-model="form.series" placeholder="请输入设备系列" />
+          <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
+          <span>年</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -253,14 +187,14 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deviceId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc设备信息";
+      this.title = "添加设备信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -269,7 +203,7 @@ export default {
       getDevice(deviceId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc设备信息";
+        this.title = "修改设备信息";
       });
     },
     /** 提交按钮 */
@@ -295,12 +229,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const deviceIds = row.deviceId || this.ids;
-      this.$modal.confirm('是否确认删除cmc设备信息编号为"' + deviceIds + '"的数据项？').then(function() {
+      const code = row.code
+      this.$modal.confirm('是否确认删除设备编号为【"' + code + '"】的设备数据？').then(function () {
         return delDevice(deviceIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {