From dda6070f6c238223b1395f765b61fc377c8a0622 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期五, 26 十一月 2021 08:29:05 +0800
Subject: [PATCH] 报表

---
 src/views/your/carRepairCost-manage/exportColumn.js          |   84 ++
 src/views/your/car-manage/carManage.vue                      |    4 
 src/views/your/carRepairCost-manage/carRepairCostManage.vue  |  933 +++++++++++++++++++++++++++
 src/views/your/carCost-manage/carCostManage.vue              |  904 ++++++++++++++++++++++++++
 src/views/your/carCost-manage/exportColumn.js                |   63 +
 src/views/your/carRepairCost-manage/carRepairCostManage.less |   13 
 src/views/your/suggest-manage/suggestManage.vue              |    2 
 src/api/open.js                                              |    5 
 src/views/your/carCost-manage/carCostManage.less             |   13 
 9 files changed, 2,018 insertions(+), 3 deletions(-)

diff --git a/src/api/open.js b/src/api/open.js
index 0526a65..11c8f3f 100644
--- a/src/api/open.js
+++ b/src/api/open.js
@@ -201,3 +201,8 @@
 export const getByDate = (params) => {
     return getRequest('/addOil/getByDate', params)
 }
+
+// 鏍规嵁杞﹁締鐕冩补璐圭敤缁翠慨璐圭敤
+export const getInfo = (params) => {
+    return getRequest('/car/getInfo', params)
+}
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index 6c89acb..ff427d3 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -82,12 +82,12 @@
         </FormItem>
         <FormItem label="椹鹃┒浜�" prop="userId">
           <Select v-model="carForm.userId" filterable>
-            <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
+            <Option v-for="item in userList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
           </Select>
         </FormItem>
         <FormItem label="璺熻溅浜�" prop="followUserId">
           <Select v-model="carForm.followUserId" filterable>
-            <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
+            <Option v-for="item in userList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
           </Select>
         </FormItem>
       </Form>
diff --git a/src/views/your/carCost-manage/carCostManage.less b/src/views/your/carCost-manage/carCostManage.less
new file mode 100644
index 0000000..789f8db
--- /dev/null
+++ b/src/views/your/carCost-manage/carCostManage.less
@@ -0,0 +1,13 @@
+.permModal {
+    .ivu-modal-body {
+        max-height: 560px;
+        overflow: auto;
+    }
+}
+
+.depModal {
+    .ivu-modal-body {
+        max-height: 500px;
+        overflow: auto;
+    }
+}
\ No newline at end of file
diff --git a/src/views/your/carCost-manage/carCostManage.vue b/src/views/your/carCost-manage/carCostManage.vue
new file mode 100644
index 0000000..c483b3f
--- /dev/null
+++ b/src/views/your/carCost-manage/carCostManage.vue
@@ -0,0 +1,904 @@
+<style lang="less">
+  @import "@/styles/table-common.less";
+  @import "@/styles/drawer-common.less";
+  @import "src/views/your/carCost-manage/carCostManage.less";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="init" icon="md-refresh">鍒锋柊</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
+          }}</Button>
+        <Date-picker v-model="value" @on-change="getDataList"
+                     value-format="yyyy-MM-dd" type="daterange" placement="bottom-end" placeholder="璇烽�夋嫨鏃ユ湡" style="width: 240px;padding-left: 20px">
+        </Date-picker>
+        <Dropdown @on-click="handleDropdown" style="padding-left: 20px">
+          <Button>
+            瀵煎嚭鏁版嵁
+            <Icon type="md-arrow-dropdown" />
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem name="exportAll">瀵煎嚭鎵�閫夋棩鏈熸暟鎹�</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </Row>
+      <Alert show-icon v-show="openTip">
+        宸查�夋嫨
+        <span class="select-count">{{ selectList.length }}</span> 椤�
+        <a class="select-clear" @click="clearSelectAll">娓呯┖</a>
+      </Alert>
+      <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+                :current="searchForm.pageNumber"
+                :total="total"
+                :page-size="searchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+                v-show="this.page"
+        ></Page>
+      </Row>
+    </Card>
+
+    <!-- 缂栬緫 -->
+    <Modal
+            :title="modalTitle"
+            v-model="roleModalVisible"
+            :mask-closable="false"
+            :width="500"
+    >
+    </Modal>
+    <!-- 鑿滃崟鏉冮檺 -->
+    <Drawer
+            :title="modalTitle"
+            v-model="permModalVisible"
+            :mask-closable="false"
+            :width="500"
+            draggable
+    >
+      <div :style="{ maxHeight: maxHeight }" class="drawer-content">
+        <div style="position: relative">
+          <Tree
+                  ref="tree"
+                  :data="permData"
+                  show-checkbox
+                  :render="renderContent"
+                  :check-strictly="true"
+          ></Tree>
+          <Spin size="large" fix v-if="treeLoading"></Spin>
+        </div>
+      </div>
+      <div class="drawer-footer br">
+        <Button
+                type="primary"
+                :loading="submitPermLoading"
+                @click="submitPermEdit"
+        >鎻愪氦</Button
+        >
+        <Button @click="selectTreeAll">鍏ㄩ��/鍙嶉��</Button>
+        <Select
+                v-model="openLevel"
+                @on-change="changeOpen"
+                style="width: 110px"
+                transfer
+        >
+          <Option value="0">灞曞紑鎵�鏈�</Option>
+          <Option value="1">鏀跺悎鎵�鏈�</Option>
+          <Option value="2">浠呭睍寮�涓�绾�</Option>
+          <Option value="3">浠呭睍寮�涓ょ骇</Option>
+        </Select>
+        <Button type="text" @click="cancelPermEdit">鍙栨秷</Button>
+      </div>
+    </Drawer>
+    <!-- 鏁版嵁鏉冮檺 -->
+    <Modal
+            :title="modalTitle"
+            v-model="carModalVisible"
+            :mask-closable="false"
+            :width="500"
+            class="depModal"
+    >
+      <Form :label-width="85" ref="removeForm" :model="removeForm">
+        <FormItem label="绉婚櫎鍘熷洜" prop="removeReason">
+          <Input v-model="removeForm.removeReason"/>
+        </FormItem>
+      </Form>
+      <div v-show="dataType == 1" style="margin-top: 15px">
+        <div style="position: relative">
+          <Tree
+                  ref="depTree"
+                  :data="depData"
+                  :load-data="loadData"
+                  @on-toggle-expand="expandCheckDep"
+                  multiple
+                  style="margin-top: 15px"
+          ></Tree>
+          <Spin size="large" fix v-if="depTreeLoading"></Spin>
+        </div>
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="depModalVisible = false">鍙栨秷</Button>
+        <Button
+                type="primary"
+                :loading="submitDepLoading"
+                @click="submitRemove"
+        >鎻愪氦</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+            v-model="exportModalVisible"
+            :title="exportTitle"
+            :loading="loadingExport"
+            @on-ok="exportCustomData"
+    >
+      <Form ref="exportForm" :label-width="100">
+        <FormItem label="瀵煎嚭鏂囦欢鍚�">
+          <Input v-model="filename" />
+        </FormItem>
+      </Form>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getAllPermissionList,
+    setDefaultRole,
+    editRolePerm,
+    initDepartment,
+    loadDepartment,
+    editRoleDep,
+  } from "@/api/index";
+
+  import {
+    getAll,
+    getAddOilList,
+    addOil,
+    deleteAddOil,
+    getCarList,
+    editCar,
+    deleteCar,
+    getByDate,
+    getOilExcel
+  } from "@/api/open";
+  import util from "@/libs/util.js";
+  import excel from "@/libs/excel.js";
+  import XLSX from 'xlsx';
+  import {exportColumn} from "./exportColumn";
+  export default {
+    name: "car-manage",
+    data() {
+      return {
+        maxHeight: 510,
+        openTip: true,
+        openLevel: "0",
+        loading: true,
+        treeLoading: true,
+        depTreeLoading: true,
+        submitPermLoading: false,
+        submitDepLoading: false,
+        searchKey: "",
+        sortColumn: "createTime",
+        sortType: "desc",
+        modalType: 0,
+        roleModalVisible: false,
+        page: true,
+        carModalVisible: false,
+        exportModalVisible: false,
+        loadingExport: true,
+        permModalVisible: false,
+        depModalVisible: false,
+        modalTitle: "",
+        searchForm: {
+          // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+          pageNumber: 1, // 褰撳墠椤垫暟
+          pageSize: 10, // 椤甸潰澶у皬
+          sort: "createTime", // 榛樿鎺掑簭瀛楁
+          order: "desc", // 榛樿鎺掑簭鏂瑰紡
+          key: "",
+        },
+        addOilForm: {
+          status : 0
+        },
+        removeForm: {
+          status : 1
+        },
+        addOilFormValidate: {
+          name: [
+            { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "change" },
+          ],
+        },
+        submitLoading: false,
+        selectList: [],
+        columns: [
+          {
+            type: "selection",
+            width: 60,
+            align: "center",
+          },
+          {
+            type: "index",
+            width: 60,
+            align: "center",
+          },
+          {
+            title: "杞︾墝鍙�",
+            key: "carNo",
+            width: 100,
+          },
+          {
+            title: "鍔犳补鍗″彿",
+            key: "addOilCode",
+            width: 120,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "鍔犳补鏃ユ湡",
+            key: "addDate",
+            width: 120,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "鍔犳补閲�(鍗�)",
+            key: "amount",
+            width: 130,
+            sortable: true,
+            align: "center",
+            render: (h, params) => {
+              return h("div",params.row.amount==0 ? '':params.row.amount);
+            }
+          },
+          {
+            title: "鍚◣閲戦(鍏�)",
+            key: "money",
+            width: 140,
+            sortable: true,
+            align: "center",
+            render: (h, params) => {
+              return h("div",params.row.money==0 ? '':params.row.money);
+            }
+          },
+          {
+            title: "杩囪矾杩囨ˉ璐�(鍏�)",
+            key: "",
+            width: 150,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "骞村璐�(鍏�)",
+            key: "",
+            width: 130,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "娲楄溅鍋滆溅璐�(鍏�)",
+            key: "",
+            width: 150,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "淇濋櫓璐瑰惈(杞﹁埞绋�)",
+            key: "",
+            width: 170,
+            sortable: true,
+            align: "center",
+          },
+        ],
+        data: [],
+        chooseColumns: [],
+        total: 0,
+        permData: [],
+        exportColumns: exportColumn,
+        filename: "鍔犳补鏁版嵁",
+        exportTitle: "纭瀵煎嚭",
+        editRolePermId: "",
+        selectAllFlag: false,
+        depData: [],
+        dataType: 0,
+        editDepartments: [],
+        buyYear:'',
+        carList:[],
+        value:[]
+      };
+    },
+    methods: {
+      change1(e){
+        this.addDate = e;
+      },
+      init() {
+        this.getDataList();
+        // 鑾峰彇鎵�鏈夎彍鍗曟潈闄愭爲
+        this.getPermList();
+        this.getAllCar();
+      },
+      renderContent(h, { root, node, data }) {
+        let icon = "";
+        if (data.level == 0) {
+          icon = "ios-navigate";
+        } else if (data.level == 1) {
+          icon = "md-list-box";
+        } else if (data.level == 2) {
+          icon = "md-list";
+        } else if (data.level == 3) {
+          icon = "md-radio-button-on";
+        } else {
+          icon = "md-radio-button-off";
+        }
+        return h(
+                "span",
+                {
+                  style: {
+                    display: "inline-block",
+                    cursor: "pointer",
+                  },
+                  on: {
+                    click: () => {
+                      if (data.status == -1) {
+                        return;
+                      }
+                      data.checked = !data.checked;
+                    },
+                  },
+                },
+                [
+                  h("span", [
+                    h("Icon", {
+                      props: {
+                        type: icon,
+                        size: "16",
+                      },
+                      style: {
+                        "margin-right": "8px",
+                        "margin-bottom": "3px",
+                      },
+                    }),
+                    h("span", data.title),
+                  ]),
+                ]
+        );
+      },
+      handleDropdown(name) {
+        if (name == "refresh") {
+          this.getDataList();
+        } else if (name == "exportData") {
+          if (this.selectList.length <= 0) {
+            this.$Message.warning("鎮ㄨ繕鏈�夋嫨瑕佸鍑虹殑鏁版嵁");
+            return;
+          }
+          this.exportType = "part";
+          this.exportModalVisible = true;
+          this.exportTitle =
+                  "纭瀵煎嚭鏁版嵁";
+        } else if (name == "exportAll") {
+          this.exportType = "all";
+          this.exportModalVisible = true;
+          this.exportTitle = "纭瀵煎嚭鍏ㄩ儴鏁版嵁";
+          getOilExcel(this.searchForm).then((res) => {
+            if (res.success) {
+              this.exportData = res.result;
+            }
+          });
+        } else if (name == "importData") {
+          this.importModalVisible = true;
+        }
+      },
+      //瀵煎嚭鏁版嵁
+      exportCustomData() {
+        if (this.filename == "") {
+          this.filename = "鍔犳补鏁版嵁";
+        }
+        // 鍒ゆ柇鍕鹃�夊鍑哄垪
+        let exportColumns = [];
+        this.exportColumns.forEach((e) => {
+          exportColumns.push(e);
+        });
+        this.exportModalVisible = false;
+        let title = [];
+        let key = [];
+        exportColumns.forEach((e) => {
+          title.push(e.title);
+          key.push(e.key);
+        });
+        console.log(this.exportData)
+        const params = {
+          title: title,
+          key: key,
+          data: this.exportData,
+          autoWidth: true,
+          filename: this.filename,
+        };
+        this.exportData.forEach((i) => {
+          console.log(i);
+
+          i.amount = i.amount == 0 ? '': i.amount ;
+          i.unitPrice = i.unitPrice == 0 ? '' : i.unitPrice;
+          i.money = i.money == 0 ? '' : i.money;
+          i.mileage = i.mileage == 0 ? '' : i.mileage;
+        });
+        excel.export_array_to_excel(params);
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order == "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      selectDate(dateData) {
+        let date = new Date (dateData)
+        let y = date . getFullYear()
+        let m = date . getMonth() + 1
+        m=m<10?('0'+m):m
+        let d = date.getDate()
+        d = d< 10?('0'+ d):d
+        const time = y + '-' + m + '-' + d;
+        return time
+      },
+      getDataList() {
+        this.loading = true;
+        if (this.value[0]!="" && this.value[1]!=""){
+          this.searchForm.beginTime = this.selectDate(this.value[0]);
+          this.searchForm.endTime = this.selectDate(this.value[1]);
+          this.page=false;
+        }else{
+          this.searchForm.beginTime = "";
+          this.searchForm.endTime = "";
+        }
+        getOilExcel(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+            this.total = res.result.length;
+          }
+        });
+      },
+      getPermList() {
+        this.treeLoading = true;
+        getAllPermissionList().then((res) => {
+          if (res.success) {
+            this.deleteDisableNode(res.result);
+            this.permData = res.result;
+            this.treeLoading = false;
+          }
+          this.treeLoading = false;
+        });
+      },
+      // 閫掑綊鏍囪绂佺敤鑺傜偣
+      deleteDisableNode(permData) {
+        let that = this;
+        permData.forEach(function (e) {
+          if (e.status == -1) {
+            e.title = "[宸茬鐢╙ " + e.title;
+            e.disabled = true;
+          }
+          if (e.children && e.children.length > 0) {
+            that.deleteDisableNode(e.children);
+          }
+        });
+      },
+      carRole() {
+        this.roleModalVisible = false;
+      },
+      submitAddOil() {
+        this.addOilForm.addDate = this.addDate;
+        this.$refs.addOilForm.validate((valid) => {
+          if (valid) {
+            if (this.modalType == 0) {
+              // 娣诲姞
+              this.submitLoading = true;
+              addOil(this.addOilForm).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("鎿嶄綔鎴愬姛");
+                  this.getDataList();
+                  this.roleModalVisible = false;
+                }
+              });
+            } else {
+              this.submitLoading = true;
+              addOil(this.addOilForm).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("鎿嶄綔鎴愬姛");
+                  this.getDataList();
+                  this.roleModalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      submitRemove(){
+        this.$refs.removeForm.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            editCar(this.removeForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("鎿嶄綔鎴愬姛");
+                this.getDataList();
+                this.carModalVisible = false;
+              }
+            });
+          }
+        });
+      },
+      addOil() {
+        this.modalType = 0;
+        this.modalTitle = "娣诲姞鍔犳补璁板綍";
+        this.$refs.addOilForm.resetFields();
+        delete this.addOilForm.id;
+        this.roleModalVisible = true;
+      },
+      edit(v) {
+        this.getAllCar();
+        this.addDate = v.addDate;
+        this.modalType = 1;
+        this.modalTitle = "缂栬緫鍔犳补淇℃伅";
+        this.$refs.addOilForm.resetFields();
+        // 杞崲null涓�""
+        for (let attr in v) {
+          if (v[attr] == null) {
+            v[attr] = "";
+          }
+        }
+        let str = JSON.stringify(v);
+        let roleInfo = JSON.parse(str);
+
+        this.addOilForm = roleInfo;
+        this.roleModalVisible = true;
+      },
+      removeCar(v) {
+        this.dataType = 0;
+        this.modalTitle = "绉婚櫎杞﹁締";
+        this.$refs.addOilForm.resetFields();
+        // 杞崲null涓�""
+        for (let attr in v) {
+          if (v[attr] == null) {
+            v[attr] = "";
+          }
+        }
+        let str = JSON.stringify(v);
+        let roleInfo = JSON.parse(str);
+        roleInfo.status=1
+        console.log(roleInfo);
+        this.removeForm = roleInfo;
+        this.carModalVisible = true;
+
+      },
+      getAllCar(){
+        getAll().then((res) => {
+          if(res.success){
+            this.carList = res.result;
+            console.log(this.carList);
+          }
+        });
+      },
+      remove(v) {
+        this.$Modal.confirm({
+          title: "纭鍒犻櫎",
+          content: "鎮ㄧ‘璁よ鍒犻櫎鍚� ",
+          loading: true,
+          onOk: () => {
+            deleteAddOil({ ids: v.id }).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.clearSelectAll();
+                this.$Message.success("鍒犻櫎鎴愬姛");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      setDefault(v) {
+        this.loading = true;
+        let params = {
+          id: v.id,
+          isDefault: true,
+        };
+        setDefaultRole(params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+          }
+        });
+      },
+      cancelDefault(v) {
+        this.loading = true;
+        let params = {
+          id: v.id,
+          isDefault: false,
+        };
+        setDefaultRole(params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+          }
+        });
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+      },
+      delAll() {
+        if (this.selectList.length <= 0) {
+          this.$Message.warning("鎮ㄨ繕鏈�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "纭鍒犻櫎",
+          content: "鎮ㄧ‘璁よ鍒犻櫎鎵�閫夌殑 " + this.selectList.length + " 鏉℃暟鎹�?",
+          loading: true,
+          onOk: () => {
+            let ids = "";
+            this.selectList.forEach(function (e) {
+              ids += e.id + ",";
+            });
+            ids = ids.substring(0, ids.length - 1);
+            deleteCar({ ids: ids }).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("鍒犻櫎鎴愬姛");
+                this.clearSelectAll();
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      editPerm(v) {
+        this.editRolePermId = v.id;
+        this.modalTitle = "鍒嗛厤 " + v.name + " 鐨勮彍鍗曟潈闄�";
+        // 鍖归厤鍕鹃��
+        let rolePerms = v.permissions;
+        if (this.treeLoading) {
+          this.$Message.warning("鑿滃崟鏉冮檺鏁版嵁鍔犺浇涓紝璇风◢鍚庣偣鍑绘煡鐪�");
+          return;
+        }
+        // 閫掑綊鍒ゆ柇瀛愯妭鐐�
+        this.checkPermTree(this.permData, rolePerms);
+        this.permModalVisible = true;
+      },
+      // 閫掑綊鍒ゆ柇瀛愯妭鐐�
+      checkPermTree(permData, rolePerms) {
+        let that = this;
+        permData.forEach(function (p) {
+          if (that.hasPerm(p, rolePerms) && p.status != -1) {
+            p.checked = true;
+          } else {
+            p.checked = false;
+          }
+          if (p.children && p.children.length > 0) {
+            that.checkPermTree(p.children, rolePerms);
+          }
+        });
+      },
+      // 鍒ゆ柇瑙掕壊鎷ユ湁鐨勬潈闄愯妭鐐瑰嬀閫�
+      hasPerm(p, rolePerms) {
+        let flag = false;
+        for (let i = 0; i < rolePerms.length; i++) {
+          if (p.id == rolePerms[i].permissionId) {
+            flag = true;
+            break;
+          }
+        }
+        if (flag) {
+          return true;
+        }
+        return false;
+      },
+      // 鍏ㄩ�夊弽閫�
+      selectTreeAll() {
+        this.selectAllFlag = !this.selectAllFlag;
+        let select = this.selectAllFlag;
+        this.selectedTreeAll(this.permData, select);
+      },
+      // 閫掑綊鍏ㄩ�夎妭鐐�
+      selectedTreeAll(permData, select) {
+        let that = this;
+        permData.forEach(function (e) {
+          e.checked = select;
+          if (e.children && e.children.length > 0) {
+            that.selectedTreeAll(e.children, select);
+          }
+        });
+      },
+      submitPermEdit() {
+        this.submitPermLoading = true;
+        let permIds = "";
+        let selectedNodes = this.$refs.tree.getCheckedNodes();
+        selectedNodes.forEach(function (e) {
+          permIds += e.id + ",";
+        });
+        permIds = permIds.substring(0, permIds.length - 1);
+        editRolePerm({
+          roleId: this.editRolePermId,
+          permIds: permIds,
+        }).then((res) => {
+          this.submitPermLoading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            // 鏍囪閲嶆柊鑾峰彇鑿滃崟鏁版嵁
+            this.$store.commit("setAdded", false);
+            util.initRouter(this);
+            this.getDataList();
+            this.permModalVisible = false;
+          }
+        });
+      },
+      cancelPermEdit() {
+        this.permModalVisible = false;
+      },
+      loadData(item, callback) {
+        loadDepartment(item.id, { openDataFilter: false }).then((res) => {
+          if (res.success) {
+            res.result.forEach(function (e) {
+              e.selected = false;
+              if (e.isParent) {
+                e.loading = false;
+                e.children = [];
+              }
+              if (e.status == -1) {
+                e.title = "[宸茬鐢╙ " + e.title;
+                e.disabled = true;
+              }
+            });
+            callback(res.result);
+          }
+        });
+      },
+      expandCheckDep(v) {
+        // 鍒ゆ柇灞曞紑瀛愯妭鐐�
+        this.checkDepTree(v.children, this.editDepartments);
+      },
+      // 鍒ゆ柇瀛愯妭鐐�
+      checkDepTree(depData, roleDepIds) {
+        let that = this;
+        depData.forEach(function (p) {
+          if (that.hasDepPerm(p, roleDepIds)) {
+            p.selected = true;
+          } else {
+            p.selected = false;
+          }
+        });
+      },
+      // 鍒ゆ柇瑙掕壊鎷ユ湁鐨勬潈闄愯妭鐐瑰嬀閫�
+      hasDepPerm(p, roleDepIds) {
+        let flag = false;
+        for (let i = 0; i < roleDepIds.length; i++) {
+          if (p.id == roleDepIds[i].departmentId) {
+            flag = true;
+            break;
+          }
+        }
+        if (flag) {
+          return true;
+        }
+        return false;
+      },
+      submitDepEdit() {
+        let depIds = "";
+        if (this.dataType == 1) {
+          let selectedNodes = this.$refs.depTree.getSelectedNodes();
+          selectedNodes.forEach(function (e) {
+            depIds += e.id + ",";
+          });
+          depIds = depIds.substring(0, depIds.length - 1);
+        }
+        this.submitDepLoading = true;
+        editRoleDep({
+          roleId: this.editRolePermId,
+          dataType: this.dataType,
+          depIds: depIds,
+        }).then((res) => {
+          this.submitDepLoading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+            this.depModalVisible = false;
+          }
+        });
+      },
+      changeOpen(v) {
+        if (v == "0") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = true;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = true;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "1") {
+          this.permData.forEach((e) => {
+            e.expand = false;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = false;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "2") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = false;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "3") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = true;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        }
+      },
+    },
+    mounted() {
+      this.maxHeight = Number(document.documentElement.clientHeight - 121) + "px";
+      this.init();
+    },
+  };
+</script>
\ No newline at end of file
diff --git a/src/views/your/carCost-manage/exportColumn.js b/src/views/your/carCost-manage/exportColumn.js
new file mode 100644
index 0000000..7aa621b
--- /dev/null
+++ b/src/views/your/carCost-manage/exportColumn.js
@@ -0,0 +1,63 @@
+export const exportColumn = [
+  {
+    title: "杞︾墝鍙�",
+    key: "carNo",
+    width: 100,
+  },
+  {
+    title: "鍔犳补鍗″彿",
+    key: "addOilCode",
+    width: 120,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "鍔犳补鏃ユ湡",
+    key: "addDate",
+    width: 120,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "鍔犳补閲�(鍗�)",
+    key: "amount",
+    width: 130,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "鍚◣閲戦(鍏�)",
+    key: "money",
+    width: 140,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "杩囪矾杩囨ˉ璐�(鍏�)",
+    key: "",
+    width: 150,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "骞村璐�(鍏�)",
+    key: "",
+    width: 130,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "娲楄溅鍋滆溅璐�(鍏�)",
+    key: "",
+    width: 150,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "淇濋櫓璐瑰惈(杞﹁埞绋�)",
+    key: "",
+    width: 170,
+    sortable: true,
+    align: "center",
+  },
+]
\ No newline at end of file
diff --git a/src/views/your/carRepairCost-manage/carRepairCostManage.less b/src/views/your/carRepairCost-manage/carRepairCostManage.less
new file mode 100644
index 0000000..789f8db
--- /dev/null
+++ b/src/views/your/carRepairCost-manage/carRepairCostManage.less
@@ -0,0 +1,13 @@
+.permModal {
+    .ivu-modal-body {
+        max-height: 560px;
+        overflow: auto;
+    }
+}
+
+.depModal {
+    .ivu-modal-body {
+        max-height: 500px;
+        overflow: auto;
+    }
+}
\ No newline at end of file
diff --git a/src/views/your/carRepairCost-manage/carRepairCostManage.vue b/src/views/your/carRepairCost-manage/carRepairCostManage.vue
new file mode 100644
index 0000000..fdefd04
--- /dev/null
+++ b/src/views/your/carRepairCost-manage/carRepairCostManage.vue
@@ -0,0 +1,933 @@
+<style lang="less">
+  @import "@/styles/table-common.less";
+  @import "@/styles/drawer-common.less";
+  @import "src/views/your/carCost-manage/carCostManage.less";
+</style>
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="init" icon="md-refresh">鍒锋柊</Button>
+        <Button type="dashed" @click="openTip = !openTip">{{
+          openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
+          }}</Button>
+        <Date-picker v-model="value" @on-change="getDataList"
+                     value-format="yyyy-MM-dd" type="daterange" placement="bottom-end" placeholder="璇烽�夋嫨鏃ユ湡" style="width: 240px;padding-left: 20px">
+        </Date-picker>
+        <Dropdown @on-click="handleDropdown" style="padding-left: 20px">
+          <Button>
+            瀵煎嚭鏁版嵁
+            <Icon type="md-arrow-dropdown" />
+          </Button>
+          <DropdownMenu slot="list">
+            <DropdownItem name="exportAll">瀵煎嚭鎵�閫夋棩鏈熸暟鎹�</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </Row>
+      <Alert show-icon v-show="openTip">
+        宸查�夋嫨
+        <span class="select-count">{{ selectList.length }}</span> 椤�
+        <a class="select-clear" @click="clearSelectAll">娓呯┖</a>
+      </Alert>
+      <Table
+              :loading="loading"
+              border
+              :columns="columns"
+              :data="data"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="changeSort"
+              @on-selection-change="changeSelect"
+      ></Table>
+      <Row type="flex" justify="end" class="page">
+        <Page
+                :current="searchForm.pageNumber"
+                :total="total"
+                :page-size="searchForm.pageSize"
+                @on-change="changePage"
+                @on-page-size-change="changePageSize"
+                :page-size-opts="[10, 20, 50]"
+                size="small"
+                show-total
+                show-elevator
+                show-sizer
+                v-show="this.page"
+        ></Page>
+      </Row>
+    </Card>
+
+    <!-- 缂栬緫 -->
+    <Modal
+            :title="modalTitle"
+            v-model="roleModalVisible"
+            :mask-closable="false"
+            :width="500"
+    >
+    </Modal>
+    <!-- 鑿滃崟鏉冮檺 -->
+    <Drawer
+            :title="modalTitle"
+            v-model="permModalVisible"
+            :mask-closable="false"
+            :width="500"
+            draggable
+    >
+      <div :style="{ maxHeight: maxHeight }" class="drawer-content">
+        <div style="position: relative">
+          <Tree
+                  ref="tree"
+                  :data="permData"
+                  show-checkbox
+                  :render="renderContent"
+                  :check-strictly="true"
+          ></Tree>
+          <Spin size="large" fix v-if="treeLoading"></Spin>
+        </div>
+      </div>
+      <div class="drawer-footer br">
+        <Button
+                type="primary"
+                :loading="submitPermLoading"
+                @click="submitPermEdit"
+        >鎻愪氦</Button
+        >
+        <Button @click="selectTreeAll">鍏ㄩ��/鍙嶉��</Button>
+        <Select
+                v-model="openLevel"
+                @on-change="changeOpen"
+                style="width: 110px"
+                transfer
+        >
+          <Option value="0">灞曞紑鎵�鏈�</Option>
+          <Option value="1">鏀跺悎鎵�鏈�</Option>
+          <Option value="2">浠呭睍寮�涓�绾�</Option>
+          <Option value="3">浠呭睍寮�涓ょ骇</Option>
+        </Select>
+        <Button type="text" @click="cancelPermEdit">鍙栨秷</Button>
+      </div>
+    </Drawer>
+    <!-- 鏁版嵁鏉冮檺 -->
+    <Modal
+            :title="modalTitle"
+            v-model="carModalVisible"
+            :mask-closable="false"
+            :width="500"
+            class="depModal"
+    >
+      <Form :label-width="85" ref="removeForm" :model="removeForm">
+        <FormItem label="绉婚櫎鍘熷洜" prop="removeReason">
+          <Input v-model="removeForm.removeReason"/>
+        </FormItem>
+      </Form>
+      <div v-show="dataType == 1" style="margin-top: 15px">
+        <div style="position: relative">
+          <Tree
+                  ref="depTree"
+                  :data="depData"
+                  :load-data="loadData"
+                  @on-toggle-expand="expandCheckDep"
+                  multiple
+                  style="margin-top: 15px"
+          ></Tree>
+          <Spin size="large" fix v-if="depTreeLoading"></Spin>
+        </div>
+      </div>
+      <div slot="footer">
+        <Button type="text" @click="depModalVisible = false">鍙栨秷</Button>
+        <Button
+                type="primary"
+                :loading="submitDepLoading"
+                @click="submitRemove"
+        >鎻愪氦</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+            v-model="exportModalVisible"
+            :title="exportTitle"
+            :loading="loadingExport"
+            @on-ok="exportCustomData"
+    >
+      <Form ref="exportForm" :label-width="100">
+        <FormItem label="瀵煎嚭鏂囦欢鍚�">
+          <Input v-model="filename" />
+        </FormItem>
+      </Form>
+    </Modal>
+  </div>
+</template>
+
+<script>
+  import {
+    getAllPermissionList,
+    setDefaultRole,
+    editRolePerm,
+    initDepartment,
+    loadDepartment,
+    editRoleDep,
+  } from "@/api/index";
+
+  import {
+    getAll,
+    getAddOilList,
+    addOil,
+    deleteAddOil,
+    getCarList,
+    editCar,
+    deleteCar,
+    getByDate,
+    getOilExcel,
+    getInfo
+  } from "@/api/open";
+  import util from "@/libs/util.js";
+  import excel from "@/libs/excel.js";
+  import XLSX from 'xlsx';
+  import {exportColumn} from "./exportColumn";
+  export default {
+    name: "car-manage",
+    data() {
+      return {
+        maxHeight: 510,
+        openTip: true,
+        openLevel: "0",
+        loading: true,
+        treeLoading: true,
+        depTreeLoading: true,
+        submitPermLoading: false,
+        submitDepLoading: false,
+        searchKey: "",
+        sortColumn: "createTime",
+        sortType: "desc",
+        modalType: 0,
+        roleModalVisible: false,
+        page: true,
+        carModalVisible: false,
+        exportModalVisible: false,
+        loadingExport: true,
+        permModalVisible: false,
+        depModalVisible: false,
+        modalTitle: "",
+        searchForm: {
+          // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+          pageNumber: 1, // 褰撳墠椤垫暟
+          pageSize: 10, // 椤甸潰澶у皬
+          sort: "createTime", // 榛樿鎺掑簭瀛楁
+          order: "desc", // 榛樿鎺掑簭鏂瑰紡
+          key: "",
+        },
+        addOilForm: {
+          status : 0
+        },
+        removeForm: {
+          status : 1
+        },
+        addOilFormValidate: {
+          name: [
+            { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "change" },
+          ],
+        },
+        submitLoading: false,
+        selectList: [],
+        columns: [
+          {
+            type: "selection",
+            width: 60,
+            align: "center",
+          },
+          {
+            type: "index",
+            width: 60,
+            align: "center",
+          },
+          {
+            title: "杞︾墝鍙�",
+            key: "carNo",
+            width: 100,
+            align: "center",
+          },
+          {
+            title: "寮�濮嬩娇鐢ㄦ棩鏈�",
+            key: "buyYear",
+            width: 150,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "浣跨敤骞撮檺",
+            key: "usefulLife",
+            width: 140,
+            sortable: true,
+            align: "center",
+            render: (h, params) => {
+              return h("div",1);
+            }
+          },
+          {
+            title: "鏈湡琛屼娇閲岀▼(KM)",
+            key: "mileage",
+            width: 180,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: "绱琛屼娇閲岀▼(KM)",
+            key: "allMileage",
+            width: 180,
+            sortable: true,
+            align: "center",
+          },
+          {
+            title: '缁翠慨璐圭敤',
+            align: 'center',
+            children: [
+              {
+                title: '鏈湡缁翠慨娆℃暟',
+                key: 'building',
+                align: 'center',
+                width: 180,
+                sortable: true
+              },
+              {
+                title: '鏈湡缁翠慨閲戦(鍏�)',
+                key: 'door',
+                align: 'center',
+                width: 180
+              },
+              {
+                title: '绱缁翠慨娆℃暟',
+                key: 'door',
+                align: 'center',
+                width: 180
+              },
+              {
+                title: '绱缁翠慨閲戦(鍏�)',
+                key: 'door',
+                align: 'center',
+                width: 180
+              }
+            ]
+          },
+          {
+            title: '鐕冩补璐圭敤',
+            align: 'center',
+            children: [
+              {
+                title: '鏈湡鍔犳补閲�(鍗�)',
+                key: 'amount',
+                align: 'center',
+                width: 180,
+                sortable: true
+              },
+              {
+                title: '鏈湡鍔犳补閲戦(鍏�)',
+                key: 'money',
+                align: 'center',
+                width: 180
+              },
+              {
+                title: '绱鍔犳补閲�(鍗�)',
+                key: 'allAmount',
+                align: 'center',
+                width: 180
+              },
+              {
+                title: '绱鍔犳补閲戦(鍏�)',
+                key: 'allMoney',
+                align: 'center',
+                width: 180
+              }
+            ]
+          }
+        ],
+        data: [],
+        chooseColumns: [],
+        total: 0,
+        permData: [],
+        exportColumns: exportColumn,
+        filename: "杞︿咯缁翠慨銆佺噧娌硅垂鐢ㄧ粺璁�",
+        exportTitle: "纭瀵煎嚭",
+        editRolePermId: "",
+        selectAllFlag: false,
+        depData: [],
+        dataType: 0,
+        editDepartments: [],
+        buyYear:'',
+        carList:[],
+        value:[]
+      };
+    },
+    methods: {
+      change1(e){
+        this.addDate = e;
+      },
+      init() {
+        this.getDataList();
+        // 鑾峰彇鎵�鏈夎彍鍗曟潈闄愭爲
+        this.getPermList();
+        this.getAllCar();
+      },
+      renderContent(h, { root, node, data }) {
+        let icon = "";
+        if (data.level == 0) {
+          icon = "ios-navigate";
+        } else if (data.level == 1) {
+          icon = "md-list-box";
+        } else if (data.level == 2) {
+          icon = "md-list";
+        } else if (data.level == 3) {
+          icon = "md-radio-button-on";
+        } else {
+          icon = "md-radio-button-off";
+        }
+        return h(
+          "span",
+          {
+            style: {
+              display: "inline-block",
+              cursor: "pointer",
+            },
+            on: {
+              click: () => {
+                if (data.status == -1) {
+                  return;
+                }
+                data.checked = !data.checked;
+              },
+            },
+          },
+          [
+            h("span", [
+              h("Icon", {
+                props: {
+                  type: icon,
+                  size: "16",
+                },
+                style: {
+                  "margin-right": "8px",
+                  "margin-bottom": "3px",
+                },
+              }),
+              h("span", data.title),
+            ]),
+          ]
+        );
+      },
+      handleDropdown(name) {
+        if (name == "refresh") {
+          this.getDataList();
+        } else if (name == "exportData") {
+          if (this.selectList.length <= 0) {
+            this.$Message.warning("鎮ㄨ繕鏈�夋嫨瑕佸鍑虹殑鏁版嵁");
+            return;
+          }
+          this.exportType = "part";
+          this.exportModalVisible = true;
+          this.exportTitle =
+                  "纭瀵煎嚭鏁版嵁";
+        } else if (name == "exportAll") {
+          this.exportType = "all";
+          this.exportModalVisible = true;
+          this.exportTitle = "纭瀵煎嚭鍏ㄩ儴鏁版嵁";
+          getInfo(this.searchForm).then((res) => {
+            if (res.success) {
+              this.exportData = res.result;
+            }
+          });
+        } else if (name == "importData") {
+          this.importModalVisible = true;
+        }
+      },
+      //瀵煎嚭鏁版嵁
+      exportCustomData() {
+        if (this.filename == "") {
+          this.filename = "杞﹁締缁翠慨銆佺噧娌硅垂鐢ㄧ粺璁�";
+        }
+        // 鍒ゆ柇鍕鹃�夊鍑哄垪
+        let exportColumns = [];
+        this.exportColumns.forEach((e) => {
+          exportColumns.push(e);
+        });
+        this.exportModalVisible = false;
+        let title = [];
+        let key = [];
+        exportColumns.forEach((e) => {
+          title.push(e.title);
+          key.push(e.key);
+        });
+        console.log(this.exportData)
+        const params = {
+          title: title,
+          key: key,
+          data: this.exportData,
+          autoWidth: true,
+          filename: this.filename,
+        };
+        this.exportData.forEach((i) => {
+          console.log(i);
+          i.usefulLife=1;
+        });
+        excel.export_array_to_excel(params);
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order == "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      selectDate(dateData) {
+        let date = new Date (dateData)
+        let y = date . getFullYear()
+        let m = date . getMonth() + 1
+        m=m<10?('0'+m):m
+        let d = date.getDate()
+        d = d< 10?('0'+ d):d
+        const time = y + '-' + m + '-' + d;
+        return time
+      },
+      getDataList() {
+        this.loading = true;
+        if (this.value[0]!="" && this.value[1]!=""){
+          this.searchForm.beginTime = this.selectDate(this.value[0]);
+          this.searchForm.endTime = this.selectDate(this.value[1]);
+          this.page=false;
+        }else{
+          this.searchForm.beginTime = "";
+          this.searchForm.endTime = "";
+        }
+        getInfo(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result;
+            this.total = res.result.length;
+          }
+        });
+      },
+      getPermList() {
+        this.treeLoading = true;
+        getAllPermissionList().then((res) => {
+          if (res.success) {
+            this.deleteDisableNode(res.result);
+            this.permData = res.result;
+            this.treeLoading = false;
+          }
+          this.treeLoading = false;
+        });
+      },
+      // 閫掑綊鏍囪绂佺敤鑺傜偣
+      deleteDisableNode(permData) {
+        let that = this;
+        permData.forEach(function (e) {
+          if (e.status == -1) {
+            e.title = "[宸茬鐢╙ " + e.title;
+            e.disabled = true;
+          }
+          if (e.children && e.children.length > 0) {
+            that.deleteDisableNode(e.children);
+          }
+        });
+      },
+      carRole() {
+        this.roleModalVisible = false;
+      },
+      submitAddOil() {
+        this.addOilForm.addDate = this.addDate;
+        this.$refs.addOilForm.validate((valid) => {
+          if (valid) {
+            if (this.modalType == 0) {
+              // 娣诲姞
+              this.submitLoading = true;
+              addOil(this.addOilForm).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("鎿嶄綔鎴愬姛");
+                  this.getDataList();
+                  this.roleModalVisible = false;
+                }
+              });
+            } else {
+              this.submitLoading = true;
+              addOil(this.addOilForm).then((res) => {
+                this.submitLoading = false;
+                if (res.success) {
+                  this.$Message.success("鎿嶄綔鎴愬姛");
+                  this.getDataList();
+                  this.roleModalVisible = false;
+                }
+              });
+            }
+          }
+        });
+      },
+      submitRemove(){
+        this.$refs.removeForm.validate((valid) => {
+          if (valid) {
+            this.submitLoading = true;
+            editCar(this.removeForm).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("鎿嶄綔鎴愬姛");
+                this.getDataList();
+                this.carModalVisible = false;
+              }
+            });
+          }
+        });
+      },
+      addOil() {
+        this.modalType = 0;
+        this.modalTitle = "娣诲姞鍔犳补璁板綍";
+        this.$refs.addOilForm.resetFields();
+        delete this.addOilForm.id;
+        this.roleModalVisible = true;
+      },
+      edit(v) {
+        this.getAllCar();
+        this.addDate = v.addDate;
+        this.modalType = 1;
+        this.modalTitle = "缂栬緫鍔犳补淇℃伅";
+        this.$refs.addOilForm.resetFields();
+        // 杞崲null涓�""
+        for (let attr in v) {
+          if (v[attr] == null) {
+            v[attr] = "";
+          }
+        }
+        let str = JSON.stringify(v);
+        let roleInfo = JSON.parse(str);
+
+        this.addOilForm = roleInfo;
+        this.roleModalVisible = true;
+      },
+      removeCar(v) {
+        this.dataType = 0;
+        this.modalTitle = "绉婚櫎杞﹁締";
+        this.$refs.addOilForm.resetFields();
+        // 杞崲null涓�""
+        for (let attr in v) {
+          if (v[attr] == null) {
+            v[attr] = "";
+          }
+        }
+        let str = JSON.stringify(v);
+        let roleInfo = JSON.parse(str);
+        roleInfo.status=1
+        console.log(roleInfo);
+        this.removeForm = roleInfo;
+        this.carModalVisible = true;
+
+      },
+      getAllCar(){
+        getAll().then((res) => {
+          if(res.success){
+            this.carList = res.result;
+            console.log(this.carList);
+          }
+        });
+      },
+      remove(v) {
+        this.$Modal.confirm({
+          title: "纭鍒犻櫎",
+          content: "鎮ㄧ‘璁よ鍒犻櫎鍚� ",
+          loading: true,
+          onOk: () => {
+            deleteAddOil({ ids: v.id }).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.clearSelectAll();
+                this.$Message.success("鍒犻櫎鎴愬姛");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      setDefault(v) {
+        this.loading = true;
+        let params = {
+          id: v.id,
+          isDefault: true,
+        };
+        setDefaultRole(params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+          }
+        });
+      },
+      cancelDefault(v) {
+        this.loading = true;
+        let params = {
+          id: v.id,
+          isDefault: false,
+        };
+        setDefaultRole(params).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+          }
+        });
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+      changeSelect(e) {
+        this.selectList = e;
+      },
+      delAll() {
+        if (this.selectList.length <= 0) {
+          this.$Message.warning("鎮ㄨ繕鏈�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "纭鍒犻櫎",
+          content: "鎮ㄧ‘璁よ鍒犻櫎鎵�閫夌殑 " + this.selectList.length + " 鏉℃暟鎹�?",
+          loading: true,
+          onOk: () => {
+            let ids = "";
+            this.selectList.forEach(function (e) {
+              ids += e.id + ",";
+            });
+            ids = ids.substring(0, ids.length - 1);
+            deleteCar({ ids: ids }).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("鍒犻櫎鎴愬姛");
+                this.clearSelectAll();
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+      editPerm(v) {
+        this.editRolePermId = v.id;
+        this.modalTitle = "鍒嗛厤 " + v.name + " 鐨勮彍鍗曟潈闄�";
+        // 鍖归厤鍕鹃��
+        let rolePerms = v.permissions;
+        if (this.treeLoading) {
+          this.$Message.warning("鑿滃崟鏉冮檺鏁版嵁鍔犺浇涓紝璇风◢鍚庣偣鍑绘煡鐪�");
+          return;
+        }
+        // 閫掑綊鍒ゆ柇瀛愯妭鐐�
+        this.checkPermTree(this.permData, rolePerms);
+        this.permModalVisible = true;
+      },
+      // 閫掑綊鍒ゆ柇瀛愯妭鐐�
+      checkPermTree(permData, rolePerms) {
+        let that = this;
+        permData.forEach(function (p) {
+          if (that.hasPerm(p, rolePerms) && p.status != -1) {
+            p.checked = true;
+          } else {
+            p.checked = false;
+          }
+          if (p.children && p.children.length > 0) {
+            that.checkPermTree(p.children, rolePerms);
+          }
+        });
+      },
+      // 鍒ゆ柇瑙掕壊鎷ユ湁鐨勬潈闄愯妭鐐瑰嬀閫�
+      hasPerm(p, rolePerms) {
+        let flag = false;
+        for (let i = 0; i < rolePerms.length; i++) {
+          if (p.id == rolePerms[i].permissionId) {
+            flag = true;
+            break;
+          }
+        }
+        if (flag) {
+          return true;
+        }
+        return false;
+      },
+      // 鍏ㄩ�夊弽閫�
+      selectTreeAll() {
+        this.selectAllFlag = !this.selectAllFlag;
+        let select = this.selectAllFlag;
+        this.selectedTreeAll(this.permData, select);
+      },
+      // 閫掑綊鍏ㄩ�夎妭鐐�
+      selectedTreeAll(permData, select) {
+        let that = this;
+        permData.forEach(function (e) {
+          e.checked = select;
+          if (e.children && e.children.length > 0) {
+            that.selectedTreeAll(e.children, select);
+          }
+        });
+      },
+      submitPermEdit() {
+        this.submitPermLoading = true;
+        let permIds = "";
+        let selectedNodes = this.$refs.tree.getCheckedNodes();
+        selectedNodes.forEach(function (e) {
+          permIds += e.id + ",";
+        });
+        permIds = permIds.substring(0, permIds.length - 1);
+        editRolePerm({
+          roleId: this.editRolePermId,
+          permIds: permIds,
+        }).then((res) => {
+          this.submitPermLoading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            // 鏍囪閲嶆柊鑾峰彇鑿滃崟鏁版嵁
+            this.$store.commit("setAdded", false);
+            util.initRouter(this);
+            this.getDataList();
+            this.permModalVisible = false;
+          }
+        });
+      },
+      cancelPermEdit() {
+        this.permModalVisible = false;
+      },
+      loadData(item, callback) {
+        loadDepartment(item.id, { openDataFilter: false }).then((res) => {
+          if (res.success) {
+            res.result.forEach(function (e) {
+              e.selected = false;
+              if (e.isParent) {
+                e.loading = false;
+                e.children = [];
+              }
+              if (e.status == -1) {
+                e.title = "[宸茬鐢╙ " + e.title;
+                e.disabled = true;
+              }
+            });
+            callback(res.result);
+          }
+        });
+      },
+      expandCheckDep(v) {
+        // 鍒ゆ柇灞曞紑瀛愯妭鐐�
+        this.checkDepTree(v.children, this.editDepartments);
+      },
+      // 鍒ゆ柇瀛愯妭鐐�
+      checkDepTree(depData, roleDepIds) {
+        let that = this;
+        depData.forEach(function (p) {
+          if (that.hasDepPerm(p, roleDepIds)) {
+            p.selected = true;
+          } else {
+            p.selected = false;
+          }
+        });
+      },
+      // 鍒ゆ柇瑙掕壊鎷ユ湁鐨勬潈闄愯妭鐐瑰嬀閫�
+      hasDepPerm(p, roleDepIds) {
+        let flag = false;
+        for (let i = 0; i < roleDepIds.length; i++) {
+          if (p.id == roleDepIds[i].departmentId) {
+            flag = true;
+            break;
+          }
+        }
+        if (flag) {
+          return true;
+        }
+        return false;
+      },
+      submitDepEdit() {
+        let depIds = "";
+        if (this.dataType == 1) {
+          let selectedNodes = this.$refs.depTree.getSelectedNodes();
+          selectedNodes.forEach(function (e) {
+            depIds += e.id + ",";
+          });
+          depIds = depIds.substring(0, depIds.length - 1);
+        }
+        this.submitDepLoading = true;
+        editRoleDep({
+          roleId: this.editRolePermId,
+          dataType: this.dataType,
+          depIds: depIds,
+        }).then((res) => {
+          this.submitDepLoading = false;
+          if (res.success) {
+            this.$Message.success("鎿嶄綔鎴愬姛");
+            this.getDataList();
+            this.depModalVisible = false;
+          }
+        });
+      },
+      changeOpen(v) {
+        if (v == "0") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = true;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = true;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "1") {
+          this.permData.forEach((e) => {
+            e.expand = false;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = false;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "2") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = false;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        } else if (v == "3") {
+          this.permData.forEach((e) => {
+            e.expand = true;
+            if (e.children && e.children.length > 0) {
+              e.children.forEach((c) => {
+                c.expand = true;
+                if (c.children && c.children.length > 0) {
+                  c.children.forEach(function (b) {
+                    b.expand = false;
+                  });
+                }
+              });
+            }
+          });
+        }
+      },
+    },
+    mounted() {
+      this.maxHeight = Number(document.documentElement.clientHeight - 121) + "px";
+      this.init();
+    },
+  };
+</script>
\ No newline at end of file
diff --git a/src/views/your/carRepairCost-manage/exportColumn.js b/src/views/your/carRepairCost-manage/exportColumn.js
new file mode 100644
index 0000000..f01acf3
--- /dev/null
+++ b/src/views/your/carRepairCost-manage/exportColumn.js
@@ -0,0 +1,84 @@
+export const exportColumn = [
+  {
+    title: "杞︾墝鍙�",
+    key: "carNo",
+    width: 100,
+  },
+  {
+    title: "寮�濮嬩娇鐢ㄦ棩鏈�",
+    key: "buyYear",
+    width: 150,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "浣跨敤骞撮檺",
+    key: "usefulLife",
+    width: 140,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: "鏈湡琛屼娇閲岀▼(KM)",
+    key: "mileage",
+    width: 180,
+    sortable: true,
+  },
+  {
+    title: "绱琛屼娇閲岀▼(KM)",
+    key: "allMileage",
+    width: 180,
+    sortable: true,
+    align: "center",
+  },
+  {
+    title: '鏈湡缁翠慨娆℃暟',
+    key: 'building',
+    align: 'center',
+    width: 180,
+    sortable: true
+  },
+  {
+    title: '鏈湡缁翠慨閲戦(鍏�)',
+    key: 'door',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '绱缁翠慨娆℃暟',
+    key: 'door',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '绱缁翠慨閲戦(鍏�)',
+    key: 'door',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '鏈湡鍔犳补閲�(鍗�)',
+    key: 'amount',
+    align: 'center',
+    width: 180,
+    sortable: true
+  },
+  {
+    title: '鏈湡鍔犳补閲戦(鍏�)',
+    key: 'money',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '绱鍔犳补閲�(鍗�)',
+    key: 'allAmount',
+    align: 'center',
+    width: 180
+  },
+  {
+    title: '绱鍔犳补閲戦(鍏�)',
+    key: 'allMoney',
+    align: 'center',
+    width: 180
+  }
+]
\ No newline at end of file
diff --git a/src/views/your/suggest-manage/suggestManage.vue b/src/views/your/suggest-manage/suggestManage.vue
index 8994f67..de4a354 100644
--- a/src/views/your/suggest-manage/suggestManage.vue
+++ b/src/views/your/suggest-manage/suggestManage.vue
@@ -66,7 +66,7 @@
       >
         <FormItem label="杞﹁締" prop="carId">
             <Select v-model="addOilForm.carId" filterable>
-              <Option v-for="item in carList" :value="item.id">{{ item.carNo }}</Option>
+              <Option v-for="item in carList" :value="item.id" :key="item.id">{{ item.carNo }}</Option>
             </Select>
         </FormItem>
         <Form-item label="鍔犳补鏃ユ湡" prop="addDate">

--
Gitblit v1.9.1