瀏覽代碼

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

zhengqiang 5 年之前
父節點
當前提交
0a72ed4990

+ 5 - 1
src/api/business/fillAttendance.js

@@ -5,6 +5,10 @@ function pageList(formData){
   return request.post(constant.serverUrl + "/business/fillAttendance/pageList", formData);
 }
 
+function clockPageList(formData){
+  return request.post(constant.serverUrl + "/business/fillAttendance/clockPageList", formData);
+}
+
 function create(){
   return request.get(constant.serverUrl + "/business/fillAttendance/create");
 }
@@ -42,5 +46,5 @@ function batchRemove(idList){
 }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,clockPageList
 }

+ 13 - 0
src/routers/modules/business.js

@@ -25,6 +25,19 @@ var routers = [
                         title: '补卡申请记录'
                 }
         },
+        {
+                //异地打卡记录
+                path: '/business/clockOut/list',
+                name: 'BusinessClockOutList',
+                // 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/business/clockOut-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '异地打卡记录'
+                }
+        },
         {
                 //请假记录
                 path: '/business/requestForLeave/list',

+ 293 - 0
src/views/business/clockOut-list.vue

@@ -0,0 +1,293 @@
+<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="#">异地打卡记录</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="personName">
+        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+      </el-form-item>
+      <el-form-item label="打卡日"  prop="requestTimeRange">
+        <el-date-picker
+            v-model="queryModel.requestTimeRange"
+            type="daterange"
+            size="mini"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
+            >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select
+          v-model="queryModel.status"
+          size="mini"
+          placeholder="请选择"
+        >
+        <el-option v-for="item in statusList" :key="item.value" :label="item.name" :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-row class="button-group"></el-row>
+    <el-table :data="tableData" style="min-height:400px;" v-loading="loading" stripe>
+      <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
+      <el-table-column prop="personName" label="申请人" width="120"></el-table-column>
+      <el-table-column prop="companyName" label="申请单位" width="180"></el-table-column>
+      <el-table-column prop="fillDay" label="打卡日" width="120"></el-table-column>
+      <el-table-column prop="fillAttendanceTime" label="打卡时间" width="120"></el-table-column>
+      <el-table-column prop="address" label="打卡地址" width="180"></el-table-column>
+      <el-table-column prop="content" label="内容" width="180" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="approvalPersonName" label="审批人" width="120"></el-table-column>
+      <el-table-column prop="statusN" label="审批状态" width="80"></el-table-column>
+      <el-table-column label>
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleOpenFiles(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>
+    <fillAttendanceFiles-list
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></fillAttendanceFiles-list>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import fillAttendanceApi from "@/api/business/fillAttendance";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "BusinessClockOutList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        personName: "",
+        status: "",
+        requestTimeRange: ['',''],
+      },
+      loading: false,
+      statusList:[{
+        name:"审核中",
+        value:"0",
+      },{
+        name:"同意",
+        value:"1",
+      },{
+        name:"拒绝",
+        value:"2",
+      }],
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      typeData: [],
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项(必选)
+        value: "id",
+        label: "name",
+        children: "children"
+      }
+    };
+  },
+  created() {
+    var formData = new FormData();
+    formData.append("catalogName", "补卡类型");
+    dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    this.loadTree();
+  },
+  methods: {
+    getSelectedValue(value) {
+      this.queryModel.parentId = value;
+    },
+    loadTree() {
+      var formData = new FormData();
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    loadChildren(tree, treeNode, resolve) {
+      var formData = new FormData();
+      formData.append("parentId", tree.id);
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          resolve(jsonData.data);
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    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("personName", self.queryModel.personName);
+
+      if(self.queryModel.requestTimeRange[0] != null){
+
+        formData.append("startTime", self.queryModel.requestTimeRange[0]);
+      }
+
+      if(self.queryModel.requestTimeRange[1] != null){
+        formData.append("endTime", self.queryModel.requestTimeRange[1]);
+      }
+
+      formData.append("status", self.queryModel.status);
+
+      fillAttendanceApi
+        .clockPageList(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;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleOpenFiles(record) {
+      this.modalTitle = "查看附件";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  }
+};
+</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>

+ 2 - 2
src/views/business/fillAttendance-list.vue

@@ -35,7 +35,7 @@
           placeholder="请选择"
           style="width:100px"
         >
-          <el-option v-for="type in typeData" :key="type.id" :label="type.name" :value="type.id"></el-option>
+          <el-option v-for="type in typeData" :key="type.value" :label="type.name" :value="type.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="审批状态" prop="status">
@@ -68,7 +68,7 @@
       <el-table-column prop="fillAttendanceTime" label="补卡时间" width="120"></el-table-column>
       <el-table-column prop="content" label="内容" width="180" show-overflow-tooltip></el-table-column>
       <el-table-column prop="approvalPersonName" label="审批人" width="120"></el-table-column>
-      <el-table-column prop="status" label="审批状态" width="80"></el-table-column>
+      <el-table-column prop="statusN" label="审批状态" width="80"></el-table-column>
       <el-table-column label>
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleOpenFiles(row)">查看附件</el-button>

+ 1 - 1
src/views/business/requestForLeave-list.vue

@@ -46,7 +46,7 @@
           <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="申请时间">
+      <el-form-item label="申请时间" prop="requestTimeRange">
         <el-date-picker
             v-model="queryModel.requestTimeRange"
             type="daterange"

+ 1 - 1
src/views/old/oldPersonInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/personInfo">人员管理</a>
+        <a href="/personInfo">长者管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>