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

src/api/base/personApplication.js

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

src/api/base/personInfo.js

@@ -152,9 +152,13 @@ function findByCompanyCode() {
   return request.post(constant.serverUrl + "/base/personInfo/findByCompanyCode");
 }
 
+function updateHealthyCode(personId){
+  return request.get(constant.serverUrl + `/base/personInfo/updateHealthyCode?personId=${personId}`);
+}
+
 export default {
   pageList, create, edit, add, update, remove, batchRemove, exportXls,
   enabledFace, enabledCard, enabledApp, enabledGuest, dataSync, enabledFaceList,
   enabledWechatNotice, unbindWechat, lifeRecordList, clearFaceImg, batchClearFaceImg,
-  enabledSync, enabledSyncList, bindWechat,findByCompanyId,findByCompanyCode
+  enabledSync, enabledSyncList, bindWechat,findByCompanyId,findByCompanyCode,updateHealthyCode
 }

src/routers/modules/base.js

@@ -618,6 +618,19 @@ var routers = [
                         title: '健康打卡情况'
                 }
         },
+        {
+                //审批用户管理
+                path: '/base/personApplication/list',
+                name: 'basePersonApplicationList',
+                // 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/personApplication-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '审批人员管理'
+                }
+        },
 ]
 
 export default routers;

src/views/base/personApplication-detail.vue

@@ -0,0 +1,153 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    width="40%"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :label-width="'100px'"
+      >
+        <el-form-item label="申请人姓名" prop="name">
+          <el-input
+            v-model="formModel.name"
+            placeholder="请输入标题"
+            style="width: 300px"
+            readonly="readonly"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="所属公司" prop="companyId">
+            <el-select-tree
+            :props="props"
+            :options="treeData"
+            v-model="formModel.companyId"
+            style="width: 300px"
+            ></el-select-tree>
+        </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 personApplicationApi from "@/api/base/personApplication";
+import SelectTree from "@/components/SelectTree";
+import companyInfoApi from "@/api/base/companyInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+        formModel: {},
+        showDialog: true,
+        loading: false,
+        submitting: false,
+        treeData: [],
+        props: {
+            // 配置项（必选）
+            value: "id",
+            label: "name",
+            children: "children"
+        },
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    loadTree() {
+      companyInfoApi.list().then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return personApplicationApi.add(self.formModel);
+            } else {
+              return personApplicationApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return personApplicationApi.create();
+      } else {
+        return personApplicationApi.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
+    },
+    created() {
+        this.loadTree();
+    },
+};
+</script>

src/views/base/personApplication-list.vue

@@ -0,0 +1,373 @@
+<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/personApplication/list">审批人员管理</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="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+     <el-form-item label="电话" prop="telephone">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.telephone"
+        ></el-input>
+      </el-form-item>
+     <el-form-item label="状态" prop="status">
+        <el-select v-model="queryModel.status" placeholder="请选择" size="mini" >
+            <el-option
+                v-for="item in statusList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            ></el-option>
+        </el-select>
+      </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-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+    >
+      <el-table-column prop="name" label="申请人姓名" width="120"></el-table-column>
+      <el-table-column
+        prop="applicantTime"
+        label="申请时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="申请公司"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="personRoleName"
+        label="申请角色"
+        width="120"
+      ></el-table-column>
+      <el-table-column
+        prop="telephone"
+        label="电话号码"
+        width="130"
+      ></el-table-column>
+      <el-table-column
+        prop="idCard"
+        label="身份证号"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="faceImageUrl"  label="人脸" width="120" >
+            <template slot-scope="{ row }">
+                <a :href="row.faceImageUrl" target="_blank">
+                    <el-image
+                    :size="48"
+                    :src="
+                        row.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'
+                    "
+                    :key="row.id"
+                    ><div slot="error">
+                        <i class="el-icon-picture-outline" style="width:64px;"></i></div
+                    ></el-image>
+                </a>
+            </template>
+      </el-table-column>
+    <el-table-column prop="statusN" label="状态" width="120">
+        <template slot-scope="{ row }">
+            <span v-if="row.status=='1'" style="color:green">{{row.statusN}}</span>
+            <span v-else-if="row.status=='2'" style="color:red">{{row.statusN}}</span>
+            <span v-else >{{row.statusN}}</span>
+        </template>
+    </el-table-column>
+    <el-table-column
+        prop="address"
+        label="地址"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="200">
+        <template slot-scope="{row}">
+          <!-- <el-button v-if="row.status=='0'" size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+          <el-button v-if="row.status=='0'" size="mini" type="danger" @click="handleDelete(row)">删除</el-button> -->
+            <el-row v-if="row.status=='0'">
+                <el-col :span="12">
+                    <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+                </el-col>
+                <el-col :span="12">
+                    <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+                </el-col>
+            </el-row>
+            <el-row v-if="row.status=='0'">
+                <el-col :span="12">
+                    <el-link type="success" @click="handleCheck(row,1)">同意</el-link>
+                </el-col>
+                <el-col :span="12">
+                    <el-link type="danger" @click="handleCheck(row,2)">拒绝</el-link>
+                </el-col>
+            </el-row>
+        </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>
+    <personApplication-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></personApplication-detail>
+  </div>
+</template>
+<script>
+import personApplicationDetail from "./personApplication-detail";
+import personApplicationApi from "@/api/base/personApplication";
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name:"basePersonApplicationList",
+  data() {
+    return {
+      queryModel: {
+          name:"",
+          telephone:"",
+          status:""
+      },
+      statusList:[{
+            label:"待审核",
+            value:"0"
+        },{
+            label:"同意",
+            value:"1"
+        },{
+            label:"拒绝",
+            value:"2"
+        }],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      treeData: [],
+    };
+  },
+  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("name", self.queryModel.name);
+      formData.append("telephone", self.queryModel.telephone);
+      formData.append("status", self.queryModel.status);
+
+      personApplicationApi
+        .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;
+    },
+    handleCheck(record,status){
+        var self = this;
+
+        var formData = new FormData();
+
+        formData.append("id", record.id);
+        formData.append("status", status);
+
+        this.$confirm("是否确认审批？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+        }).then(() => {
+            personApplicationApi.statusCheck(formData).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+                self.changePage(self.pageIndex);
+
+                self.$message({
+                type: "success",
+                message: "审核成功!",
+                });
+            }
+            });
+        });
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          personApplicationApi.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(() => {
+        personApplicationApi.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: {
+    "personApplication-detail": personApplicationDetail,
+  },
+};
+</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/personInfo-list.vue

@@ -359,6 +359,16 @@
         width="100"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column prop="healthyCodeN" label="健康码" width="80">
+        <template slot-scope="{row}">
+          <span v-if="row.healthyCode">
+            <span v-if="row.healthyCode == '00'" style="color:green">绿码</span>
+            <span v-else-if="row.healthyCode == '01'" style="color:yellow">黄码</span>
+            <span v-else-if="row.healthyCode == '02'" style="color:red">红码</span>
+            <span v-else style="color:gray">灰码</span>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="工作状态" width="120">
         <template slot-scope="{ row }">
           <span v-if="row.workStatus == 1">工作</span>
@@ -543,7 +553,12 @@
                 :underline="false"
                 @click="unbindWechat(row)"
                 >微信解绑</el-link
-              >
+              >-
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="updateHealthyCode(row)"
+                >更新健康码</el-link>
             </el-col>
           </el-row>
         </template>
@@ -1673,6 +1688,24 @@ export default {
       this.personId = record.id;
       this.showRoleModal = true;
     },
+    updateHealthyCode(record) {
+      var self = this;
+      self.loading = true;
+
+      personInfoApi.updateHealthyCode(record.id).then(response=>{
+        self.loading = false;
+
+        var jsonData = response.data;
+            
+        if (jsonData.result) {
+          self.$message.success("更新健康码状态成功!");
+          self.changePage(self.pageIndex);
+        }
+        else{
+          self.$message.success("更新健康码状态失败!");
+        }
+      });
+    }
   },
   async mounted() {
     var self = this;