Merge branch 'master' of http://47.92.161.104:10080/yanliming/water-tank-installation-portal

.env.production

@@ -1,4 +1,4 @@
 OUT_PUT_DIR=dist/water-tank-installation-portal
 
-VUE_APP_BACKEND_URL=http://10.10.3.16:8080/water-tank-installation-server
+VUE_APP_BACKEND_URL=http://39.97.193.160:8080/water-tank-installation-server
 #VUE_APP_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/

src/api/base/aboutUs.js

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

src/api/base/customerInfo.js

@@ -33,6 +33,11 @@ function remove(id) {
   return request.post(constant.serverUrl + "/base/customerInfo/delete/" + id);
 }
 
+function checked(id) {
+  return request.post(constant.serverUrl + "/base/customerInfo/checked/" + id);
+}
+
+
 function batchRemove(idList) {
   return request.post(constant.serverUrl + "/base/customerInfo/batchDelete", idList, {
     headers: {
@@ -42,5 +47,5 @@ function batchRemove(idList) {
 }
 
 export default {
-  pageList, create, edit, add, update, remove, batchRemove
+  pageList, create, edit, add, update, remove, batchRemove,checked
 }

src/api/base/feedback.js

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

src/api/base/messageInfo.js

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

src/api/base/workOrder.js

@@ -33,6 +33,10 @@ function remove(id) {
   return request.post(constant.serverUrl + "/base/workOrder/delete/" + id);
 }
 
+function confirm(id) {
+  return request.post(constant.serverUrl + "/base/workOrder/confirm/" + id);
+}
+
 function batchRemove(idList) {
   return request.post(constant.serverUrl + "/base/workOrder/batchDelete", idList, {
     headers: {
@@ -42,5 +46,5 @@ function batchRemove(idList) {
 }
 
 export default {
-  pageList, create, edit, add, update, remove, batchRemove
+  pageList, create, edit, add, update, remove, batchRemove,confirm
 }

src/routers/modules/base.js

@@ -71,6 +71,42 @@ var routers = [
                         title: '运输方管理'
                 }
         },
+        {
+                path: '/base/feedback/list',
+                name: 'baseFeedbackList',
+                // 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/feedback-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '意见反馈'
+                }
+        },
+        {
+                path: '/base/messageInfo/list',
+                name: 'baseMessageInfoList',
+                // 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/messageInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '消息列表'
+                }
+        },
+        {
+                path: '/base/aboutUs/list',
+                name: 'baseAboutUsList',
+                // 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/aboutUs-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '配置信息'
+                }
+        },
 ]
 
 export default routers;

src/views/base/aboutUs-detail.vue

@@ -0,0 +1,206 @@
+
+<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'"
+        >
+        <el-form-item label="标题" prop="title">
+            <el-input v-model="formModel.title" placeholder="请输入客服电话" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="用户协议" prop="content">
+            <mce-editor
+                ref="editor"
+                uploadName="upfile"
+                v-model="formModel.content"
+                :url="uploadUrl1"
+                :config="editorConfig"
+                style="width: 90%"
+            ></mce-editor>
+          </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 aboutUsApi from "@/api/base/aboutUs";
+  import MceEditor from "@/components/Tinymce";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+          showPwd: true,
+          ruleValidate: {
+              name: [
+              { required: true, message: "姓名不能为空", trigger: "blur" },
+              ],
+              phone: [
+              { required: true, message: "联系电话不能为空", trigger: "blur" },
+              ],
+              idCard: [
+              { 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(),
+          },
+          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+          editorConfig: {
+            height: 300,
+            width: 660,
+          },
+      };
+    },
+    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 aboutUsApi.add(self.formModel);
+              } else {
+                return aboutUsApi.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 aboutUsApi.edit(self.businessKey);
+        } else {
+          return aboutUsApi.create();
+        }
+      })()
+        .then((response) => {
+          self.loading = false;
+          var jsonData = response.data;
+  
+          if (jsonData.result) {
+              self.formModel = jsonData.data;
+  
+              if (self.formModel.content != null) {
+                self.$refs.editor.setContent(self.formModel.content);
+              }
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+
+        })
+        .catch((error) => {
+          self.$message.error(error + "");
+          self.loading = false;
+        });
+    },
+    components: {
+        "mce-editor": MceEditor,
+    },
+  };
+  </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/aboutUs-list.vue

@@ -0,0 +1,393 @@
+<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-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="code"  label="数据代码"></el-table-column>
+        <el-table-column  prop="type"  label="类型"></el-table-column>
+        <el-table-column  prop="title"  label="标题说明"></el-table-column>
+        <el-table-column  prop="content"  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>
+      <aboutUs-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></aboutUs-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import aboutUsApi from "@/api/base/aboutUs";
+  import aboutUsDetail from "./aboutUs-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseAboutUsList',
+    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;
+  
+        aboutUsApi.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(() => {
+            aboutUsApi.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(() => {
+            aboutUsApi.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(() => {
+            aboutUsApi.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: {
+        "aboutUs-detail":aboutUsDetail
+    }
+  };
+  </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/argonPartner-detail.vue

@@ -20,15 +20,25 @@
         <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 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 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-item label="隐私协议" prop="introduction">
+            <mce-editor
+                ref="editor"
+                uploadName="upfile1"
+                v-model="formModel.introduction"
+                :url="uploadUrl1"
+                :config="editorConfig"
+                style="width: 100%"
+            ></mce-editor>
+          </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -43,6 +53,8 @@
   import Constant from "@/constant";
   import { getToken } from "@/utils/auth"; // get token from cookie
   import argonPartnerApi from "@/api/base/argonPartner";
+  import MceEditor from "@/components/Tinymce";
+  
   
   export default {
     props: ["businessKey", "title"],
@@ -50,11 +62,11 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
+            name: [
+              { required: true, message: "企业名称不能为空", trigger: "blur" },
               ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              contact: [
+              { required: true, message: "联系人姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },
@@ -84,6 +96,12 @@
           headers: {
               Authorization: getToken(),
           },
+          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+          editorConfig: {
+            height: 300,
+            width: 660,
+          },
+          
       };
     },
     created() {
@@ -159,9 +177,8 @@
           if (jsonData.result) {
               self.formModel = jsonData.data;
   
-              let image = self.formModel.image;
-              if (image != null) {
-                  self.fileUrl = image 
+              if (self.formModel.introduction != null) {
+                self.$refs.editor.setContent(self.formModel.introduction);
               }
   
               self.showModal = true;
@@ -177,6 +194,7 @@
         });
     },
     components: {
+      "mce-editor": MceEditor,
     },
   };
   </script>

src/views/base/customerInfo-detail.vue

@@ -10,44 +10,66 @@
       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="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-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="region">
-            <el-input v-model="formModel.region" placeholder="请输入所在地区" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="头像" prop="image">
-              <el-upload
-                  style="width:300px"
-                  class="avatar-uploader"
-                  name="photoFile"
-                  :action="uploadUrl"
-                  :headers="headers"
-                  :data="uploadData"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccess"
-                  :before-upload="beforeAvatarUpload">
-                  <img v-if="fileUrl" :src="fileUrl" class="avatar">
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-          </el-form-item>
-        </el-form>
+        <el-tabs v-model="activeName" type="card" >
+          <el-tab-pane label="用户信息" name="first">
+            <div class="div1">
+            <el-form
+              ref="form"
+              :model="formModel"
+              :rules="ruleValidate"
+              :label-width="'100px'"
+              :inline="true"
+            >
+            <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-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="region">
+                <el-input v-model="formModel.region" placeholder="请输入所在地区" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="统一信用代码" prop="businessCode">
+                <el-input v-model="formModel.businessCode" placeholder="请输入统一社会信用代码" style="width: 300px"></el-input>
+              </el-form-item>
+              <el-form-item label="头像" prop="image">
+                  <el-upload
+                      style="width:300px"
+                      class="avatar-uploader"
+                      name="photoFile"
+                      :action="uploadUrl"
+                      :headers="headers"
+                      :data="uploadData"
+                      :show-file-list="false"
+                      :on-success="handleAvatarSuccess"
+                      :before-upload="beforeAvatarUpload">
+                      <img v-if="fileUrl" :src="fileUrl" class="avatar">
+                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+              </el-form-item>
+            </el-form>
+          </div>
+          </el-tab-pane>
+          <el-tab-pane label="营业执照" name="second">
+            <div class="div2">
+              <span v-for="(item,index) in formModel.businessLicenseList" :key="index">
+                <e-link :herf="item"  target="_blank">
+                <el-image
+                style="width: 300px; height: 300px"
+                :src="item"
+                fit="fit"></el-image>
+                </e-link>
+              </span>
+
+            </div>
+          </el-tab-pane>
+        </el-tabs>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
@@ -68,17 +90,14 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
-              ],
               realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              { required: true, message: "管理员姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },
               ],
-              idCard: [
-              { required: true, message: "身份证号不能为空", trigger: "blur" },
+              companyName: [
+              { required: true, message: "企业名称不能为空", trigger: "blur" },
               ],
               age: [
               { required: true, message: "年龄不能为空", trigger: "blur" },
@@ -89,6 +108,7 @@
           },
           roleList: [],
           formModel: {},
+          formModel2:{},
           showDialog: true,
           loading: false,
           submitting: false,
@@ -102,6 +122,7 @@
           headers: {
               Authorization: getToken(),
           },
+          activeName: 'first'
       };
     },
     created() {
@@ -225,4 +246,10 @@
       height: 178px;
       display: block;
     }
+    .div1{
+      padding:10px
+    }
+    .div2{
+      padding:30px
+    }
   </style>

src/views/base/customerInfo-list.vue

@@ -17,9 +17,6 @@
         <el-form-item label="联系电话" prop="phone">
           <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
         </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input type="text" size="mini" v-model="queryModel.idCard"></el-input>
-        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -38,7 +35,6 @@
       </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"
@@ -66,6 +62,7 @@
         <el-table-column  prop="phone"  label="联系电话"></el-table-column>
         <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
         <el-table-column  prop="region"  label="所在地区" width="180"></el-table-column>
+        <el-table-column  prop="businessCode"  label="统一社会信用代码" width="180"></el-table-column>
         <el-table-column  prop="status"  label="审核状态" >
           <template slot-scope="{row}">
             <span v-if="row.status=='0'">未审核</span>
@@ -75,6 +72,7 @@
         <el-table-column label="操作">
           <template slot-scope="{row}" >
             <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>
+            <el-link v-if="row.status=='0'" type="success" @click="handleChecked(row)">审核-</el-link>
             <el-link type="danger" @click="handleDelete(row)">删除</el-link>
           </template>
         </el-table-column>
@@ -257,6 +255,31 @@
           });
         });
       },
+      handleChecked(record) {
+        var self = this;
+  
+        this.$confirm("是否确认审核？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            customerInfoApi.checked(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;
   

src/views/base/feedback-list.vue

@@ -0,0 +1,405 @@
+<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-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="typeN"  label="类型"></el-table-column>
+        <el-table-column  prop="title"  label="标题"></el-table-column>
+        <el-table-column  prop="content"  label="内容" width="400"></el-table-column>
+        <el-table-column  prop="imageList"  label="图片" width="300">
+            <template  slot-scope="{row}">
+                <span v-for="(item,index) in row.imageList" :key="index" style="margin-left:10px">
+                    <el-link :href="item" target="_blank">
+                    <el-image
+                    style="width: 50px; height: 50px"
+                    :src="item"
+                    fit="fit"></el-image>
+                    </el-link>
+                </span>
+
+            </template>
+        </el-table-column>
+        <el-table-column  prop="people"  label="反馈人" ></el-table-column>
+        
+        <el-table-column label="操作">
+          <template slot-scope="{row}" >
+            <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 feedbackApi from "@/api/base/feedback";
+  import laborerInfoDetail from "./feedback-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseFeedbackList',
+    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;
+  
+        feedbackApi.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(() => {
+            feedbackApi.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(() => {
+            feedbackApi.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(() => {
+            feedbackApi.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/laborerInfo-detail.vue

@@ -17,8 +17,8 @@
           :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 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>
@@ -50,11 +50,8 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
-              ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              name: [
+              { required: true, message: "姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },
@@ -62,12 +59,6 @@
               idCard: [
               { required: true, message: "身份证号不能为空", trigger: "blur" },
               ],
-              age: [
-              { required: true, message: "年龄不能为空", trigger: "blur" },
-              ],
-              gender: [
-              { required: true, message: "性别不能为空", trigger: "blur" },
-              ],
           },
           roleList: [],
           formModel: {},

src/views/base/messageInfo-list.vue

@@ -0,0 +1,399 @@
+<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-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="categoryN"  label="消息方式"></el-table-column>
+        <el-table-column  prop="typeN"  label="类型"></el-table-column>
+        <el-table-column  prop="title"  label="标题"></el-table-column>
+        <el-table-column  prop="content"  label="内容" width="400"></el-table-column>
+        <el-table-column  prop="recipientName"  label="接收方" ></el-table-column>
+        <el-table-column  prop="isRead"  label="是否已读" >
+            <template slot-scope="{row}" >
+                <span v-if="row.isRead">是</span>
+                <span v-else>否</span>
+            </template>
+        </el-table-column>
+        <el-table-column  prop="sendTime"  label="发送时间" width="150"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{row}" >
+            <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>
+      <messageInfo-detail
+        v-if="showModal"
+        ref="userDetail"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+      ></messageInfo-detail>
+    </div>
+  </template>
+  <script>
+  import Constant from "@/constant";
+  import messageInfoApi from "@/api/base/messageInfo";
+  import messageInfoDetail from "./messageInfo-detail";
+  import { getToken } from "@/utils/auth"; // get token from cookie
+  
+  export default {
+    name: 'baseMessageInfoList',
+    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;
+  
+        messageInfoApi.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(() => {
+            messageInfoApi.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(() => {
+            messageInfoApi.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(() => {
+            messageInfoApi.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: {
+        "messageInfo-detail":messageInfoDetail
+    }
+  };
+  </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/technicianInfo-detail.vue

@@ -0,0 +1,246 @@
+
+<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="realName">
+            <el-input v-model="formModel.realName" 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="region">
+            <el-input v-model="formModel.region" placeholder="请输入所在地区" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="性别" prop="gender">
+            <el-input v-model="formModel.gender" 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-item label="服务信息" prop="serviceInfo">
+            <el-input v-model="formModel.serviceInfo" placeholder="请输入服务信息" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="业务范围" prop="businessScope">
+            <el-input v-model="formModel.businessScope" placeholder="请输入业务范围" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="推广码" prop="promoCode">
+            <el-input v-model="formModel.promoCode" placeholder="请输入推广码" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-input v-model="formModel.status" placeholder="请输入状态" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="会员等级" prop="level">
+            <el-input v-model="formModel.level" placeholder="请输入会员等级" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="保证金" prop="businessCode">
+            <el-input v-model="formModel.businessCode" placeholder="请输入统一社会信用代码" style="width: 300px"></el-input>
+          </el-form-item>
+          <el-form-item label="头像" prop="image">
+              <el-upload
+                  style="width:300px"
+                  class="avatar-uploader"
+                  name="photoFile"
+                  :action="uploadUrl"
+                  :headers="headers"
+                  :data="uploadData"
+                  :show-file-list="false"
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload">
+                  <img v-if="fileUrl" :src="fileUrl" class="avatar">
+                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+          </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 technicianInfoApi from "@/api/base/technicianInfo";
+  
+  export default {
+    props: ["businessKey", "title"],
+    data() {
+      return {
+          showPwd: true,
+          ruleValidate: {
+              realName: [
+              { required: true, message: "管理员姓名不能为空", trigger: "blur" },
+              ],
+              phone: [
+              { required: true, message: "联系电话不能为空", trigger: "blur" },
+              ],
+              companyName: [
+              { 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 technicianInfoApi.add(self.formModel);
+              } else {
+                return technicianInfoApi.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 technicianInfoApi.edit(self.businessKey);
+        } else {
+          return technicianInfoApi.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/technicianInfo-list.vue

@@ -50,20 +50,6 @@
           :disabled="multipleSelection.length==0"
           @click="handleBatchDelete"
         >删除选中项</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload"
-          @click="batchImportVisible = true"
-        >导入</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          plain
-          icon="el-icon-upload2"
-          @click="exportXls"
-        >导出数据</el-button>
       </el-row>
       <el-table
         :data="tableData"
@@ -75,7 +61,7 @@
       >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column  prop="realName"  label="姓名"></el-table-column>
-        <el-table-column  prop="phone"  label="联系电话"></el-table-column>
+        <el-table-column  prop="phone"  label="联系电话" width="150"></el-table-column>
         <el-table-column  prop="idCard"  label="身份证号" width="180"></el-table-column>
         <el-table-column  prop="gender"  label="性别">
             <template slot-scope="{row}">
@@ -85,18 +71,18 @@
         </el-table-column>
         <el-table-column  prop="age"  label="年龄"></el-table-column>
         <el-table-column  prop="region"  label="所在地区" width="180"></el-table-column>
-        <el-table-column  prop="applicationCheckTime"  label="申请认证时间" width="180"></el-table-column>
-        <el-table-column  prop="checkTime"  label="认证时间" width="180"></el-table-column>
+        <el-table-column  prop="applicationCheckTime"  label="申请认证时间" width="150"></el-table-column>
+        <el-table-column  prop="checkTime"  label="认证时间" width="150"></el-table-column>
         <el-table-column  prop="status"  label="认证状态">
             <template slot-scope="{row}">
                 <span v-if="row.status=='0'" style="color: #F56C6C;">未认证</span>
                 <span v-else-if="row.status=='1'" style="color: #67C23A;">已认证</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="180">
           <template slot-scope="{row}" >
-            <el-link type="primary" @click="handleEdit(row)">编辑--</el-link>
-            <el-link type="success" v-if="row.status==0&&row.idCard!=null" @click="handleCheck(row)">认证--</el-link>
+            <el-link type="primary" @click="handleEdit(row)">编辑-</el-link>
+            <el-link type="success" v-if="row.status==0&&row.idCard!=null" @click="handleCheck(row)">认证-</el-link>
             <el-link type="danger" @click="handleDelete(row)">删除</el-link>
           </template>
         </el-table-column>

src/views/base/transportationInfo-detail.vue

@@ -20,15 +20,25 @@
         <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-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-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-item label="隐私协议" prop="introduction">
+            <mce-editor
+                ref="editor"
+                uploadName="upfile1"
+                v-model="formModel.introduction"
+                :url="uploadUrl1"
+                :config="editorConfig"
+                style="width: 100%"
+            ></mce-editor>
+          </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -43,6 +53,7 @@
   import Constant from "@/constant";
   import { getToken } from "@/utils/auth"; // get token from cookie
   import transportationInfoApi from "@/api/base/transportationInfo";
+  import MceEditor from "@/components/Tinymce";
   
   export default {
     props: ["businessKey", "title"],
@@ -50,11 +61,11 @@
       return {
           showPwd: true,
           ruleValidate: {
-              userName: [
-              { required: true, message: "用户名不能为空", trigger: "blur" },
+              name: [
+              { required: true, message: "企业名称不能为空", trigger: "blur" },
               ],
-              realName: [
-              { required: true, message: "真实名称不能为空", trigger: "blur" },
+              contact: [
+              { required: true, message: "联系人姓名不能为空", trigger: "blur" },
               ],
               phone: [
               { required: true, message: "联系电话不能为空", trigger: "blur" },
@@ -84,6 +95,11 @@
           headers: {
               Authorization: getToken(),
           },
+          uploadUrl1: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+          editorConfig: {
+            height: 300,
+            width: 660,
+          },
       };
     },
     created() {
@@ -159,11 +175,11 @@
           if (jsonData.result) {
               self.formModel = jsonData.data;
   
-              let image = self.formModel.image;
-              if (image != null) {
-                  self.fileUrl = image 
+              if (self.formModel.introduction != null) {
+                self.$refs.editor.setContent(self.formModel.introduction);
               }
   
+  
               self.showModal = true;
           } else {
             self.$message.error(jsonData.message + "");
@@ -177,6 +193,7 @@
         });
     },
     components: {
+      "mce-editor": MceEditor,
     },
   };
   </script>

src/views/base/workOrder-detail.vue

@@ -10,39 +10,14 @@
       width="1500px"
     >
       <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="number">
-            <el-input v-model="formModel.number" placeholder="请输入真实姓名" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="标题" prop="title">
-            <el-input v-model="formModel.title" placeholder="请输入联系电话" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="地址" prop="address">
-            <el-input v-model="formModel.address" placeholder="请输入身份证号" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="日期" prop="date">
-            <el-input v-model="formModel.date" placeholder="请输入所在地区" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="报价" prop="price">
-            <el-input v-model="formModel.price" placeholder="请输入报价" style="width: 300px"></el-input>
-          </el-form-item>
-          <el-form-item label="支付状态" prop="payStatus">
-            <el-select v-model="formModel.payStatus" placeholder="请选择" style="width: 300px">
-              <el-option
-                v-for="item in paystatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
+        <el-descriptions title="基本信息">
+          <el-descriptions-item label="工单号">{{formModel.number}}</el-descriptions-item>
+          <el-descriptions-item label="标题">{{formModel.title}}</el-descriptions-item>
+          <el-descriptions-item label="地址">{{formModel.address}}</el-descriptions-item>
+          <el-descriptions-item label="日期">{{formModel.date}}</el-descriptions-item>
+          <el-descriptions-item label="报价">{{formModel.price}}</el-descriptions-item>
+          <el-descriptions-item label="支付状态">{{formModel.payStatusN}}</el-descriptions-item>
+      </el-descriptions>
       </div>
       <div>
         <el-tabs v-model="activeName" type="card">
@@ -52,102 +27,43 @@
                         <span>工单信息</span>
                     </div>
                     <div>
-                        <el-form
-                            ref="form"
-                            :model="formModel2"
-                            :rules="ruleValidate"
-                            :label-width="'150px'"
-                            :inline="true"
-                            >
-                        <el-form-item label="所在地" prop="address">
-                            <el-input v-model="formModel2.address" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="施工位置" prop="location">
-                            <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-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-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">
-                              <template slot="append">m³</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="异型水箱补贴" prop="amount">
-                            <el-input v-model="formModel2.amount" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">元</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="施工难度" prop="difficulty">
-                            <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>
-                        </el-form-item>
-                        <el-form-item label="补贴金额" prop="subsidyAmount">
-                            <el-input v-model="formModel2.subsidyAmount" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">元</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="工程总预算" prop="budget">
-                            <el-input v-model="formModel2.budget" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">元</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="工期要求" prop="period">
-                            <el-input v-model="formModel2.period" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">月</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="通过后打款比例" prop="completionPayProp">
-                            <el-input v-model="formModel2.completionPayProp" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">%</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="驻地条件要求" prop="requirement">
-                            <el-input v-model="formModel2.requirement" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="施工阶段要求" prop="stageRequirements">
-                            <el-input v-model="formModel2.stageRequirements" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="验收标准" prop="acceptanceCriteria">
-                            <el-input v-model="formModel2.acceptanceCriteria" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="售后要求" prop="salesRequirement">
-                            <el-input v-model="formModel2.salesRequirement" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        </el-form>
+                      <el-descriptions>
+                          <el-descriptions-item label="所在地">
+                            <div class="box">{{formModel2.location}}</div>
+                          </el-descriptions-item>
+                          <el-descriptions-item label="施工位置">
+                            {{formModel2.constructionLocationName}}
+                          </el-descriptions-item>
+                          <el-descriptions-item label="施工环境">{{formModel2.environmentName}}</el-descriptions-item>
+                          <el-descriptions-item label="水箱材质">{{formModel2.materialN}}</el-descriptions-item>
+                          <el-descriptions-item label="水箱体积">{{formModel2.size}}{{formModel2.sizeUnitN}}</el-descriptions-item>
+                          <el-descriptions-item label="施工难度">{{formModel2.difficultyName}}</el-descriptions-item>
+                          <el-descriptions-item label="逾期入场补偿金">{{formModel2.amount}}</el-descriptions-item>
+                          <el-descriptions-item label="工程总预算">{{formModel2.budget}}</el-descriptions-item>
+                          <el-descriptions-item label="工期要求">{{formModel2.period}}</el-descriptions-item>
+                          <el-descriptions-item label="通过后打款比例">{{formModel2.completionPayProp}}</el-descriptions-item>
+                          <el-descriptions-item label="驻地条件要求">
+                            <div class="box">
+                              {{formModel2.requirement}}
+                            </div>
+                          </el-descriptions-item>
+                          <el-descriptions-item label="施工阶段要求">
+                            <div class="box">
+                              {{formModel2.stageRequirements}}
+                            </div>
+                          </el-descriptions-item>
+
+                          <el-descriptions-item label="验收标准">
+                            <div class="box">
+                              {{formModel2.acceptanceCriteria}}
+                            </div>
+                          </el-descriptions-item>
+                          <el-descriptions-item label="售后要求">
+                            <div class="box">
+                              {{formModel2.salesRequirement}}
+                            </div>
+                          </el-descriptions-item>
+                      </el-descriptions>
                     </div>
                 </el-card>
                 <el-card class="box-card">
@@ -155,47 +71,23 @@
                         <span>接单要求</span>
                     </div>
                     <div>
-                        <el-form
-                            ref="form"
-                            :model="formModel3"
-                            :rules="ruleValidate"
-                            :label-width="'250px'"
-                            :inline="true"
-                            >
-                        <el-form-item label="保证金" prop="amount">
-                            <el-input v-model="formModel3.amount" placeholder="请输入所在地" style="width: 300px">
-                              <template slot="append">元</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="师傅完成工单量" prop="completedNum">
-                            <el-input v-model="formModel3.completedNum" style="width: 300px">
-                              <template slot="append">单</template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item label="订单发布模式" prop="orderModel">
-                            <el-select v-model="formModel3.orderModel" placeholder="请选择" style="width: 300px">
-                              <el-option
-                                v-for="item in orderModelList"
-                                :key="item.value"
-                                :label="item.name"
-                                :value="item.value">
-                              </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="是否要求师傅具有施工资质" prop="isQualification">
-                            <el-switch
-                            style="width: 300px"
-                              v-model="formModel3.isQualification">
-                            </el-switch>
-                        </el-form-item>
-                        <el-form-item label="是否要求师傅上传购买保险凭证" prop="isInsuranceCertificate">
-                            <el-switch
-                            style="width: 300px"
-                              v-model="formModel3.isInsuranceCertificate">
-                            </el-switch>
-                        </el-form-item>
-
-                    </el-form>
+                      <el-descriptions>
+                          <el-descriptions-item label="保证金">{{formModel3.amount}}</el-descriptions-item>
+                          <el-descriptions-item label="师傅完成工单量">{{formModel3.completedNum}}</el-descriptions-item>
+                          <el-descriptions-item label="订单发布模式">{{formModel3.orderModelN}}</el-descriptions-item>
+                          <el-descriptions-item label="是否要求师傅具有施工资质">
+                            <template>
+                              <span v-if="formModel3.isQualification">是</span>
+                              <span v-else>否</span>
+                            </template>
+                          </el-descriptions-item>
+                          <el-descriptions-item label="是否要求师傅上传购买保险凭证">
+                            <template>
+                              <span v-if="formModel3.isInsuranceCertificate">是</span>
+                              <span v-else>否</span>
+                            </template>
+                          </el-descriptions-item>
+                      </el-descriptions>
                     </div>
                 </el-card>
                 <el-card class="box-card">
@@ -203,20 +95,10 @@
                         <span>客户信息</span>
                     </div>
                     <div>
-                        <el-form
-                            ref="form"
-                            :model="formModel4"
-                            :rules="ruleValidate"
-                            :label-width="'150px'"
-                            :inline="true"
-                            >
-                        <el-form-item label="客户名称">
-                            <el-input v-model="formModel4.customerName" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="联系方式" prop="phone">
-                            <el-input v-model="formModel4.customerPhone" placeholder="请输入所在地" style="width: 300px"></el-input>
-                        </el-form-item>
-                    </el-form>
+                      <el-descriptions>
+                          <el-descriptions-item label="客户名称">{{formModel4.customerName}}</el-descriptions-item>
+                          <el-descriptions-item label="联系方式">{{formModel4.customerPhone}}</el-descriptions-item>
+                      </el-descriptions>
                     </div>
                 </el-card>
                 <el-card class="box-card">
@@ -224,30 +106,11 @@
                     <span>订单信息</span>
                     </div>
                     <div>
-                        <el-form
-                            ref="form"
-                            :model="formModel5"
-                            :rules="ruleValidate"
-                            :label-width="'150px'"
-                            :inline="true"
-                            >
-                        <el-form-item label="订单状态" prop="status">
-                            <el-select v-model="formModel.status" placeholder="请选择订单状态" style="width: 300px">
-                              <el-option
-                                v-for="item in orderStatusList"
-                                :key="item.value"
-                                :label="item.name"
-                                :value="item.value">
-                              </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="订单编号" prop="number">
-                            <el-input v-model="formModel.number" placeholder="请输入订单编号" style="width: 300px"></el-input>
-                        </el-form-item>
-                        <el-form-item label="发布时间" prop="createTime">
-                            <el-input v-model="formModel.createTime" placeholder="请输入发布时间" style="width: 300px"></el-input>
-                        </el-form-item>
-                    </el-form>
+                      <el-descriptions>
+                          <el-descriptions-item label="订单状态">{{formModel.statusN}}</el-descriptions-item>
+                          <el-descriptions-item label="订单编号">{{formModel.number}}</el-descriptions-item>
+                          <el-descriptions-item label="发布时间">{{formModel.createTime}}</el-descriptions-item>
+                      </el-descriptions>
                     </div>
                 </el-card>
             </el-tab-pane>
@@ -261,14 +124,14 @@
             </el-tab-pane>
             <el-tab-pane label="师傅信息" name="third">
                 <div style="margin:30px">
-                    <el-descriptions>
+                    <el-descriptions v-if="technicianInfo!=null">
                         <el-descriptions-item label="姓名">{{technicianInfo.realName}}</el-descriptions-item>
-                        <el-descriptions-item label="星级">4.6分</el-descriptions-item>
-                        <el-descriptions-item label="已完成单数">50单</el-descriptions-item>
+                        <el-descriptions-item label="手机号码">{{technicianInfo.phone}}</el-descriptions-item>
+                        <el-descriptions-item label="会员等级">{{technicianInfo.level}}</el-descriptions-item>
                         <el-descriptions-item label="好评率">80%</el-descriptions-item>
                         <el-descriptions-item label="擅长类目">家具灯具厨卫健身器材</el-descriptions-item>
                         <el-descriptions-item label="师傅来源">4.6分</el-descriptions-item>
-                        <el-descriptions-item label="所在地区">50单</el-descriptions-item>
+                        <el-descriptions-item label="所在地区">{{technicianInfo.region}}</el-descriptions-item>
                         <el-descriptions-item label="公司性质">80%</el-descriptions-item>
                         <el-descriptions-item label="公司地址">家具灯具厨卫健身器材</el-descriptions-item>
                         <el-descriptions-item label="联系电话">4.6分</el-descriptions-item>
@@ -278,7 +141,7 @@
             </el-tab-pane>
             <el-tab-pane label="施工进度" name="fourth">
                 <div style="margin:50px">
-                  <el-timeline>
+                  <el-timeline >
                     <el-timeline-item :timestamp="item.submitDate" placement="top" v-for="(item,index) in constructionProgressList" :key="index">
                         <h4>{{item.submitByN}} {{item.title}}</h4>
                         <div>
@@ -456,6 +319,7 @@
       });
     },
     methods: {
+      
       closeDialog() {
         this.$emit("close", false);
       },
@@ -521,6 +385,7 @@
         }
       })()
         .then((response) => {
+          self.showModal = true;
           var jsonData = response.data;
   
           if (jsonData.result) {
@@ -539,7 +404,7 @@
                   self.fileUrl = image 
               }
   
-              self.showModal = true;
+             
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -590,5 +455,22 @@
         height: 100px;
         margin:10px
     }
+    .box {
+      width: 300px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .box:hover {
+      position: absolute;
+      z-index: 1000;
+      overflow: visible;
+      white-space: normal;
+      background-color: white;
+      border: 1px solid #ccc;
+      padding: 5px;
+      max-width: none; /* 允许宽度自适应 */
+    }
+
     
   </style>

src/views/base/workOrder-list.vue

@@ -60,22 +60,24 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column  prop="number"  label="工单号"></el-table-column>
+        <el-table-column  prop="number"  label="工单号" width="120"></el-table-column>
         <el-table-column  prop="title"  label="标题" width="180"></el-table-column>
         <el-table-column  prop="address"  label="地址" width="180"></el-table-column>
         <el-table-column  prop="date"  label="日期" width="150"></el-table-column>
         <el-table-column  prop="location"  label="所在地区" width="180"></el-table-column>
         <el-table-column  prop="price"  label="报价"></el-table-column>
-        <el-table-column  prop="companyName"  label="发起客户" width="180"></el-table-column>
-        <el-table-column  prop="status"  label="工单状态">
+        <el-table-column  prop="companyName"  label="发起客户"></el-table-column>
+        <el-table-column  prop="statusN"  label="工单状态"></el-table-column>
+        <el-table-column  prop="payStatus"  label="支付状态">
             <template slot-scope="{row}">
-                <span v-if="row.status=='1'" style="color: #F56C6C;">未接单</span>
-                <span v-else-if="row.status=='2'" style="color: #67C23A;" >已接单</span>
+                <span v-if="row.payStatus=='0'">未支付</span>
+                <span v-else-if="row.payStatus=='1'">已支付</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="150">
           <template slot-scope="{row}" >
             <el-link type="primary" @click="handleEdit(row)">查看-</el-link>
+            <el-link v-if="row.status=='0'" type="success" @click="handleConfirm(row)">确认-</el-link>
             <el-link type="danger" @click="handleDelete(row)">删除</el-link>
           </template>
         </el-table-column>
@@ -208,6 +210,8 @@
                     self.tableData = page.data;
                     self.totalPages = page.totalPages;
                     self.totalElements = page.recordsTotal;
+
+                    //alert(JSON.stringify(page))
                 }
             }
             else{
@@ -270,6 +274,30 @@
           });
         });
       },
+      handleConfirm(record) {
+        var self = this;
+  
+        this.$confirm("是否确认？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+            workOrderApi.confirm(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;