员工管理接口对接2

src/api/kitchen/wasteManage.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+
+// 查询厨房餐余浪费列表
+export function getKitchenWasteListApi(data) {
+  return request({
+    url: '/smart-canteen/kitchen_waste_meal/list',
+    method: 'post',
+    data: data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}
+// 查询厨房餐余浪费汇总
+export function getKitchenWasteCountApi(data) {
+  return request({
+    url: '/smart-canteen/kitchen_waste_meal/list/count',
+    method: 'post',
+    data: data,
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
+  })
+}

src/views/kitchen/staffManage/morningCheck/index.vue

@@ -17,8 +17,8 @@
         </el-form-item>
         <el-form-item label="身体状况" prop="checkStatus">
             <el-select v-model="queryParams.checkStatus" style="width: 240px" clearable> 
-                <el-option label="良好" value="0"></el-option>
+                <el-option label="正常" value="1"></el-option>
-                <el-option label="异常" value="1"></el-option>   
+                <el-option label="异常" value="2"></el-option>   
             </el-select>   
         </el-form-item>
       <el-form-item>
@@ -52,7 +52,12 @@
           {{ scope.row.temperatureValue }} ℃
          </template>
       </el-table-column>
-      <el-table-column label="身体状况" align="center" prop="checkStatus" :show-overflow-tooltip="true" />
+      <el-table-column label="身体状况" align="center" prop="checkStatus" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <span v-if="scope.row.checkStatus==1">正常</span>
+              <span v-if="scope.row.checkStatus==2">异常</span> 
+          </template>
+      </el-table-column>
       <el-table-column label="晨检时间" align="center" prop="recordTime" :show-overflow-tooltip="true" width="160" />  
     </el-table> 
     <pagination
@@ -156,7 +161,6 @@ export default {
             "pageNum": this.queryParams.pageNum, 
             "pageSize": this.queryParams.pageSize,  
           }
-          console.log(this.queryParams)
           if(this.queryParams.postIds&&this.queryParams.postIds.length>0){
             param.postIds = this.queryParams.postIds
           }

src/views/kitchen/staffManage/staff/index.vue

@@ -451,8 +451,15 @@ export default {
         getList() {
             this.loading = true;
             let param = {
+                "searchValue":this.queryParams.searchValue,
+                "sex":this.queryParams.sex,
+                "faceStatus":this.queryParams.faceStatus,
+                "healthCertificate":this.queryParams.healthCertificate,
                 "pageNum": this.queryParams.pageNum, 
-                "pageSize": this.queryParams.pageSize,  
+                "pageSize": this.queryParams.pageSize
+            }
+            if(this.queryParams.postIds&&this.queryParams.postIds.length>0){
+                param.postIds = this.queryParams.postIds
             }
             getStaffListApi(param).then(response => {
                 this.tableListData = response.rows;

src/views/kitchen/staffManage/violation/index.vue

@@ -4,10 +4,20 @@
         <el-form-item label="关键字" prop="searchValue">
             <el-input v-model="queryParams.searchValue" placeholder="请输入员工姓名，编号，手机号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item> 
-        <el-form-item label="违规内容" prop="type">
+        <el-form-item label="违规内容" prop="alarmType">
-            <el-select v-model="queryParams.type" style="width: 240px" clearable> 
+            <el-select v-model="queryParams.alarmType" style="width: 240px" clearable> 
-                <el-option label="未带安全帽" value="0"></el-option>
+                <el-option label="未戴口罩" value="1"></el-option>
-                <el-option label="抽烟" value="1"></el-option>  
+                <el-option label="垃圾桶未盖报警 " value="2"></el-option>
+                <el-option label="发现老鼠" value="3"></el-option>
+                <el-option label="未穿厨师服" value="4"></el-option>
+                <el-option label="未戴厨师帽" value="5"></el-option>
+                <el-option label="未戴手套" value="6"></el-option>
+                <el-option label="抽烟" value="7"></el-option>
+                <el-option label="打电话" value="8"></el-option>
+                <el-option label="地面巡检" value="9"></el-option>
+                <el-option label="设备归位 " value="10"></el-option>
+                <el-option label="未授权人员进入 " value="11"></el-option>
+                <el-option label="动火离人" value="13"></el-option>
             </el-select>   
         </el-form-item>
       <el-form-item>
@@ -138,6 +148,8 @@ export default {
           let param = {
             "pageNum": this.queryParams.pageNum, 
             "pageSize": this.queryParams.pageSize,  
+            "searchValue": this.queryParams.searchValue,  
+            "alarmType": this.queryParams.alarmType,  
           }
           getStaffIllegalListApi(param).then(response => {
               this.tableListData = response.rows;