表格合并以及权限添加

lxp

2025-03-18 ee38779810cfbe512788f71679aaaaa7fedb1775

 src/views/performance/manHour/work-time-management.vue

@@ -124,6 +124,7 @@
          type="primary"
          @click="openAdd"
          v-show="currentTable == 'ValueTable0'"
           v-hasPermi="['performance:manHour:workTimeManagement:enterData']"
          >录入数据</el-button
        >
        <el-button
@@ -131,6 +132,7 @@
          type="primary"
          @click="handleOut"
          :loading="outLoading"
          v-hasPermi="['performance:manHour:workTimeManagement:export']"
          >导 出</el-button
        >
        <el-button
@@ -138,6 +140,7 @@
          type="primary"
          v-show="currentTable == 'ValueTable0'"
          @click="openBatchCheck(0)"
          v-hasPermi="['performance:manHour:workTimeManagement:batchExamine']"
          >批量审核</el-button
        >
        <el-button
@@ -145,6 +148,7 @@
          type="primary"
          v-show="currentTable == 'ValueTable0'"
          @click="openBatchCheck(1)"
          v-hasPermi="['performance:manHour:workTimeManagement:batchApprove']"
          >批量批准</el-button
        >
      </div>
@@ -158,7 +162,7 @@
        :column="column"
        :key="upIndex"
        :tableLoading="tableLoading"
        :height="'calc(100vh - 270px)'"
        :height="tableHeight+''"
        :page="page"
        @pagination="pagination"
      ></lims-table>
@@ -169,7 +173,7 @@
        :column="column1"
        :key="upIndex1"
        :tableLoading="tableLoading1"
        :height="'calc(100vh - 270px)'"
        :height="tableHeight+''"
        :page="page1"
        @pagination="pagination1"
      ></lims-table>
@@ -477,6 +481,8 @@
} from "../../../api/business/manHour";
import { getYearAndMonthAndDays } from "../../../utils/date";

import auth from "@/plugins/auth.js";

import { getDicts } from "@/api/system/dict/data";
import Big from "big.js";
export default {
@@ -485,6 +491,7 @@
  },
  data() {
    return {
      tableHeight: "",
        shiftList:[],
      tableData: [],
      column: [
@@ -597,6 +604,9 @@
              clickFun: (row) => {
                this.del(row);
              },
              showHide: () => {
                return auth.hasPermi('performance:manHour:workTimeManagement:del');
              }
            },
            {
              name: "编辑",
@@ -604,6 +614,9 @@
              clickFun: (row) => {
                this.handleEdit(row);
              },
              showHide: () => {
                return auth.hasPermi('performance:manHour:workTimeManagement:edit');
              }
            },
            {
              name: "审核",
@@ -611,6 +624,9 @@
              clickFun: (row) => {
                this.handleCheck(row);
              },
              showHide: () => {
                return auth.hasPermi('performance:manHour:workTimeManagement:examine');
              }
            },
            {
              name: "批准",
@@ -618,6 +634,9 @@
              clickFun: (row) => {
                this.handleRatify(row);
              },
              showHide: () => {
                return auth.hasPermi('performance:manHour:workTimeManagement:approve');
              }
            },
          ],
        },
@@ -840,6 +859,7 @@
    //当只有产量工时tab页时，当前页改为产量工时页
    this.selectEnumByCategory();
    this.setDate();
    this.getTableHeight();
  },
  mounted() {
    console.log(11);
@@ -849,6 +869,9 @@
    this.entityCopy1 = this.HaveJson(this.entity);
  },
  methods: {
    getTableHeight() {
      this.tableHeight = window.innerHeight -50 -46 - 63 - 80 - 41 -30 -30 -32;
    },
    del(row) {
      console.log(row);
      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
@@ -889,8 +912,8 @@
        console.log('产量工时');
        this.tableLoading1 = true;
        let params = {
            current: this.page.current,
            size: this.page.size,
            current: this.page1.current,
            size: this.page1.size,
            dateTime1: this.entity.dateTime[0],
            dateTime2: this.entity.dateTime[1],
            week: this.entity.week,
@@ -906,13 +929,13 @@
          });
      }
    },
    pagination({ current, limit }) {
      this.page.current = current;
    pagination({ page, limit }) {
      this.page.current = page;
      this.page.size = limit;
      this.getData();
    },
    pagination1({ current, limit }) {
      this.page1.current = current;
    pagination1({ page, limit }) {
      this.page1.current = page;
      this.page1.size = limit;
      this.getData();
    },