Browse Source

优化查询轮班人员

liaoyitao 3 months ago
parent
commit
aaf7f7c199

+ 2 - 0
src/views/info/organizationInfo/index.vue

@@ -651,6 +651,8 @@ export default {
651
     /** 重置按钮操作 */
651
     /** 重置按钮操作 */
652
     resetQuery() {
652
     resetQuery() {
653
       this.resetForm("queryForm");
653
       this.resetForm("queryForm");
654
+      this.queryParams.industryType = null
655
+      console.log(this.queryParams)
654
       this.handleQuery();
656
       this.handleQuery();
655
     },
657
     },
656
     // 多选框选中数据
658
     // 多选框选中数据

+ 5 - 16
src/views/info/shiftPersonnel/index.vue

@@ -13,7 +13,7 @@
13
           </el-select>
13
           </el-select>
14
         </template>
14
         </template>
15
       </el-form-item>
15
       </el-form-item>
16
-      <el-form-item label="轮班人员名字" prop="personnelName">
16
+      <el-form-item label="轮班人员" prop="personnelName">
17
         <el-input
17
         <el-input
18
           v-model="queryParams.personnelName"
18
           v-model="queryParams.personnelName"
19
           placeholder="请输入轮班人员名字"
19
           placeholder="请输入轮班人员名字"
@@ -22,24 +22,14 @@
22
           @keyup.enter.native="handleQuery"
22
           @keyup.enter.native="handleQuery"
23
         />
23
         />
24
       </el-form-item>
24
       </el-form-item>
25
-      <el-form-item label="值班开始时间" prop="startTime">
25
+      <el-form-item label="值班时间" prop="startTime">
26
         <el-time-picker clearable size="small"
26
         <el-time-picker clearable size="small"
27
-                        v-model="queryParams.startTime"
27
+                        v-model="queryParams.workTime"
28
                         value-format="HH:mm:ss"
28
                         value-format="HH:mm:ss"
29
                         :picker-options="{
29
                         :picker-options="{
30
                               selectableRange: '00:00:00 - 23:59:59'
30
                               selectableRange: '00:00:00 - 23:59:59'
31
                             }"
31
                             }"
32
-                        placeholder="选择值班开始时间">
33
-        </el-time-picker>
34
-      </el-form-item>
35
-      <el-form-item label="值班结束时间" prop="endTime">
36
-        <el-time-picker clearable size="small"
37
-                        v-model="queryParams.endTime"
38
-                        value-format="HH:mm:ss"
39
-                        :picker-options="{
40
-                              selectableRange: '00:00:00 - 23:59:59'
41
-                            }"
42
-                        placeholder="选择值班结束时间">
32
+                        placeholder="选择值班时间">
43
         </el-time-picker>
33
         </el-time-picker>
44
       </el-form-item>
34
       </el-form-item>
45
       <el-form-item>
35
       <el-form-item>
@@ -219,8 +209,7 @@ export default {
219
         pageSize: 10,
209
         pageSize: 10,
220
         parkingId: null,
210
         parkingId: null,
221
         personnelName: null,
211
         personnelName: null,
222
-        startTime: null,
223
-        endTime: null,
212
+        workTime: null,
224
       },
213
       },
225
       queryParkingLotParams: {
214
       queryParkingLotParams: {
226
         pageNum: 1,
215
         pageNum: 1,