Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

qushaowei

2024-03-14 e055d2d93b516985fbc2df0f6f5a135f3230cccf

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue

@@ -3,10 +3,10 @@
    <!-- 查询区域 -->
    <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
        <a-row :gutter="24" style="width: 100%;">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYYMMDD"/>
            </a-form-item>
          </a-col>
          <a-col :md="5" :sm="5">
@@ -166,25 +166,25 @@
          {
            title: '日期',
            align: 'center',
            dataIndex: 'effectiveDate',
            dataIndex: 'theDate',
            width:150
            // scopedSlots:{customRender:'startTime'},
            // customRender:(text,row,index) => {
            //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
            // }
          },
          {
            title: '班次开始时间',
            align: 'center',
            dataIndex: 'startDate',
            width:150
          },
          {
            title: '班次结束时间',
            align: 'center',
            dataIndex: 'endDate',
            width:150
          },
          // {
          //   title: '班次开始时间',
          //   align: 'center',
          //   dataIndex: 'startDate',
          //   width:150
          // },
          // {
          //   title: '班次结束时间',
          //   align: 'center',
          //   dataIndex: 'endDate',
          //   width:150
          // },
          {
            title: '加班开始时间',
            align: 'center',
@@ -202,13 +202,13 @@
            align: 'center',
            dataIndex: 'duration',
            scopedSlots: {customRender: 'duration'},
            width:150
            width:200
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'remark',
            width:150
            width:210
          },
          {
            title: '操作',