人员管理 督查督办添加人员

src/api/base/person.js

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

src/views/base/incident-detail.vue

@@ -158,8 +158,8 @@
           <el-col :span="12">
             <el-form-item label="责任单位" prop="stepOrgId">
               <el-select-tree
-                :props="props"
-                :options="queryOrgResult"
+                :props="orgProps"
+                :options="orgResult"
                 v-model="formModel.stepOrgId"
                 style="width:300px;"
                 size="mediumn"
@@ -167,6 +167,18 @@
               ></el-select-tree>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="责任人" prop="stepPersonId">
+              <el-select-tree
+                :props="personProps"
+                :options="personResult"
+                v-model="formModel.stepPersonId"
+                style="width:300px;"
+                size="mediumn"
+                height="200"
+              ></el-select-tree>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="提醒时间" prop="stepWarnTime">
               <el-date-picker
@@ -194,6 +206,7 @@ import Constant from "@/constant";
 import incidentApi from "@/api/base/incident";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import organizationApi from "@/api/base/organization";
+import personApi from "@/api/base/person";
 import SelectTree from "@/components/SelectTree";
 import MceEditor from "@/components/Tinymce";
 import { getToken } from "@/utils/auth";
@@ -239,8 +252,14 @@ export default {
       picDialogVisible: false,
       picDisabled: false,
       //上传图片end
-      queryOrgResult: [],
-      props: {
+      orgResult: [],
+      orgProps: {
+        // 配置项（必选）
+        value: "id",
+        label: "name"
+      },
+      personResult: [],
+      personProps: {
         // 配置项（必选）
         value: "id",
         label: "name"
@@ -402,7 +421,7 @@ export default {
         var jsonData = response.data;
 
         if(jsonData.result){
-          this.queryOrgResult = jsonData.data;
+          this.orgResult = jsonData.data;
         }
         else{
           this.$message.error(jsonData.message + "");
@@ -451,6 +470,23 @@ export default {
         }
       }
     },
+    "formModel.stepOrgId": function (newVal, oldVal) {
+      if (newVal != null) {
+        var formData = new FormData();
+        formData.append("orgId",newVal);
+
+        personApi.query(formData).then(response=>{
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            this.personResult = jsonData.data;
+          }
+          else{
+            this.$message.error(jsonData.message + "");
+          }
+        });
+      }
+    },
   },
 };
 </script>

src/views/base/incident-doc.vue

@@ -198,7 +198,7 @@ a:active {
           <el-col :span="12">
             <el-form-item label="责任单位" prop="subOrgId">
               <el-select-tree
-                :props="props"
+                :props="orgProps"
                 :options="orgResult"
                 v-model="formModel.subOrgId"
                 style="width: 300px"
@@ -207,6 +207,18 @@ a:active {
               ></el-select-tree>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="责任人" prop="subPersonId">
+              <el-select-tree
+                :props="personProps"
+                :options="personResult"
+                v-model="formModel.subPersonId"
+                style="width:300px;"
+                size="mediumn"
+                height="200"
+              ></el-select-tree>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="提醒时间" prop="subWarnTime">
               <el-date-picker
@@ -235,6 +247,7 @@ import Constant from "@/constant";
 import incidentApi from "@/api/base/incident";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import organizationApi from "@/api/base/organization";
+import personApi from "@/api/base/person";
 import SelectTree from "@/components/SelectTree";
 import { getToken } from "@/utils/auth";
 
@@ -266,7 +279,13 @@ export default {
         value: "",
       },
       orgResult: [],
-      props: {
+      orgProps: {
+        value: "id",
+        label: "name"
+      },
+      personResult: [],
+      personProps: {
+        // 配置项（必选）
         value: "id",
         label: "name"
       }
@@ -375,6 +394,23 @@ export default {
         }
       }
     },
+    "formModel.subOrgId": function (newVal, oldVal) {
+      if (newVal != null) {
+        var formData = new FormData();
+        formData.append("orgId",newVal);
+
+        personApi.query(formData).then(response=>{
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            this.personResult = jsonData.data;
+          }
+          else{
+            this.$message.error(jsonData.message + "");
+          }
+        });
+      }
+    },
   },
 };
 </script>

src/views/base/person-detail.vue

@@ -9,144 +9,162 @@
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="false"
-    style="text-align:left;"
+    style="text-align: left"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
     <div class="user-panel" v-loading="loading">
-    <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-		<el-form-item label="编号" prop="id">
-	    <el-input v-model="formModel.id" placeholder="请输入编号" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="机构编号" prop="orgId">
-	    <el-input v-model="formModel.orgId" placeholder="请输入机构编号" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="姓名" prop="name">
-	    <el-input v-model="formModel.name" placeholder="请输入姓名" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="电话" prop="phone">
-	    <el-input v-model="formModel.phone" placeholder="请输入电话" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="是否删除" prop="delFlag">
-	    <el-input v-model="formModel.delFlag" 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-item label="创建人" prop="createBy">
-	    <el-input v-model="formModel.createBy" placeholder="请输入创建人" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="更新时间" prop="updateTime">
-	    <el-input v-model="formModel.updateTime" placeholder="请输入更新时间" style="width:300px"></el-input>
-	</el-form-item>
-		<el-form-item label="更新人" prop="updateBy">
-	    <el-input v-model="formModel.updateBy" placeholder="请输入更新人" style="width:300px"></el-input>
-	</el-form-item>
-	    </el-form>
-  </div>
-      <span slot="footer" class="dialog-footer">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="单位" prop="orgId">
+          <el-select-tree
+            :props="props"
+            :options="orgResult"
+            v-model="formModel.orgId"
+            style="width:300px;"
+            size="mediumn"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="formModel.name"
+            placeholder="请输入姓名"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input
+            v-model="formModel.phone"
+            placeholder="请输入电话"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
     </span>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import personApi from "@/api/base/person";
+import organizationApi from "@/api/base/organization";
+import SelectTree from "@/components/SelectTree";
 
 export default {
-  props: ["businessKey","title"],
+  props: ["businessKey", "title"],
+  components: {
+    "el-select-tree": SelectTree
+  },
   data() {
     return {
       formModel: {},
       ruleValidate: {
-                    id: [
-                { required: true, message: '编号不能为空', trigger: 'blur' }
-            ],                    orgId: [
-                { required: true, message: '机构编号不能为空', trigger: 'blur' }
-            ],                    name: [
-                { required: true, message: '姓名不能为空', trigger: 'blur' }
-            ],                    phone: [
-                { required: true, message: '电话不能为空', trigger: 'blur' }
-            ],                    delFlag: [
-                { required: true, message: '是否删除不能为空', trigger: 'blur' }
-            ],                    createTime: [
-                { required: true, message: '创建时间不能为空', trigger: 'blur' }
-            ],                    createBy: [
-                { required: true, message: '创建人不能为空', trigger: 'blur' }
-            ],                    updateTime: [
-                { required: true, message: '更新时间不能为空', trigger: 'blur' }
-            ],                    updateBy: [
-                { required: true, message: '更新人不能为空', trigger: 'blur' }
-            ]              },
+        orgId: [
+          { required: true, message: "机构编号不能为空", trigger: "blur" },
+        ],
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
+      },
       showDialog: true,
       loading: false,
-      submitting: false
+      submitting: false,
+      orgResult: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name"
+      }
     };
   },
   methods: {
     closeDialog() {
-	this.$emit("close",false);
+      this.$emit("close", false);
     },
     handleSubmit() {
       var self = this;
 
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          (function(){
+          (function () {
             var id = self.formModel.id;
 
             if (id == null || id.length == 0) {
               return personApi.add(self.formModel);
-            }
-            else{
+            } else {
               return personApi.update(self.formModel);
             }
-          })().then(function(response) {
-              var jsonData = response.data;
+          })().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",
+              });
 
-              if (jsonData.result) {
-                self.$message({
-                  message: "保存成功!",
-                  type: "success"
-                });
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    queryMenu(keywords) {
+      var formData = new FormData();
+      formData.append("keywords",keywords);
 
-                self.$emit("close",true);
-              } else {
-                self.$message({
-                  message: jsonData.message + "",
-                  type: "warning"
-                });
+      return organizationApi.query(formData).then(response=>{
+        var jsonData = response.data;
 
-                self.$emit("close",false);
-              }
-            });
+        if(jsonData.result){
+          this.orgResult = jsonData.data;
+        }
+        else{
+          this.$message.error(jsonData.message + "");
         }
       });
-    }
+    },
   },
-  mounted: function() {
+  mounted: function () {
+    this.queryMenu("");
     var self = this;
 
-    (function(){
-      if(self.businessKey.length==0){
-        return personApi.create()
-      }
-      else{
-        return personApi.edit(self.businessKey)
-      }
-    })().then(response => {
-      var jsonData = response.data;
-      self.loading = false;
-
-      if (jsonData.result) {
-        self.formModel = jsonData.data;
+    (function () {
+      if (self.businessKey.length == 0) {
+        return personApi.create();
       } else {
-        self.$message.error(jsonData.message + "");
+        return personApi.edit(self.businessKey);
       }
-    }).catch(error => {
-      self.$message.error(error + "");
-    });
-  }
+    })()
+      .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 + "");
+      });
+  },
 };
 </script>

src/views/base/person-list.vue

@@ -6,22 +6,32 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/base/person">person管理</a>
+        <a href="/base/person">人员管理</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="orgId">
-          <el-input type="text" size="mini" v-model="queryModel.orgId"></el-input>
-      </el-form-item>
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="单位" prop="orgId">
+          <el-select-tree
+            :props="props"
+            :options="orgResult"
+            v-model="queryModel.orgId"
+            size="mini"
+          ></el-select-tree>
+        </el-form-item>
       <el-form-item label="姓名" prop="name">
-          <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
       </el-form-item>
       <el-form-item label="电话" prop="phone">
-          <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
+        <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -30,49 +40,61 @@
           icon="ios-search"
           @click="changePage(1)"
           :loading="loading"
-        >查询</el-button>&nbsp;
+          >查询</el-button
+        >&nbsp;
         <el-button
           type="info"
           size="mini"
           style="margin-left: 8px"
           @click="handleReset('queryForm')"
-        >重置</el-button>&nbsp;
+          >重置</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="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
         @click="handleBatchDelete"
-      >删除选中项</el-button>
+        >删除选中项</el-button
+      >
     </el-row>
     <el-table
       :data="tableData"
-      style="min-height:400px;"
+      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="id" label="编号" width="180"></el-table-column>
-		<el-table-column prop="orgId" label="机构编号" width="180"></el-table-column>
-		<el-table-column prop="name" label="姓名" width="180"></el-table-column>
-		<el-table-column prop="phone" label="电话" width="180"></el-table-column>
-		<el-table-column prop="delFlag" label="是否删除" width="180"></el-table-column>
-		<el-table-column prop="createTime" label="创建时间" width="180"></el-table-column>
-		<el-table-column prop="createBy" label="创建人" width="180"></el-table-column>
-		<el-table-column prop="updateTime" label="更新时间" width="180"></el-table-column>
-		<el-table-column prop="updateBy" 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>
+      <el-table-column
+        prop="orgName"
+        label="单位"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="name" label="姓名" width="180"></el-table-column>
+      <el-table-column prop="phone" label="电话" width="180"></el-table-column>
+      <el-table-column label="操作" width="150" fixed="right">
+        <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>
@@ -84,18 +106,20 @@
       @size-change="pageSizeChange"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
-	<person-detail
-	v-if="showModal"
-	:businessKey="businessKey"
-	:title="modalTitle"
-	@close="onDetailModalClose"
-	></person-detail>
+    <person-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></person-detail>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import PersonDetail from "./person-detail";
 import personApi from "@/api/base/person";
+import organizationApi from "@/api/base/organization";
+import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -104,17 +128,11 @@ export default {
     var self = this;
 
     return {
-	  queryModel:{
-				"id":""
-		,				"orgId":""
-		,				"name":""
-		,				"phone":""
-		,				"delFlag":""
-		,				"createTime":""
-		,				"createBy":""
-		,				"updateTime":""
-		,				"updateBy":""
-					  },
+      queryModel: {
+        orgId: "",
+        name: "",
+        phone: "",
+      },
       loading: false,
       tableData: [],
       pageIndex: 1,
@@ -124,33 +142,31 @@ export default {
       field: "",
       direction: "",
       pageSizeList: [10, 20, 30],
-      multipleSelection: [],      
+      multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      orgResult: [],
+      props: {
+        value: "id",
+        label: "name"
+      }
     };
   },
   methods: {
     changePage(pageIndex) {
       var self = this;
 
-	  self.loading = true;
+      self.loading = true;
 
       self.pageIndex = pageIndex;
       var formData = new FormData();
 
       formData.append("pageIndex", self.pageIndex);
       formData.append("pageSize", self.pageSize);
-
-formData.append("id",self.queryModel.id);
-formData.append("orgId",self.queryModel.orgId);
-formData.append("name",self.queryModel.name);
-formData.append("phone",self.queryModel.phone);
-formData.append("delFlag",self.queryModel.delFlag);
-formData.append("createTime",self.queryModel.createTime);
-formData.append("createBy",self.queryModel.createBy);
-formData.append("updateTime",self.queryModel.updateTime);
-formData.append("updateBy",self.queryModel.updateBy);
+      formData.append("orgId", self.queryModel.orgId);
+      formData.append("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -160,23 +176,25 @@ formData.append("updateBy",self.queryModel.updateBy);
         formData.append("direction", this.direction);
       }
 
-      personApi.pageList(formData).then(function(response) {
-        self.loading = false;
+      personApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
 
-        var jsonData = response.data.data;
+          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 + "");
-      });
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+        });
     },
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
-      
-      this.$nextTick(()=>{
+
+      this.$nextTick(() => {
         this.changePage(this.pageIndex);
       });
     },
@@ -205,40 +223,42 @@ formData.append("updateBy",self.queryModel.updateBy);
     handleDelete(record) {
       var self = this;
 
-      self.$confirm("是否确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        personApi.remove(record.id).then(function(response) {
-          var jsonData = response.data;
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          personApi.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);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            self.$message({
-              type: "success",
-              message: "删除成功!"
-            });
-          }
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
         });
-      });
     },
     handleBatchDelete() {
       var self = this;
 
-      var idList = this.multipleSelection.map(record => {
+      var idList = this.multipleSelection.map((record) => {
         return record.id;
       });
 
       this.$confirm("是否确认删除选中项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        personApi.batchRemove(idList).then(function(response) {
+        personApi.batchRemove(idList).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -246,7 +266,7 @@ formData.append("updateBy",self.queryModel.updateBy);
 
             self.$message({
               type: "success",
-              message: "删除成功!"
+              message: "删除成功!",
             });
           }
         });
@@ -256,17 +276,34 @@ formData.append("updateBy",self.queryModel.updateBy);
       //保存成功后回调
       this.showModal = false;
 
-      if(refreshed){
+      if (refreshed) {
         this.changePage(this.pageIndex);
       }
-    }
+    },
+    queryMenu(keywords) {
+      var formData = new FormData();
+      formData.append("keywords",keywords);
+
+      return organizationApi.query(formData).then(response=>{
+        var jsonData = response.data;
+
+        if(jsonData.result){
+          this.orgResult = jsonData.data;
+        }
+        else{
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
   },
-  mounted: function() {
+  mounted: function () {
+    this.queryMenu("");
     this.changePage(1);
   },
   components: {
-    "person-detail": PersonDetail
-  }
+    "person-detail": PersonDetail,
+    "el-select-tree": SelectTree
+  },
 };
 </script>
 <style lang="scss" scoped>