Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

昨天 8235731c4eb4cb44f1baf9250579f84db2c49088

Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New

 src/views/equipmentManagement/repair/index.vue

@@ -137,8 +137,9 @@

<script setup>
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { getRepairPage, delRepair } from "@/api/equipmentManagement/repair";
import { onMounted, getCurrentInstance, computed } from "vue";
import {usePaginationApi} from "@/hooks/usePaginationApi";
import {getRepairPage, delRepair} from "@/api/equipmentManagement/repair";
import RepairModal from "./Modal/RepairModal.vue";
import { ElMessageBox, ElMessage } from "element-plus";
import dayjs from "dayjs";
@@ -232,7 +233,7 @@
      dataType: "slot",
      slot: "operation",
      align: "center",
      width: "200px",
        width: "300px",
    },
  ]
);
@@ -335,6 +336,7 @@
.table_list {
  margin-top: unset;
}

.actions {
  display: flex;
  justify-content: space-between;

 src/views/equipmentManagement/upkeep/index.vue

@@ -173,6 +173,13 @@
        <template #operation="{ row }">
          <el-button
            type="primary"
              text
              @click="addMaintain(row)"
          >
            新增保养
          </el-button>
          <el-button
            type="primary"
            link
            :disabled="row.status === 1"
            @click="editPlan(row.id)"
@@ -377,7 +384,7 @@
        dataType: "slot",
        slot: "operation",
        align: "center",
        width: "200px",
        width: "300px",
    },
])