gaoluyang
2024-07-19 4923b169e7c0b2d5b516e414029b2b3dd04e2430
日工时管理批量审核,批准接口传参修改
已修改2个文件
27 ■■■■■ 文件已修改
src/components/do/b3-work-time-management/work-time-statistics.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/tool/value-table.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -57,9 +57,10 @@
    <div class="table">
      <ValueTable ref="ValueTable0"
        v-if="currentTable == 'value0'" :isColumnWidth="true"
                  :isShowZero="true"
                :url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
                :componentData="componentData" :key="upIndex" />
      <ValueTable ref="ValueTable1"
      <ValueTable ref="ValueTable1" :isShowZero="true"
        v-if="currentTable == 'value1'" :isColumnWidth="true"
                :url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
        :inputUrl="$api.auxiliaryCorrectionHours.upload"
src/components/tool/value-table.vue
@@ -123,7 +123,7 @@
        </el-table-column>
        <el-table-column type="index" align="center" label="序号" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
        </el-table-column>
        <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width"
        <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
          v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
          <template slot-scope="scope">
            <div v-if="showType(a.label, data.tagField) != null">
@@ -348,6 +348,10 @@
        default: () => '155'
      },
      isColumnWidth: {
        type: Boolean,
        default: () => false
      },
      isShowZero: {
        type: Boolean,
        default: () => false
      },
@@ -620,6 +624,15 @@
          this.total = res.data.body.total
          this.tableHead = res.data.head
          this.tableData = res.data.body.records
          if (this.isShowZero) {
            this.tableData.map(item => {
              Object.keys(item).forEach(val => {
                if (item[val] === null && !val.includes('Hours')) {
                  item[val] = '/'
                }
              })
            })
          }
          if (this.tableData.length === 0 && this.page.current > 1) {
            this.selectList('lastPage')
          }
@@ -1157,14 +1170,7 @@
          list.forEach(item => {
            delete item.orderBy
            item.state = state
            if (e === 0) {
              auxiliaryWorkingHoursDays.push(item)
            } else {
              auxiliaryWorkingHoursDays.push({
                id: item.id,
                state: item.state
              })
            }
            auxiliaryWorkingHoursDays.push(item)
          })
          this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
            },{