站点价格编辑

src/api/bus/priceInfo.js

@@ -50,6 +50,10 @@ function exportXls(formData) {
   return request.post(constant.serverUrl + "/bus/priceInfo/exportXls", formData);
 }
 
+function findPriceByStation(formData){
+  return request.post(constant.serverUrl + "/bus/priceInfo/findPriceByStation", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,searchRoutePrice,exportXls
+  pageList,create,edit,add,update,remove,batchRemove,searchRoutePrice,exportXls,findPriceByStation
 }

src/api/bus/stationInfo.js

@@ -41,6 +41,19 @@ function batchRemove(idList){
   });
 }
 
+function list(formData){
+  return request.post(constant.serverUrl + "/bus/stationInfo/list", formData);
+}
+
+function changePrice(formModel){  
+  return request.post(constant.serverUrl + "/bus/stationInfo/changePrice", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,list,changePrice
 }

src/views/bus/routeInfo-price copy.vue

@@ -1,283 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="showDialog"
-    :title="title"
-    :modal-append-to-body="false"
-    style="text-align: left"
-    @close="closeDialog"
-    :close-on-click-modal="false"
-    append-to-body
-    :modal="true"
-    width="90%"
-  >
-    <div class="user-panel" v-loading="loading">
-      <el-divider></el-divider>
-      <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-upload2"
-        @click="batchImportVisible = true"
-        >导入</el-button
-      >
-      </el-row>
-      <el-table
-        :data="tableData"
-        style="min-height: 400px"
-        v-loading="loading"
-        stripe
-        @sort-change="sortChange"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="index"
-          label="序号"
-          :index="indexMethod"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="name"
-          label="站名"
-          width="200px"
-        ></el-table-column>
-        <template v-for="col in stationPriceColumns">
-          <el-table-column
-            :label="col.name"
-            :prop="col.id"
-            :key="col.id"
-            width="200px"
-          >
-            <template slot-scope="{ row }">
-              <div style="display: flex; flex-direction: column">
-                <template
-                  v-for="(item, index) in row.stationPriceMap[col.id]"
-                >
-                  <div v-html="showItem(item,col.id)" :key="index"></div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-        </template>
-      </el-table>
-      <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/routeInfo.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>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-import Constant from "@/constant";
-import shiftInfoApi from "@/api/bus/shiftInfo";
-
-import passengerInfoApi from "@/api/bus/passengerInfo";
-import priceInfoApi from "@/api/bus/priceInfo";
-
-export default {
-  props: ["businessKey", "title"],
-  data() {
-    return {
-      queryModel: {
-        vehicleShiftId: "",
-        vehiclePersonId: "",
-        userId: "",
-        userName: "",
-        status: "",
-        payStatus: "",
-      },
-      loading: false,
-      tableData: [],
-      pageIndex: 1,
-      pageSize: 5,
-      totalPages: 0,
-      totalElements: 0,
-      field: "",
-      direction: "",
-      pageSizeList: [5, 15, 30],
-      multipleSelection: [],
-      showModal: false,
-      modalTitle: "",
-      showDialog: true,
-      stationPriceColumns: [],
-      batchImportVisible:false,
-    };
-  },
-  methods: {
-    indexMethod(index) {
-      return (this.pageIndex - 1) * this.pageSize + (index + 1);
-    },
-    changePage(pageIndex) {
-      var self = this;
-      self.loading = true;
-
-      self.pageIndex = pageIndex;
-      var formData = new FormData();
-
-      formData.append("routeId", self.businessKey);
-
-      priceInfoApi
-        .searchRoutePrice(formData)
-        .then(function (response) {
-          self.loading = false;
-
-          var jsonData = response.data;
-          self.tableData = jsonData.stationInfoList;
-          self.stationPriceColumns = jsonData.stationPriceColumns;
-        })
-        .catch((error) => {
-          self.loading = false;
-          // self.$message.error(error + "");
-        });
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-
-      this.$nextTick(() => {
-        this.changePage(this.pageIndex);
-      });
-    },
-    sortChange(data) {
-      this.field = data.column.field;
-      this.direction = data.order;
-
-      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(() => {
-          passengerInfoApi.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(() => {
-        passengerInfoApi.batchRemove(idList).then(function (response) {
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.changePage(self.pageIndex);
-
-            self.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          }
-        });
-      });
-    },
-    closeDialog() {
-      this.$emit("close", false);
-    },
-    onDetailModalClose(refreshed) {
-      //保存成功后回调
-      this.showModal = false;
-
-      if (refreshed) {
-        this.changePage(this.pageIndex);
-      }
-    },
-    
-    showItem(item,id) {
-      return item;
-    },
-  },
-  mounted: function () {
-    this.changePage(1);
-  },
-};
-</script>

src/views/bus/routeInfo-price-detail.vue

@@ -0,0 +1,221 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    width="40%"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'130px'"
+      >
+        <el-form-item label="上车站点" prop="startStationId">
+          <el-select
+            v-model="formModel.startStationId"
+            filterable
+            placeholder="请选择"
+            style="width: 80%"
+          >
+            <el-option
+              v-for="item in startStationData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下车站点" prop="endStationId">
+          <el-select
+            v-model="formModel.endStationId"
+            filterable
+            placeholder="请选择"
+            style="width: 80%"
+          >
+            <el-option
+              v-for="item in endStationData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费用" prop="price">
+          <el-input-number
+            v-model="formModel.price"
+            placeholder="请输入费用"
+            style="width: 80%"
+            :min="0"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="距离" prop="distance">
+          <el-input-number
+            v-model="formModel.distance"
+            placeholder="请输入距离"
+            style="width: 80%"
+            :min="0"
+          ></el-input-number>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import stationInfoApi from "@/api/bus/stationInfo";
+import priceInfoApi from "@/api/bus/priceInfo";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+
+export default {
+  props: ["routeId", "title"],
+  data() {
+    return {
+      formModel: {
+        enableChangeParent: false,
+      },
+      ruleValidate: {
+        startStationId: [
+          { required: true, message: "上车站点不能为空", trigger: "blur" },
+        ],
+        endStationId: [
+          { required: true, message: "下车站点不能为空", trigger: "blur" },
+        ],
+        price: [{ required: true, message: "费用不能为空", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      typeData: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      startStationData: [],
+      endStationData: [],
+    };
+  },
+  watch: {
+    "formModel.startStationId"(newVal, oldVal) {
+      var formData = new FormData();
+      formData.append("startStationId", newVal);
+      formData.append("endStationId", this.formModel.endStationId);
+      priceInfoApi.findPriceByStation(formData).then((response) => {
+        var jsonData = response.data;
+        this.formModel.price = jsonData.data.price;
+        this.formModel.distance = jsonData.data.distance;
+        this.formModel.id = jsonData.data.id;
+      });
+    },
+    "formModel.endStationId"(newVal, oldVal) {
+      var formData = new FormData();
+      formData.append("startStationId", this.formModel.startStationId);
+      formData.append("endStationId", newVal);
+      priceInfoApi.findPriceByStation(formData).then((response) => {
+        var jsonData = response.data;
+        this.formModel.price = jsonData.data.price;
+        this.formModel.distance = jsonData.data.distance;
+        this.formModel.id = jsonData.data.id;
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    var formData = new FormData();
+    formData.append("routeId", self.routeId);
+    stationInfoApi.list(formData).then((response) => {
+      var jsonData = response.data;
+      this.startStationData = jsonData.data;
+      this.endStationData = jsonData.data;
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return priceInfoApi.add(self.formModel);
+            } else {
+              return priceInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/bus/routeInfo-price-list.vue

@@ -13,11 +13,19 @@
     <el-row class="button-group">
       <el-button
           type="primary"
-          size="mini"
+          size="small"
           icon="ios-search"
           @click="changePage()"
           :loading="loading"
-          >查询</el-button
+          >刷新</el-button
+        >
+        <el-button
+          type="primary"
+          size="small"
+          icon="ios-search"
+          @click="editPrice()"
+          :loading="loading"
+          >编辑</el-button
         >
       <el-button
         type="primary"
@@ -118,10 +126,20 @@
       </div>
     </el-dialog>
     <!--批量导入E-->
+
+    <routeInfo-price-detail
+      v-if="showModal"
+      :title="modalTitle"
+      :routeId="routeId"
+      @close="onDetailModalClose"
+    ></routeInfo-price-detail>
+    
   </div>
 </template>
 <script>
 import Constant from "@/constant";
+
+import priceDetail from "./routeInfo-price-detail";
 import shiftInfoApi from "@/api/bus/shiftInfo";
 
 import passengerInfoApi from "@/api/bus/passengerInfo";
@@ -165,7 +183,7 @@ export default {
         Authorization: getToken(),
       },
       batchImportFileList:[],
-      xlsLoading:false
+      xlsLoading:false,
     };
   },
   methods: {
@@ -199,42 +217,11 @@ export default {
     handleReset(name) {
       this.$refs[name].resetFields();
     },
-    handleAdd() {
-      this.modalTitle = "新增";
-      this.businessKey = "";
-      this.showModal = true;
-    },
-    handleEdit(record) {
+    editPrice() {
       this.modalTitle = "编辑";
-      this.businessKey = record.id;
+      this.routeId = this.routeId;
       this.showModal = true;
     },
-    handleDelete(record) {
-      var self = this;
-
-      self
-        .$confirm("是否确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-        .then(() => {
-          passengerInfoApi.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.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-            }
-          });
-        });
-    },
     closeDialog() {
       this.$emit("close", false);
     },
@@ -338,6 +325,10 @@ export default {
     this.routeId = routeId;
     this.changePage();
   },
+  
+  components: {
+    "routeInfo-price-detail": priceDetail,
+  },
 };
 </script>
 <style scoped>

src/views/bus/vehicleInfo-detail.vue

@@ -60,10 +60,10 @@
             style="width: 400px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="设备编号" prop="deviceNo">
+        <el-form-item label="打卡设备编号" prop="deviceNo">
           <el-input
             v-model="formModel.deviceNo"
-            placeholder="请输入设备编号"
+            placeholder="请输入打卡设备编号"
             style="width: 400px"
           ></el-input>
         </el-form-item>
@@ -135,7 +135,7 @@ export default {
           { required: true, message: "gps设备号不能为空", trigger: "blur" },
         ],
         deviceNo: [
-          { required: true, message: "设备编号不能为空", trigger: "blur" },
+          { required: true, message: "打卡设备编号不能为空", trigger: "blur" },
         ],
         activationCode: [
           { required: true, message: "激活码不能为空", trigger: "blur" },

src/views/bus/vehicleInfo-list.vue

@@ -108,7 +108,7 @@
       ></el-table-column>
       <el-table-column
         prop="deviceNo"
-        label="门禁设备编号"
+        label="打卡设备编号"
         width="220"
       ></el-table-column>
       <el-table-column