导出健康打卡加查询条件

src/api/base/personHealthLedger.js

@@ -74,6 +74,10 @@ function exportXlsZZYC(formData) {
   return request.post(constant.serverUrl + "/base/personHealthLedger/exportXlsZZYC", formData);
 }
 
+function pageListNew(formData) {
+  return request.post(constant.serverUrl + "/base/personHealthLedger/pageListNew", formData);
+}
+
 export default {
-  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls
+  pageList, create, edit, add, update, remove, batchRemove, exportXls, pageListAll,exportXlsAll,gpsHistoryList,exportXlsWC,exportXlsTWYC,exportXlsZZYC,healthLedgerDateExportXls,pageListNew
 }

src/views/base/personHealthLedger-list.vue

@@ -46,22 +46,36 @@
         <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="healthStatus">
+        <el-form-item label="上报情况" prop="isReport">
           <el-select
-            v-model="queryModel.healthStatus"
+            v-model="queryModel.isReport"
+            size="mini"
+            filterable
+            placeholder="请选择"
+            style="width: 100px"
+          >
+            <el-option value="9" label="全部"></el-option>
+            <el-option value="0" label="未上报"></el-option>
+            <el-option value="1" label="已上报"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="打卡位置" prop="address">
+          <el-select
+            v-model="queryModel.address"
+            size="mini"
             filterable
             placeholder="请选择"
-            style="width:50%"
+            style="width: 100px"
           >
-            <el-option
-              size="mini"
-              v-for="result in healthData"
-              :key="result.id"
-              :label="result.name"
-              :value="result.value"
-            ></el-option>
+            <el-option value label="全部"></el-option>
+            <el-option value="0" label="市内"></el-option>
+            <el-option value="1" label="市外省内"></el-option>
+            <el-option value="2" label="省外"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
+        <el-form-item label="" prop="fever">
+          <el-checkbox v-model="queryModel.fever">是否体温异常</el-checkbox>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -243,7 +257,10 @@ export default {
         healthStatus: "",
         companyId: "",
         subordinate: true,
-        queryTime: ""
+        queryTime: "",
+        address:"",
+        fever:false,
+        isReport:"9"
       },
       loading: false,
       tableData: [],
@@ -376,6 +393,9 @@ export default {
       formData.append("companyId", self.queryModel.companyId);
       formData.append("subordinate", self.queryModel.subordinate);
       formData.append("queryTime", self.queryModel.queryTime);
+      formData.append("address", self.queryModel.address);
+      formData.append("fever", self.queryModel.fever);
+      formData.append("isReport", self.queryModel.isReport);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -386,7 +406,7 @@ export default {
       }
 
       personHealthLedgerApi
-        .pageList(formData)
+        .pageListNew(formData)
         .then(function(response) {
           self.loading = false;