Merge remote-tracking branch 'origin/master'

value

2024-05-31 620880da2e11fe0a56d24662f4736332bf08e9e5

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

@@ -5,17 +5,17 @@
            <div class="search_label">日期：</div>
            <div class="search_input" style="display: flex;align-items: center;">
          <el-date-picker
            v-model="componentData.entity.laboratory"
            v-model="componentData.entity.month"
            type="month"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            format="yyyy-MM"
            value-format="yyyy"
            placeholder="选择月" size="small" style="width: 100%;">
          </el-date-picker>
        </div>
         </div>
         <div class="search_thing">
            <div class="search_label">员工：</div>
            <el-select v-model="componentData.entity.laboratory" placeholder="全部" size="small" @change="refreshTable()">
            <el-select v-model="componentData.entity.name" placeholder="全部" size="small" @change="refreshTable()">
               <el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
            </el-select>
@@ -28,7 +28,7 @@
            </el-option>
          </el-select> -->
          <el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.department" @keyup.enter.native="refreshTable()"></el-input>
                  v-model="componentData.entity.departLims" @keyup.enter.native="refreshTable()"></el-input>
        </div>
         </div>
         <div class="search_thing" style="padding-left: 30px;width: 100px;">
@@ -52,8 +52,8 @@
            :url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours"
            :componentData="componentData" :inputUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :downUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :key="upIndex" />
      <ValueTable ref="ValueTable1"
        v-show="currentTable == 'value1'"
            :url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours"
        v-if="currentTable == 'value1'"
            :url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
            :componentData="componentData0" :key="upIndex" />
    </div>
  </div>
@@ -61,6 +61,9 @@

<script>
import ValueTable from '../../tool/value-table.vue'
import {
      getYearAndMonthAndDays
   } from '../../../util/date'
export default {
  components: {
    ValueTable
@@ -69,9 +72,9 @@
    return{
      componentData: {
               entity: {
                  number: null,
                  department: null,
                  laboratory: null,
                  month: null,
                  name: null,
                  departLims: null,
                  orderBy: {
                     field: 'id',
                     order: 'desc'
@@ -118,9 +121,9 @@
         },
      componentData0: {
               entity: {
                  number: null,
                  department: null,
                  laboratory: null,
                  month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
                  name: null,
                  departLims: null,
                  orderBy: {
                     field: 'id',
                     order: 'desc'
@@ -165,6 +168,7 @@
               requiredAdd: [],
               requiredUp: []
         },
      entity:{},
      upIndex:0,
      weekList:[],
      personList:[],
@@ -175,6 +179,9 @@
    this.getUsers()
  },
  methods: {
    getYearAndMonthAndDays(date){
      return getYearAndMonthAndDays(date)
    },
    refresh(){},
    refreshTable(){},
    getUsers(){