氩气合作方管理后台功能

搬运小工管理后台功能
运输方管理后台功能
移动端接口工单列表功能

src/api/base/argonPartner.js

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

src/api/base/laborerInfo.js

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

src/api/base/transportationInfo.js

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

src/routers/modules/base.js

@@ -35,6 +35,42 @@ var routers = [
                         title: '工单管理'
                 }
         },
+        {
+                path: '/base/argonPartner/list',
+                name: 'baseArgonPartnerList',
+                // 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/argonPartner-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '氩气合作商管理'
+                }
+        },
+        {
+                path: '/base/laborerInfo/list',
+                name: 'baseLaborerInfoList',
+                // 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/laborerInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '搬运小工管理'
+                }
+        },
+        {
+                path: '/base/transportationInfo/list',
+                name: 'baseTransportationInfoList',
+                // 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/transportationInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '运输方管理'
+                }
+        },
 ]
 
 export default routers;

src/views/base/argonPartner-detail.vue

@@ -0,0 +1,210 @@
+
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      :modal-append-to-body="false"
+      style="text-align: left;"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+      width="900px"
+    >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+          ref="form"
+          :model="formModel"
+          :rules="ruleValidate"
+          :label-width="'100px'"
+          :inline="true"
+        >
+        <el-form-item label="企业名称" prop="name">
+            <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="管理员姓名" prop="contact">
+            <el-input v-model="formModel.contact" placeholder="请输入真实姓名" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="管理员电话" prop="phone">
+            <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="所在地区" prop="location">
+            <el-input v-model="formModel.location" placeholder="请输入所在地区" style="width: 300px"></el-input>
+          </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 { getToken } from "@/utils/auth"; // get token from cookie
+  import argonPartnerApi from "@/api/base/argonPartner";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+          showPwd: true,
+          ruleValidate: {
+              userName: [
+              { required: true, message: "用户名不能为空", trigger: "blur" },
+              ],
+              realName: [
+              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              ],
+              phone: [
+              { required: true, message: "联系电话不能为空", trigger: "blur" },
+              ],
+              idCard: [
+              { required: true, message: "身份证号不能为空", trigger: "blur" },
+              ],
+              age: [
+              { required: true, message: "年龄不能为空", trigger: "blur" },
+              ],
+              gender: [
+              { required: true, message: "性别不能为空", trigger: "blur" },
+              ],
+          },
+          roleList: [],
+          formModel: {},
+          showDialog: true,
+          loading: false,
+          submitting: false,
+          enterpriseList:[],
+          //上传地址
+          uploadUrl: Constant.serverUrl + "/uploadPicture",
+          uploadData: {
+              subFolder: "water-tank",
+          },
+          fileUrl: "",
+          headers: {
+              Authorization: getToken(),
+          },
+      };
+    },
+    created() {
+    },
+    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 argonPartnerApi.add(self.formModel);
+              } else {
+                return argonPartnerApi.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);
+              }
+            });
+          }
+        });
+      },
+      handleAvatarSuccess(res, file) {
+          var self = this;
+          self.formModel.image = res.data;
+  
+          self.fileUrl =
+            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+      },
+      beforeAvatarUpload(file) {
+          const isLt2M = file.size / 1024 / 1024 < 2;
+          if (!isLt2M) {
+              this.$message.error('上传头像图片大小不能超过 2MB!');
+          }
+          return isLt2M;
+      }
+    },
+    async mounted() {
+      var self = this;
+      self.loading = true;
+  
+      (function () {
+        if (self.businessKey != null && self.businessKey.length > 0) {
+          return argonPartnerApi.edit(self.businessKey);
+        } else {
+          return argonPartnerApi.create();
+        }
+      })()
+        .then((response) => {
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+              self.formModel = jsonData.data;
+  
+              let image = self.formModel.image;
+              if (image != null) {
+                  self.fileUrl = image 
+              }
+  
+              self.showModal = true;
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+  
+          self.loading = false;
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+    },
+  };
+  </script>
+  <style scoped>
+  .user-panel {
+    margin: 10px auto;
+  }
+  .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/base/argonPartner-list.vue

@@ -0,0 +1,395 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          客户管理
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-divider></el-divider>
+      <!--
+        要resetFields起作用，必须配置:model和prop
+      -->
+      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+        <el-form-item label="联系电话" prop="phone">
+          <el-input type="text" size="mini" v-model="queryModel.phone"></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-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length==0"
+          @click="handleBatchDelete"
+        >删除选中项</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="selection" width="55"></el-table-column>
+        <el-table-column  prop="name"  label="企业名称"></el-table-column>
+        <el-table-column  prop="location"  label="所在地"></el-table-column>
+        <el-table-column  prop="contact"  label="联系人" width="180"></el-table-column>
+        <el-table-column  prop="phone"  label="联系电话" width="180"></el-table-column>
+        <el-table-column  prop="introduction"  label="公司简介" width="180"></el-table-column>
+        
+        <el-table-column label="操作">
+          <template slot-scope="{row}" >
+            <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>
+            <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+          </template>
+        </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>
+      <argonPartner-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></argonPartner-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import argonPartnerApi from "@/api/base/argonPartner";
+  import argonPartnerDetail from "./argonPartner-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseArgonPartnerList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          realName: "",
+          phone:"",
+          idCard:"",
+          status:"",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+        batchImportVisible: false,
+        xlsLoading: false,
+        batchImportFileList: [],
+        chargingStationResult:[],
+        uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+        uploadXlsData: {
+            subFolder: "personInfo",
+        },
+        headers: {
+            Authorization: getToken(),
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex,exportFlag) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        
+        if(exportFlag!=null){
+            formData.append("exportFlag", exportFlag);
+            formData.append("pageSize", 10000);
+        }
+        else{
+            formData.append("pageSize", self.pageSize);
+        }
+        formData.append("realName", self.queryModel.realName);
+        formData.append("phone", self.queryModel.phone);
+        formData.append("idCard", self.queryModel.idCard);
+        formData.append("status", self.queryModel.status);
+  
+        self.loading = true;
+  
+        argonPartnerApi.pageList(formData).then(function(response) {
+          self.loading = false;
+            var jsonData = response.data;
+            if(jsonData.result) {
+                if(exportFlag){
+                    //导出
+                    self.$message({
+                        showClose: true,
+                        type: "success",
+                        message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+                        dangerouslyUseHTMLString: true,
+                        duration: 30000
+                    });
+                }
+                else{
+                    //分页查看
+                    var page = jsonData.data;
+
+                    self.tableData = page.data;
+                    self.totalPages = page.totalPages;
+                    self.totalElements = page.recordsTotal;
+                }
+            }
+            else{
+                self.$message.warning(jsonData.message);
+            }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      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() {
+        var self = this;
+        
+        self.modalTitle = "新增用户";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑用户";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            argonPartnerApi.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(() => {
+            argonPartnerApi.batchRemove(idList).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      exportXls() {
+        this.changePage(1,true);
+      },
+      handleCheck(record){
+        var self = this;
+  
+        this.$confirm("是否确认审核？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            argonPartnerApi.check(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: "审核成功!"
+              });
+            }
+          });
+        });
+      },
+        onDetailModalClose(refreshed) {
+            this.showModal = false;
+    
+            if(refreshed) {
+            this.changePage(this.pageIndex);
+            }
+        },
+        beforeUpload(file, fileList) {
+            //导入前判断
+            var self = this;
+            self.xlsLoading = true;
+            return true;
+        },
+        //批量导入-上传成功
+        handleBatchImportSuccess(response, file, fileList) {
+        var self = this;
+        self.xlsLoading = false;
+
+        if (response.result) {
+            self.$message.success(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+
+        } else {
+            //this.$message.error(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+            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,
+            });
+            }
+        }
+
+        this.batchImportVisible = false;
+        },
+        //批量导入-预览
+        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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+        "argonPartner-detail":argonPartnerDetail
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/customerInfo-detail.vue

@@ -17,10 +17,13 @@
           :label-width="'100px'"
           :inline="true"
         >
-          <el-form-item label="真实姓名" prop="realName">
+        <el-form-item label="企业名称" prop="companyName">
+            <el-input v-model="formModel.companyName" placeholder="请输入企业名称" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="管理员姓名" prop="realName">
             <el-input v-model="formModel.realName" placeholder="请输入真实姓名" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
+          <el-form-item label="管理员电话" prop="phone">
             <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="身份证号" prop="idCard">

src/views/base/customerInfo-list.vue

@@ -62,16 +62,16 @@
             <el-avatar :size="50" :src="row.image"></el-avatar>
           </template>
         </el-table-column>
-        <el-table-column  prop="realName"  label="名称"></el-table-column>
+        <el-table-column  prop="companyName"  label="企业名称"></el-table-column>
         <el-table-column  prop="phone"  label="联系电话"></el-table-column>
         <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
-        <el-table-column  prop="gender"  label="性别">
-            <template slot-scope="{row}">
-                <span v-if="row.gender=='2'">女</span>
-                <span v-else-if="row.gender=='1'">男</span>
+        <el-table-column  prop="region"  label="所在地区" width="180"></el-table-column>
+        <el-table-column  prop="status"  label="审核状态" >
+          <template slot-scope="{row}">
+            <span v-if="row.status=='0'">未审核</span>
+            <span v-else-if="row.status=='1'">已审核</span>
           </template>
         </el-table-column>
-        <el-table-column  prop="region"  label="所在地区" width="180"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="{row}" >
             <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>

src/views/base/laborerInfo-detail.vue

@@ -0,0 +1,210 @@
+
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      :modal-append-to-body="false"
+      style="text-align: left;"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+      width="900px"
+    >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+          ref="form"
+          :model="formModel"
+          :rules="ruleValidate"
+          :label-width="'100px'"
+          :inline="true"
+        >
+        <el-form-item label="企业名称" prop="name">
+            <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input v-model="formModel.idCard" placeholder="请输入真实姓名" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="年龄" prop="age">
+            <el-input v-model="formModel.age" placeholder="请输入所在地区" style="width: 300px"></el-input>
+          </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 { getToken } from "@/utils/auth"; // get token from cookie
+  import laborerInfoApi from "@/api/base/laborerInfo";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+          showPwd: true,
+          ruleValidate: {
+              userName: [
+              { required: true, message: "用户名不能为空", trigger: "blur" },
+              ],
+              realName: [
+              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              ],
+              phone: [
+              { required: true, message: "联系电话不能为空", trigger: "blur" },
+              ],
+              idCard: [
+              { required: true, message: "身份证号不能为空", trigger: "blur" },
+              ],
+              age: [
+              { required: true, message: "年龄不能为空", trigger: "blur" },
+              ],
+              gender: [
+              { required: true, message: "性别不能为空", trigger: "blur" },
+              ],
+          },
+          roleList: [],
+          formModel: {},
+          showDialog: true,
+          loading: false,
+          submitting: false,
+          enterpriseList:[],
+          //上传地址
+          uploadUrl: Constant.serverUrl + "/uploadPicture",
+          uploadData: {
+              subFolder: "water-tank",
+          },
+          fileUrl: "",
+          headers: {
+              Authorization: getToken(),
+          },
+      };
+    },
+    created() {
+    },
+    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 laborerInfoApi.add(self.formModel);
+              } else {
+                return laborerInfoApi.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);
+              }
+            });
+          }
+        });
+      },
+      handleAvatarSuccess(res, file) {
+          var self = this;
+          self.formModel.image = res.data;
+  
+          self.fileUrl =
+            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+      },
+      beforeAvatarUpload(file) {
+          const isLt2M = file.size / 1024 / 1024 < 2;
+          if (!isLt2M) {
+              this.$message.error('上传头像图片大小不能超过 2MB!');
+          }
+          return isLt2M;
+      }
+    },
+    async mounted() {
+      var self = this;
+      self.loading = true;
+  
+      (function () {
+        if (self.businessKey != null && self.businessKey.length > 0) {
+          return laborerInfoApi.edit(self.businessKey);
+        } else {
+          return laborerInfoApi.create();
+        }
+      })()
+        .then((response) => {
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+              self.formModel = jsonData.data;
+  
+              let image = self.formModel.image;
+              if (image != null) {
+                  self.fileUrl = image 
+              }
+  
+              self.showModal = true;
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+  
+          self.loading = false;
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+    },
+  };
+  </script>
+  <style scoped>
+  .user-panel {
+    margin: 10px auto;
+  }
+  .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/base/laborerInfo-list.vue

@@ -0,0 +1,394 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          客户管理
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-divider></el-divider>
+      <!--
+        要resetFields起作用，必须配置:model和prop
+      -->
+      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+        <el-form-item label="联系电话" prop="phone">
+          <el-input type="text" size="mini" v-model="queryModel.phone"></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-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length==0"
+          @click="handleBatchDelete"
+        >删除选中项</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="selection" width="55"></el-table-column>
+        <el-table-column  prop="name"  label="姓名"></el-table-column>
+        <el-table-column  prop="phone"  label="联系电话"></el-table-column>
+        <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
+        <el-table-column  prop="age"  label="年龄"></el-table-column>
+        
+        <el-table-column label="操作">
+          <template slot-scope="{row}" >
+            <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>
+            <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+          </template>
+        </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>
+      <laborerInfo-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></laborerInfo-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import laborerInfoApi from "@/api/base/laborerInfo";
+  import laborerInfoDetail from "./laborerInfo-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseArgonPartnerList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          realName: "",
+          phone:"",
+          idCard:"",
+          status:"",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+        batchImportVisible: false,
+        xlsLoading: false,
+        batchImportFileList: [],
+        chargingStationResult:[],
+        uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+        uploadXlsData: {
+            subFolder: "personInfo",
+        },
+        headers: {
+            Authorization: getToken(),
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex,exportFlag) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        
+        if(exportFlag!=null){
+            formData.append("exportFlag", exportFlag);
+            formData.append("pageSize", 10000);
+        }
+        else{
+            formData.append("pageSize", self.pageSize);
+        }
+        formData.append("realName", self.queryModel.realName);
+        formData.append("phone", self.queryModel.phone);
+        formData.append("idCard", self.queryModel.idCard);
+        formData.append("status", self.queryModel.status);
+  
+        self.loading = true;
+  
+        laborerInfoApi.pageList(formData).then(function(response) {
+          self.loading = false;
+            var jsonData = response.data;
+            if(jsonData.result) {
+                if(exportFlag){
+                    //导出
+                    self.$message({
+                        showClose: true,
+                        type: "success",
+                        message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+                        dangerouslyUseHTMLString: true,
+                        duration: 30000
+                    });
+                }
+                else{
+                    //分页查看
+                    var page = jsonData.data;
+
+                    self.tableData = page.data;
+                    self.totalPages = page.totalPages;
+                    self.totalElements = page.recordsTotal;
+                }
+            }
+            else{
+                self.$message.warning(jsonData.message);
+            }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      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() {
+        var self = this;
+        
+        self.modalTitle = "新增用户";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑用户";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            laborerInfoApi.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(() => {
+            laborerInfoApi.batchRemove(idList).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      exportXls() {
+        this.changePage(1,true);
+      },
+      handleCheck(record){
+        var self = this;
+  
+        this.$confirm("是否确认审核？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            laborerInfoApi.check(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: "审核成功!"
+              });
+            }
+          });
+        });
+      },
+        onDetailModalClose(refreshed) {
+            this.showModal = false;
+    
+            if(refreshed) {
+            this.changePage(this.pageIndex);
+            }
+        },
+        beforeUpload(file, fileList) {
+            //导入前判断
+            var self = this;
+            self.xlsLoading = true;
+            return true;
+        },
+        //批量导入-上传成功
+        handleBatchImportSuccess(response, file, fileList) {
+        var self = this;
+        self.xlsLoading = false;
+
+        if (response.result) {
+            self.$message.success(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+
+        } else {
+            //this.$message.error(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+            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,
+            });
+            }
+        }
+
+        this.batchImportVisible = false;
+        },
+        //批量导入-预览
+        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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+        "laborerInfo-detail":laborerInfoDetail
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/transportationInfo-detail.vue

@@ -0,0 +1,210 @@
+
+<template>
+    <el-dialog
+      :visible.sync="showDialog"
+      :title="title"
+      :modal-append-to-body="false"
+      style="text-align: left;"
+      @close="closeDialog"
+      :close-on-click-modal="false"
+      width="900px"
+    >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+          ref="form"
+          :model="formModel"
+          :rules="ruleValidate"
+          :label-width="'100px'"
+          :inline="true"
+        >
+        <el-form-item label="企业名称" prop="name">
+            <el-input v-model="formModel.name" placeholder="请输入企业名称" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="管理员姓名" prop="contact">
+            <el-input v-model="formModel.contact" placeholder="请输入真实姓名" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="管理员电话" prop="phone">
+            <el-input v-model="formModel.phone" placeholder="请输入联系电话" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="公司简介" prop="introduction">
+            <el-input v-model="formModel.introduction" placeholder="请输入公司简介" style="width: 300px"></el-input>
+          </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 { getToken } from "@/utils/auth"; // get token from cookie
+  import transportationInfoApi from "@/api/base/transportationInfo";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+          showPwd: true,
+          ruleValidate: {
+              userName: [
+              { required: true, message: "用户名不能为空", trigger: "blur" },
+              ],
+              realName: [
+              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              ],
+              phone: [
+              { required: true, message: "联系电话不能为空", trigger: "blur" },
+              ],
+              idCard: [
+              { required: true, message: "身份证号不能为空", trigger: "blur" },
+              ],
+              age: [
+              { required: true, message: "年龄不能为空", trigger: "blur" },
+              ],
+              gender: [
+              { required: true, message: "性别不能为空", trigger: "blur" },
+              ],
+          },
+          roleList: [],
+          formModel: {},
+          showDialog: true,
+          loading: false,
+          submitting: false,
+          enterpriseList:[],
+          //上传地址
+          uploadUrl: Constant.serverUrl + "/uploadPicture",
+          uploadData: {
+              subFolder: "water-tank",
+          },
+          fileUrl: "",
+          headers: {
+              Authorization: getToken(),
+          },
+      };
+    },
+    created() {
+    },
+    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 transportationInfoApi.add(self.formModel);
+              } else {
+                return transportationInfoApi.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);
+              }
+            });
+          }
+        });
+      },
+      handleAvatarSuccess(res, file) {
+          var self = this;
+          self.formModel.image = res.data;
+  
+          self.fileUrl =
+            res.data + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
+      },
+      beforeAvatarUpload(file) {
+          const isLt2M = file.size / 1024 / 1024 < 2;
+          if (!isLt2M) {
+              this.$message.error('上传头像图片大小不能超过 2MB!');
+          }
+          return isLt2M;
+      }
+    },
+    async mounted() {
+      var self = this;
+      self.loading = true;
+  
+      (function () {
+        if (self.businessKey != null && self.businessKey.length > 0) {
+          return transportationInfoApi.edit(self.businessKey);
+        } else {
+          return transportationInfoApi.create();
+        }
+      })()
+        .then((response) => {
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+              self.formModel = jsonData.data;
+  
+              let image = self.formModel.image;
+              if (image != null) {
+                  self.fileUrl = image 
+              }
+  
+              self.showModal = true;
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+  
+          self.loading = false;
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+    },
+  };
+  </script>
+  <style scoped>
+  .user-panel {
+    margin: 10px auto;
+  }
+  .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/base/transportationInfo-list.vue

@@ -0,0 +1,394 @@
+<template>
+    <div>
+      <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          <a href="#">基础信息管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+          客户管理
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-divider></el-divider>
+      <!--
+        要resetFields起作用，必须配置:model和prop
+      -->
+      <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
+        <el-form-item label="联系电话" prop="phone">
+          <el-input type="text" size="mini" v-model="queryModel.phone"></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-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          :disabled="multipleSelection.length==0"
+          @click="handleBatchDelete"
+        >删除选中项</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="selection" width="55"></el-table-column>
+        <el-table-column  prop="name"  label="运输方名称"></el-table-column>
+        <el-table-column  prop="contact"  label="联系人" width="180"></el-table-column>
+        <el-table-column  prop="phone"  label="联系电话" width="180"></el-table-column>
+        <el-table-column  prop="introduction"  label="公司简介" width="180"></el-table-column>
+        
+        <el-table-column label="操作">
+          <template slot-scope="{row}" >
+            <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>
+            <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+          </template>
+        </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>
+      <transportationInfo-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></transportationInfo-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import transportationInfoApi from "@/api/base/transportationInfo";
+  import transportationInfoDetail from "./transportationInfo-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseTransportationInfoList',
+    data() {
+      var self = this;
+  
+      return {
+        queryModel: {
+          realName: "",
+          phone:"",
+          idCard:"",
+          status:"",
+        },
+        loading: false,
+        tableData: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPages: 0,
+        totalElements: 0,
+        field: "",
+        direction: "",
+        pageSizeList: [10, 20, 30],
+        multipleSelection: [],
+        modalTitle: "",      
+        businessKey: "",
+        showModal: false,
+        dialogFormVisible:false,
+        newPassword:"",
+        roleResult:[],
+        props: {
+          // 配置项（必选）
+          value: "id",
+          label: "name",
+          children: "children"
+        },
+        batchImportVisible: false,
+        xlsLoading: false,
+        batchImportFileList: [],
+        chargingStationResult:[],
+        uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+        uploadXlsData: {
+            subFolder: "personInfo",
+        },
+        headers: {
+            Authorization: getToken(),
+        },
+      };
+    },
+    methods: {
+      changePage(pageIndex,exportFlag) {
+        var self = this;
+  
+        console.log(pageIndex);
+  
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+  
+        formData.append("pageIndex", self.pageIndex);
+        
+        if(exportFlag!=null){
+            formData.append("exportFlag", exportFlag);
+            formData.append("pageSize", 10000);
+        }
+        else{
+            formData.append("pageSize", self.pageSize);
+        }
+        formData.append("realName", self.queryModel.realName);
+        formData.append("phone", self.queryModel.phone);
+        formData.append("idCard", self.queryModel.idCard);
+        formData.append("status", self.queryModel.status);
+  
+        self.loading = true;
+  
+        transportationInfoApi.pageList(formData).then(function(response) {
+          self.loading = false;
+            var jsonData = response.data;
+            if(jsonData.result) {
+                if(exportFlag){
+                    //导出
+                    self.$message({
+                        showClose: true,
+                        type: "success",
+                        message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+                        dangerouslyUseHTMLString: true,
+                        duration: 30000
+                    });
+                }
+                else{
+                    //分页查看
+                    var page = jsonData.data;
+
+                    self.tableData = page.data;
+                    self.totalPages = page.totalPages;
+                    self.totalElements = page.recordsTotal;
+                }
+            }
+            else{
+                self.$message.warning(jsonData.message);
+            }
+        }).catch((error)=>{
+          self.loading = false;
+        });
+      },
+      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() {
+        var self = this;
+        
+        self.modalTitle = "新增用户";
+        self.businessKey = "";
+        self.showModal = true;
+      },
+      handleEdit(record) {
+        var self = this;
+        
+        self.modalTitle = "编辑用户";
+        self.businessKey = record.id;
+        self.showModal = true;
+      },
+      handleDelete(record) {
+        var self = this;
+  
+        this.$confirm("是否确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            transportationInfoApi.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(() => {
+            transportationInfoApi.batchRemove(idList).then(function(response) {
+            var jsonData = response.data;
+  
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+  
+              self.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+            }
+          });
+        });
+      },
+      exportXls() {
+        this.changePage(1,true);
+      },
+      handleCheck(record){
+        var self = this;
+  
+        this.$confirm("是否确认审核？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            transportationInfoApi.check(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: "审核成功!"
+              });
+            }
+          });
+        });
+      },
+        onDetailModalClose(refreshed) {
+            this.showModal = false;
+    
+            if(refreshed) {
+            this.changePage(this.pageIndex);
+            }
+        },
+        beforeUpload(file, fileList) {
+            //导入前判断
+            var self = this;
+            self.xlsLoading = true;
+            return true;
+        },
+        //批量导入-上传成功
+        handleBatchImportSuccess(response, file, fileList) {
+        var self = this;
+        self.xlsLoading = false;
+
+        if (response.result) {
+            self.$message.success(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+
+        } else {
+            //this.$message.error(response.message);
+            this.batchImportFileList = [];
+            this.changePage(1);
+
+            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,
+            });
+            }
+        }
+
+        this.batchImportVisible = false;
+        },
+        //批量导入-预览
+        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() {
+      var self = this;
+      this.changePage(1);
+    },
+    components: {
+        "transportationInfo-detail":transportationInfoDetail
+    }
+  };
+  </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 {
+    padding: 10px;
+    text-align: left;
+  }
+  </style>

src/views/base/workOrder-detail.vue

@@ -63,13 +63,34 @@
                             <el-input v-model="formModel2.address" placeholder="请输入所在地" style="width: 300px"></el-input>
                         </el-form-item>
                         <el-form-item label="施工位置" prop="location">
-                            <el-input v-model="formModel2.location" placeholder="请输入所在地" style="width: 300px"></el-input>
+                            <el-select v-model="formModel2.location" placeholder="请选择" style="width: 300px">
+                              <el-option
+                                v-for="item in locationList"
+                                :key="item.value"
+                                :label="item.name"
+                                :value="item.value">
+                              </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="施工环境" prop="environment">
-                            <el-input v-model="formModel2.environment" placeholder="请输入所在地" style="width: 300px"></el-input>
+                            <el-select v-model="formModel2.environment" placeholder="请选择" style="width: 300px">
+                              <el-option
+                                v-for="item in environmentList"
+                                :key="item.value"
+                                :label="item.name"
+                                :value="item.value">
+                              </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="水箱材质" prop="material">
-                            <el-input v-model="formModel2.material" placeholder="请输入所在地" style="width: 300px"></el-input>
+                            <el-select v-model="formModel2.material" placeholder="请选择" style="width: 300px">
+                              <el-option
+                                v-for="item in materialList"
+                                :key="item.value"
+                                :label="item.name"
+                                :value="item.value">
+                              </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="水箱体积" prop="volume">
                             <el-input v-model="formModel2.volume" placeholder="请输入所在地" style="width: 300px">
@@ -82,7 +103,14 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="施工难度" prop="difficulty">
-                            <el-input v-model="formModel2.difficulty" placeholder="请输入所在地" style="width: 300px"></el-input>
+                            <el-select v-model="formModel2.difficulty" placeholder="请选择" style="width: 300px">
+                              <el-option
+                                v-for="item in difficultyList"
+                                :key="item.value"
+                                :label="item.name"
+                                :value="item.value">
+                              </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="额外补助" prop="subsidyType">
                             <el-input v-model="formModel2.subsidyType" placeholder="请输入所在地" style="width: 300px"></el-input>
@@ -353,16 +381,10 @@
           imageList:[],
           constructionProgressList:[],
           reverse: true,
-          activities: [{
-            content: '活动按期开始',
-            timestamp: '2018-04-15'
-          }, {
-            content: '通过审核',
-            timestamp: '2018-04-13'
-          }, {
-            content: '创建成功',
-            timestamp: '2018-04-11'
-          }]
+          locationList:[],
+          environmentList:[],
+          materialList:[],
+          difficultyList:[],
       };
     },
     created() {
@@ -396,6 +418,42 @@
         
         self.orderModelList = jsonData.data;
       });
+
+      dataDictionaryApi.findByCatalogName({
+        catalogName: "施工位置",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        
+        self.locationList = jsonData.data;
+      });
+
+      dataDictionaryApi.findByCatalogName({
+        catalogName: "施工环境",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        
+        self.environmentList = jsonData.data;
+      });
+
+      dataDictionaryApi.findByCatalogName({
+        catalogName: "水箱材质",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        
+        self.materialList = jsonData.data;
+      });
+
+      dataDictionaryApi.findByCatalogName({
+        catalogName: "施工难度",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        
+        self.difficultyList = jsonData.data;
+      });
     },
     methods: {
       closeDialog() {