合并冲突

licp

2024-07-17 b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e

 src/components/do/b3-work-time-management/work-time-management.vue

@@ -1,16 +1,16 @@
<template>
  <div class="work-time-management">
    <div class="search">
<!--      <div class="search_thing">-->
<!--            <div class="search_label">周次：</div>-->
<!--            <div class="search_input" style="display: flex;align-items: center;">-->
<!--          <el-input size="small" placeholder="开始周次" clearable-->
<!--                  v-model="entity.week1"></el-input>-->
<!--            <span>&nbsp;-&nbsp;</span>-->
<!--          <el-input size="small" placeholder="结束周次" clearable-->
<!--                  v-model="entity.week2"></el-input>-->
<!--        </div>-->
<!--         </div>-->
      <!-- <div class="search_thing">
            <div class="search_label">周次：</div>
            <div class="search_input" style="display: flex;align-items: center;">
          <el-input size="small" placeholder="开始周次" clearable
                  v-model="entity.week1"></el-input>
            <span>&nbsp;-&nbsp;</span>
          <el-input size="small" placeholder="结束周次" clearable
                  v-model="entity.week2"></el-input>
        </div>
         </div> -->
         <div class="search_thing" style="width: 200px;">
            <div class="search_label">星期：</div>
            <el-select v-model="entity.weekDay" placeholder="全部" size="small" @change="refreshTable()" clearable>
@@ -226,7 +226,7 @@
               entity: {
                  week: null,
                  weekDay: null,
                  dateTime: null,
                  dateTime: new Date(),
            name:null,
                  orderBy: {
                     field: 'id',