订单管理

src/api/base/orderInfo.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/orderInfo/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/orderInfo/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/orderInfo/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/orderInfo/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/orderInfo/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/orderInfo/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/orderInfo/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  create, edit, add, update, remove, batchRemove, pageList
+}

src/routers/modules/base.js

@@ -1,4 +1,16 @@
 var routers = [
+    {
+        path: '/base/orderInfo/list',
+        name: 'BaseOrderInfoList',
+        // route level code-splitting
+        // this generates a separate chunk (about.[hash].js) for this route
+        // which is lazy-loaded when the route is visited.
+        component: () => import('@/views/base/orderInfo-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '单位管理'
+        }
+},
 ]
 
 export default routers;

src/routers/modules/bus.js

@@ -58,7 +58,7 @@ var routers = [
                         roles: ["admin"],
                         title: '线路管理'
                 }
-        },
+        }
 ]
 
 export default routers;

src/views/base/orderInfo-list.vue

@@ -0,0 +1,483 @@
+<template>
+  <div style="padding-left: 5px">
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/orderInfo">订单管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="所属公司" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree
+        >
+      </el-form-item>
+      <el-form-item label="车牌号" prop="licensePlateNumber">
+        <el-input type="text" size="mini" v-model="queryModel.licensePlateNumber"></el-input>
+      </el-form-item>
+      <el-form-item label="订单编号" prop="outOrderNo">
+        <el-input type="text" size="mini" v-model="queryModel.outOrderNo"></el-input>
+      </el-form-item>
+      <el-form-item label="交易流水号" prop="transactionId">
+        <el-input type="text" size="mini" v-model="queryModel.transactionId"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        prop="companyName"
+        label="所属公司"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="licensePlateNumber"
+        label="车牌号"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="driverName"
+        label="司机姓名"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="routeName"
+        label="路线名称"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="totalFee"
+        label="账单金额（元）"
+        width="100"
+      ></el-table-column>
+    <el-table-column
+        prop="payFee"
+        label="支付金额（元）"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="payStatus" label="支付状态" width="130">
+        <template  slot-scope="{ row }">
+            <span v-if="row.payStatus==10" style="color:red">未支付</span>
+            <span v-else-if="row.payStatus==20" style="color:green">已支付</span>
+        </template>
+      </el-table-column>
+      <el-table-column  prop="payName" label="支付方式" width="130">
+        <template  slot-scope="{ row }">
+            <span v-if="row.payName=='wechat'">微信</span>
+            <span v-else-if="row.payStatus=='alipay'">支付宝</span>
+            <span v-else-if="row.payStatus=='cash'">现金</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="upStationName"
+        label="上车站点"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="downStationName"
+        label="下车站点"
+        width="130"
+      ></el-table-column>
+            <el-table-column
+        prop="outOrderNo"
+        label="订单编号"
+        width="130"
+      ></el-table-column>
+            <el-table-column
+        prop="transactionId"
+        label="交易流水号"
+        width="130"
+      ></el-table-column>
+                  <el-table-column
+        prop="payTime"
+        label="支付时间"
+        width="150"
+      ></el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <orderInfoDetail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></orderInfoDetail>
+    <el-dialog
+      title="导入"
+      :visible.sync="batchImportVisible"
+      :modal-append-to-body="false"
+      style="text-align: left"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="150px">
+        <el-form-item label="模板下载">
+          <el-link
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart-bus/excel/vehicle.xls"
+            type="primary"
+            target="_blank"
+            >点击下载模板</el-link
+          >
+        </el-form-item>
+        <el-form-item label="上传文件">
+          <el-upload
+            class="upload-demo"
+            accept=".xls"
+            :action="uploadUrlXls"
+            :data="uploadXlsData"
+            :headers="headers"
+            :on-preview="handleBatchImportPreview"
+            name="uploadFile"
+            :multiple="true"
+            :limit="1"
+            :on-remove="handleBatchImportRemove"
+            :before-remove="beforeBatchImportRemove"
+            :before-upload="beforeUpload"
+            :on-exceed="handleBatchImportExceed"
+            :on-success="handleBatchImportSuccess"
+            :file-list="batchImportFileList"
+          >
+            <el-button size="small" type="primary" :loading="xlsLoading"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">
+              只能上传xls文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="batchImportVisible = false"
+          >关 闭</el-button
+        >
+      </div>
+    </el-dialog>
+    <!--批量导入E-->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import orderInfoApi from "@/api/base/orderInfo";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/bus/companyInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BaseOrderInfoList",
+  data() {
+    var self = this;
+    return {
+      activeName: "list",
+      queryModel: {
+        licensePlateNumber: "",
+        companyId: "",
+        outOrderNo:"",
+        transactionId:"",
+      },
+      loading: false,
+      tableData: [],
+      treeData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      tableHeight: 300,
+      showDeviceModal: false,
+      companyId: "",
+      qrCode: "",
+      companyResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      batchImportVisible: false,
+      batchImportFileList: [],
+      uploadUrlXls: Constant.serverUrl + "/bus/vehicleInfo/importXls",
+      uploadXlsData: {
+        subFolder: "driver",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      xlsLoading: false,
+      sceneData: [],
+      typeData:[]
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    this.changePage(1);
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      if(self.queryModel.companyId!=null){
+          formData.append("companyId", self.queryModel.companyId);
+      }
+      formData.append("licensePlateNumber", self.queryModel.licensePlateNumber);
+
+      formData.append("outOrderNo", self.queryModel.outOrderNo);
+      formData.append("transactionId", self.queryModel.transactionId);
+
+
+      orderInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          orderInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        orderInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+      this.showDeviceModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+
+    beforeUpload(file, fileList) {
+      //导入前判断
+    },
+    //批量导入-上传成功
+    handleBatchImportSuccess(response, file, fileList) {
+      var self = this;
+      self.xlsLoading = false;
+      if (response.result) {
+        self.$message.success(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+        this.batchImportVisible = false;
+      } else {
+        //this.$message.error(response.message);
+        this.batchImportFileList = [];
+        this.changePage(1);
+        this.uploadCompanyId = "";
+        this.uploadXlsData.companyId = "";
+
+        if (response.data != null) {
+          //下载有错误信息提示的报表
+          //window.open(response.data);
+          self.$message({
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+            message:
+              response.message +
+              `,<a href="${response.data}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
+            duration: 30000,
+          });
+        }
+      }
+    },
+    //批量导入-预览
+    handleBatchImportPreview(file) {
+      console.log(file.url);
+    },
+    //批量导入-移除
+    handleBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-移除前操作
+    beforeBatchImportRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    //批量导入-文件超出个数限制时的钩子
+    handleBatchImportExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+
+  },
+  mounted: function () {},
+  components: {
+    "el-select-tree": SelectTree,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/bus/vehicleInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/driverInfo">司机管理</a>
+        <a href="/vehicleInfo">车辆管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -240,7 +240,7 @@ import { getToken } from "@/utils/auth"; // get token from cookie
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
-  name: "BusDriverInfoList",
+  name: "BusVehicleInfoList",
   data() {
     var self = this;
     return {