1.新增报表

2.车辆管理新增分公司、车队、线路字段

maintain-business/src/main/java/com/maintain/business/domain/ErpCar.java

@@ -62,4 +62,19 @@ public class ErpCar extends BaseEntity {
      */
     private Long carTypeId;
 
+    /**
+     * 分公司
+     */
+    private String branchOffice;
+
+    /**
+     * 车队
+     */
+    private String motorcade;
+
+    /**
+     * 线路
+     */
+    private String line;
+
 }

maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java

@@ -82,5 +82,19 @@ public class ErpCarBo extends BaseEntity {
      */
     private Date  createTime;
 
+    /**
+     * 分公司
+     */
+    private String branchOffice;
+
+    /**
+     * 车队
+     */
+    private String motorcade;
+
+    /**
+     * 线路
+     */
+    private String line;
 
 }

maintain-business/src/main/java/com/maintain/business/domain/vo/ErpCarVo.java

@@ -110,4 +110,22 @@ public class ErpCarVo implements Serializable {
     @ColumnWidth(20)
     private Date createTime;
 
+    /**
+     * 分公司
+     */
+    @ExcelProperty(value = "分公司")
+    private String branchOffice;
+
+    /**
+     * 车队
+     */
+    @ExcelProperty(value = "车队")
+    private String motorcade;
+
+    /**
+     * 线路
+     */
+    @ExcelProperty(value = "线路")
+    private String line;
+
 }

maintain-ui/src/views/business/car/index.vue

@@ -213,6 +213,24 @@
         <el-form-item label="车型ID" prop="carTypeId">
           <el-input v-model="form.carTypeId" placeholder="请输入车型ID" />
         </el-form-item> -->
+        <div class="app-title">车队信息</div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="分公司" prop="branchOffice">
+              <el-input v-model="form.branchOffice" placeholder="请输入分公司" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车队" prop="motorcade">
+              <el-input v-model="form.motorcade" placeholder="请输入车队" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="线路" prop="line">
+              <el-input v-model="form.line" placeholder="请输入线路" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <div class="app-title">关联车型信息</div>
         <el-row :gutter="20">
           <el-col :span="8">

maintain-ui/src/views/business/report/accidentVehicleMaintenanceStatistics.vue

+<template>
+  <i-frame :src="url"/>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { getBiUrl } from '@/api/tool/jimu'
+import iFrame from '@/components/iFrame/index.vue'
+import {getCurrentDeptTree} from "@/api/business/unit";
+
+export default {
+  name: "orderInfo",
+  components: {
+    iFrame
+  },
+  data() {
+    return {
+      url: ''
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      getCurrentDeptTree().then(response => {
+        let deptIds = response.data.map((item) => {
+          return item.deptId
+        })
+        console.log('deptIds',deptIds.join(','))
+        this.url = `http://${window.location.hostname}:8099/jmreport/view/1174907222744879104?token=Bearer `+ getToken()
+        console.log('url', this.url)
+      });
+    },
+  }
+}
+</script>

maintain-ui/src/views/business/report/maintenanceRevenueStatistics.vue

+<template>
+  <i-frame :src="url"/>
+</template>
+
+<script>
+import {getToken} from '@/utils/auth'
+import iFrame from '@/components/iFrame/index.vue'
+import {getCurrentDeptTree} from "@/api/business/unit";
+
+export default {
+  name: "orderInfo",
+  components: {
+    iFrame
+  },
+  data() {
+    return {
+      url: ''
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      getCurrentDeptTree().then(response => {
+        let deptIds = response.data.map((item) => {
+          return item.deptId
+        })
+        console.log('deptIds',deptIds.join(','))
+        this.url = `http://${window.location.hostname}:8099/jmreport/view/1174586035611238400?deptId=${this.$store.state.user.userInfo.deptId}&deptIds=${deptIds.join(',')}&token=Bearer `+ getToken()
+        console.log('url', this.url)
+      });
+    },
+  }
+}
+</script>