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

src/App.vue

@@ -44,4 +44,10 @@ body{
 .el-table{
   margin-top:5px;
 }
+
+.demo-form-inline{
+  .el-form-item{
+    margin-bottom: 10px;
+  }
+}
 </style>

src/api/base/messageReport.js

@@ -2,19 +2,19 @@ import request from '@/utils/request'
 import constant from '@/constant'
 //异常上报messageReport
 function pageList(formData) {
-  return request.post(constant.serverUrl + "/base/messageReport/pageList", formData);
+  return request.post(constant.serverUrl + "/epidemicReport/list", formData);
 }
 
 function create() {
-  return request.get(constant.serverUrl + "/base/messageReport/create");
+  return request.get(constant.serverUrl + "/base/epidemicReport/create");
 }
 
 function edit(id) {
-  return request.get(constant.serverUrl + "/base/messageReport/edit/" + id);
+  return request.get(constant.serverUrl + "/base/epidemicReport/edit/" + id);
 }
 
 function add(formModel) {
-  return request.post(constant.serverUrl + "/base/messageReport/add", formModel, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/add", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -22,7 +22,7 @@ function add(formModel) {
 }
 
 function update(formModel) {
-  return request.post(constant.serverUrl + "/base/messageReport/update", formModel, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/update", formModel, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -30,11 +30,11 @@ function update(formModel) {
 }
 
 function remove(id) {
-  return request.post(constant.serverUrl + "/base/messageReport/delete/" + id);
+  return request.post(constant.serverUrl + "/base/epidemicReport/delete/" + id);
 }
 
 function batchRemove(idList) {
-  return request.post(constant.serverUrl + "/base/messageReport/batchDelete", idList, {
+  return request.post(constant.serverUrl + "/base/epidemicReport/batchDelete", idList, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -42,7 +42,7 @@ function batchRemove(idList) {
 }
 
 function list() {
-  return request.post(constant.serverUrl + "/base/messageReport/list");
+  return request.post(constant.serverUrl + "/base/epidemicReport/list");
 }
 
 export default {

src/routers/modules/business.js

@@ -35,7 +35,7 @@ var routers = [
                 component: () => import('@/views/business/clockOut-list.vue'),
                 meta: {
                         roles: ["admin"],
-                        title: '异地打卡记录'
+                        title: '外勤打卡记录'
                 }
         },
         {

src/views/base/alarmConfig-list.vue

@@ -126,6 +126,7 @@ import alarmConfigDetail from "./alarmConfig-detail";
 import alarmConfigApi from "@/api/base/alarmConfig";
 import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
+import pageUtil from "@/utils/page";
 
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -233,11 +234,6 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-
-          //45为分页栏的高度
-          //页面高度-列表上面的高度-分页栏高度
-          self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;
@@ -340,6 +336,10 @@ export default {
         self.companyResult = jsonData.data;
       }
     });
+
+    setTimeout(()=>{
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    },1000);
   },
   components: {
     "alarmConfig-detail": alarmConfigDetail,

src/views/base/businessOut-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessOut">外出记录</a>
+        <a href="/base/businessOut/list">外出申请记录</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>

src/views/base/messageReport-list.vue

@@ -46,8 +46,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="title" label="标题" width="150" fixed="left"></el-table-column>
-      <el-table-column prop="content" label="备注" show-overflow-tooltip width="350"></el-table-column>
+      <!-- <el-table-column prop="title" label="标题" width="150" fixed="left"></el-table-column> -->
+      <el-table-column prop="content" label="内容"></el-table-column>
       <!-- <el-table-column prop="status" label="是否已读" width="120">
         <template slot-scope="{row}">{{row.openId == null ? "否" : "是"}}</template>
       </el-table-column> -->

src/views/base/warningPusher-list.vue

@@ -147,6 +147,7 @@ import dataDictionaryApi from "@/api/sys/dataDictionary";
 import companyInfoApi from "@/api/base/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import wxApi from "@/api/base/wx";
+import pageUtil from "@/utils/page";
 
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -260,11 +261,6 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-
-          //45为分页栏的高度
-          //页面高度-列表上面的高度-分页栏高度
-          self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;
@@ -381,12 +377,17 @@ export default {
   mounted: function() {
     var self = this;
     this.changePage(1);
+
     companyInfoApi.list().then(function(response) {
       var jsonData = response.data;
       if (jsonData.result) {
         self.companyResult = jsonData.data;
       }
     });
+
+    setTimeout(()=>{
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    },1000);
   },
   components: {
     "warningPusher-detail": WarningPusherDetail,

src/views/business/clockOut-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">异地打卡记录</a>
+        <a href="#">外勤打卡记录</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -57,7 +57,12 @@
     </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 
+      ref="formTable"
+      :data="tableData"
+      :height="tableHeight" 
+      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>
@@ -67,7 +72,7 @@
       <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>
+      <el-table-column fixed="right" width="150" label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleOpenFiles(row)">查看附件</el-button>
         </template>
@@ -94,6 +99,7 @@ import Constant from "@/constant";
 import fillAttendanceApi from "@/api/business/fillAttendance";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import companyInfoApi from "@/api/base/companyInfo";
+import pageUtil from "@/utils/page";
 
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
@@ -141,7 +147,8 @@ export default {
         value: "id",
         label: "name",
         children: "children"
-      }
+      },
+      tableHeight: 400
     };
   },
   created() {
@@ -162,6 +169,10 @@ export default {
     });
 
     this.loadTree();
+
+    setTimeout(()=>{
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    },1000);
   },
   methods: {
     getSelectedValue(value) {

src/views/business/fillAttendance-list.vue

@@ -59,7 +59,12 @@
     </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 
+      ref="formTable"
+      :data="tableData"
+      :height="tableHeight" 
+      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>
@@ -97,7 +102,7 @@ import fillAttendanceApi from "@/api/business/fillAttendance";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import companyInfoApi from "@/api/base/companyInfo";
 import FillAttendanceFilesList from "./fillAttendanceFiles-list";
-
+import pageUtil from "@/utils/page";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -136,7 +141,8 @@ export default {
         value: "id",
         label: "name",
         children: "children"
-      }
+      },
+      tableHeight: 400
     };
   },
   created() {
@@ -158,6 +164,10 @@ export default {
     });
 
     this.loadTree();
+
+    setTimeout(()=>{
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    },1000);
   },
   methods: {
     getSelectedValue(value) {

src/views/business/requestForLeave-list.vue

@@ -90,12 +90,12 @@
     </el-form>
     <el-divider></el-divider>
     <div class="button-group">
-      <div class="title">请假记录列表</div>
       <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">批量导出</el-button>
     </div>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
+      :height="tableHeight" 
       v-loading="loading"
       stripe
     >
@@ -144,7 +144,7 @@ import Constant from "@/constant";
 import requestForLeaveApi from "@/api/business/requestForLeave";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import companyInfoApi from "@/api/base/companyInfo";
-
+import pageUtil from "@/utils/page";
 import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -182,7 +182,8 @@ export default {
         value: "id",
         label: "name",
         children: "children"
-      }
+      },
+      tableHeight: 400
     }
   },
   created() {
@@ -197,6 +198,10 @@ export default {
     this.loadTree();
 
     this.changePage(1);
+
+    setTimeout(()=>{
+      this.tableHeight = pageUtil.autoAdjustHeight(this.$refs.formTable.$el);
+    },1000);
   },
   methods: {
     handleReset(name) {

src/views/business/workAttendance-list.vue

@@ -67,7 +67,7 @@
         </el-row>
         <el-row>
           <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" style="width:100px;"></el-input>
           </el-form-item>
           <!-- <el-form-item v-if="position1Show" :label="position1" prop="position1">
             <el-input type="text" size="mini" v-model="queryModel.position1"></el-input>