Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/companyInfo.js

@@ -74,7 +74,11 @@ function unbindDevice(formData) {
   return request.post(constant.serverUrl + "/base/companyInfo/unbindDevice", formData);
 }
 
+function treeList() {
+  return request.post(constant.serverUrl + "/base/companyInfo/treeList");
+}
+
 export default {
   list, create, edit, add, update, remove, batchRemove, pageList, queryBindDeviceList,
-  bindDevice, unbindDevice,loadChildren
+  bindDevice, unbindDevice,loadChildren,treeList
 }

src/api/base/companyStructureInfo.js

@@ -45,6 +45,10 @@ function list(formData){
   return request.post(constant.serverUrl + "/base/companyStructureInfo/list", formData);
 }
 
+function query(formData){
+  return request.post(constant.serverUrl + "/base/companyStructureInfo/query", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,list
+  pageList,create,edit,add,update,remove,batchRemove,list,query
 }

src/routers/modules/base.js

@@ -473,6 +473,18 @@ var routers = [
                         roles: ["admin"],
                         title: '订单管理'
                 }
+        },
+        {
+                path: '/base/companyStructureInfo/list',
+                name: 'baseCompanyStructureInfoList',
+                // 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/companyStructureInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '单位机构管理'
+                }
         }
 ]
 

src/views/base/companyStructureInfo-detail.vue

@@ -0,0 +1,208 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    :close-on-click-modal="false"
+    style="text-align: left"
+    width="80%"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'150px'"
+        inline
+      >
+        <el-form-item label="公司名称" prop="companyId">
+          <el-select-tree
+            size="mini"
+            :props="companyProps"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="结构名称" prop="structureName">
+          <el-input
+            v-model="formModel.structureName"
+            placeholder="请输入结构名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="位置名称"
+          prop="positionName"
+        >
+          <el-input
+            v-model="formModel.positionName"
+            placeholder="请输入位置名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="父级" prop="parentId">
+          <el-select-tree
+            size="mini"
+            :props="parentProps"
+            :options="parentResult"
+            v-model="formModel.parentId"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "公司id不能为空", trigger: "blur" },
+        ],
+        structureName: [
+          { required: true, message: "结构名称不能为空", trigger: "blur" },
+        ],
+        positionName: [
+          {
+            required: true,
+            message: "位置名称（如：楼栋、单元、部门、工号）不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      companyProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      parentResult: [],
+      parentProps: {
+        value: "id",
+        label: "structureName"
+      },
+    };
+  },
+  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 companyStructureInfoApi.add(self.formModel);
+            } else {
+              return companyStructureInfoApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    companyStructureInfoApi.query().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.parentResult = jsonData.data;
+      }
+    });
+
+    // this.changePage(1);
+    // this.loadTree();
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return companyStructureInfoApi.create();
+      } else {
+        return companyStructureInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/companyStructureInfo-list.vue

@@ -0,0 +1,377 @@
+<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>
+        <a href="/base/companyStructureInfo">单位机构管理</a>
+      </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="companyId">
+        <el-select-tree
+          size="mini"
+          :props="companyProps"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="结构名称" prop="structureName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.structureName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="位置名称"
+        prop="positionName"
+      >
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.positionName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="父级" prop="parentId">
+        <el-select-tree
+          size="mini"
+          :props="parentProps"
+          :options="parentResult"
+          v-model="queryModel.parentId"
+          height="200"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :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="companyName"
+        label="公司名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="structureName"
+        label="结构名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="positionName"
+        label="位置名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="parentName"
+        label="父级名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </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>
+    <companyStructureInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></companyStructureInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CompanyStructureInfoDetail from "./companyStructureInfo-detail";
+import companyStructureInfoApi from "@/api/base/companyStructureInfo";
+import companyInfoApi from "@/api/base/companyInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  name: 'baseCompanyStructureInfoList',
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        structureName: "",
+        positionName: "",
+        parentId: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      companyProps: {
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      parentResult: [],
+      parentProps: {
+        value: "id",
+        label: "structureName"
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+
+    companyStructureInfoApi.query().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.parentResult = jsonData.data;
+      }
+    });
+
+    // this.changePage(1);
+    // this.loadTree();
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("structureName", self.queryModel.structureName);
+      formData.append("positionName", self.queryModel.positionName);
+      formData.append("parentId", self.queryModel.parentId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      companyStructureInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          companyStructureInfoApi.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(() => {
+        companyStructureInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "companyStructureInfo-detail": CompanyStructureInfoDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/watchMeasure-list.vue

@@ -48,14 +48,14 @@
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button
+      <!-- <el-button
         type="primary"
         size="small"
         plain
         icon="el-icon-circle-plus"
         @click="handleAdd"
         >新增</el-button
-      >
+      > -->
       <el-button
         type="primary"
         size="small"

src/views/sys/menu-list.vue

@@ -24,21 +24,6 @@
         </el-select>
       </el-form-item>
       <el-form-item label="上级菜单" prop="parentId">
-        <!-- <el-select
-            size="mini"
-            v-model="queryModel.parentId"
-            filterable
-            remote
-            placeholder="请输入关键词"
-            :remote-method="queryMenu"
-          >
-            <el-option
-              v-for="menu in queryMenuResult"
-              :key="menu.id"
-              :label="menu.menuName"
-              :value="menu.id"
-            ></el-option>
-        </el-select> -->
         <el-select-tree
             size="mini"
             :props="props"