buhuazhen
4 天以前 2f3f713465e0a538dfa49fc187b8b8d84b3f0a55
feat 页面显示巡检状态
已修改3个文件
77 ■■■■ 文件已修改
src/views/equipmentManagement/inspectionManagement/index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/repair/index.vue 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/workOrder/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/inspectionManagement/index.vue
@@ -70,6 +70,17 @@
                    class="no-data">--</span>
            </div>
          </template>
          <template #status="{ row }">
            <el-tag v-if="row.status === 'EXPIRED'"
                    type="danger"
                    size="small">已过期</el-tag>
            <el-tag v-else-if="row.status === 'IN_PROGRESS'"
                    type="warning"
                    size="small">巡检中</el-tag>
            <el-tag v-else
                    type="info"
                    size="small">待巡检</el-tag>
          </template>
        </PIMTable>
      </div>
    </el-card>
@@ -127,7 +138,7 @@
  const pageNum = ref(1);
  const pageSize = ref(10);
  // 列配置
  // 列配置(基础列,不含状态)
  const columns = ref([
    { prop: "taskName", label: "巡检任务名称", minWidth: 160 },
    { prop: "remarks", label: "备注", minWidth: 150 },
@@ -227,6 +238,15 @@
    radioChange("taskManage");
  });
  // 状态列配置(仅定时任务记录显示)
  const statusColumn = {
    prop: "status",
    label: "状态",
    minWidth: 100,
    dataType: "slot",
    slot: "status"
  };
  // 单选变化
  const radioChange = value => {
    if (value === "taskManage") {
@@ -240,6 +260,7 @@
      const operationColumn = getOperationColumn(["upload", "viewFile"]);
      tableColumns.value = [
        ...columns.value,
        statusColumn,  // 定时任务记录添加状态列
        ...(operationColumn ? [operationColumn] : []),
      ];
      operationsArr.value = ["upload", "viewFile"];
src/views/equipmentManagement/repair/index.vue
@@ -41,13 +41,17 @@
            @change="getTableData"
        />
      </el-form-item>
      <el-form-item label="报修日期">
      <el-form-item label="报修时间">
        <el-date-picker
            v-model="filters.repairTimeStr"
            type="date"
            placeholder="请选择报修日期"
            size="default"
            @change="(date) => handleDateChange(date,2)"
            v-model="filters.repairTimeRange"
            type="datetimerange"
            range-separator="至"
            start-placeholder="开始时间"
            end-placeholder="结束时间"
            format="YYYY-MM-DD HH:mm:ss"
            value-format="YYYY-MM-DD HH:mm:ss"
            style="width: 360px"
            @change="handleRepairTimeChange"
        />
      </el-form-item>
      <el-form-item label="维修日期">
@@ -189,7 +193,9 @@
      deviceModel: undefined,
      remark: undefined,
      maintenanceName: undefined,
      repairTimeStr: undefined,
      repairTimeRange: undefined,
      repairTimeStart: undefined,
      repairTimeEnd: undefined,
      maintenanceTimeStr: undefined,
    },
    [
@@ -256,21 +262,31 @@
        align: "center",
        width: "300px",
      },
    ]
    ],
    null,
    {
      // 过滤掉 repairTimeRange,只发送 repairTimeStart 和 repairTimeEnd
      repairTimeRange: () => ({})
    }
);
// type === 1 维修 2报修间
// 报修时间范围变化
const handleRepairTimeChange = (value) => {
  if (value && value.length === 2) {
    filters.repairTimeStart = value[0];
    filters.repairTimeEnd = value[1];
  } else {
    filters.repairTimeStart = undefined;
    filters.repairTimeEnd = undefined;
  }
  getTableData();
};
// type === 1 维修
const handleDateChange = (value, type) => {
  filters.maintenanceTimeStr = null
  filters.c = null
  if (type === 1) {
    if (value) {
  if (type === 1 && value) {
      filters.maintenanceTimeStr = dayjs(value).format("YYYY-MM-DD");
    }
  } else {
    if (value) {
      filters.repairTimeStr = dayjs(value).format("YYYY-MM-DD");
    }
  }
  getTableData();
};
src/views/productionManagement/workOrder/index.vue
@@ -1068,8 +1068,8 @@
          showReportDialog(row);
        },
        // // 用户当前id
        // disabled: row => row.completeQuantity >= row.planQuantity ||
        //     !isCurrentUserInUserIds(row) || row.hasUnreportedMachine
        disabled: row => row.completeQuantity >= row.planQuantity ||
            !isCurrentUserInUserIds(row) || row.hasUnreportedMachine
      },
      {
        name: "生产排产",