Merge remote-tracking branch 'origin/master'

zhaowei

2025-03-06 ddd818f74d59c1fdeeed29714d660d7e49200c04

 src/views/eam/PredictiveWorkOrderList.vue

@@ -1,7 +1,7 @@
<template>
  <a-card
    :bordered="false"
    title="预测维护工单"
    title=""
  >
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
@@ -14,6 +14,20 @@
            :md="6"
            :sm="8"
          >
            <a-form-item label="工单状态">
              <j-dict-select-tag
                allow-clear
                placeholder="请选择工单状态"
                :triggerChange="true"
                dictCode="maintenance_order_status"
                v-model="queryParam.status"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="维护工单编码">
              <a-input
                placeholder="请输入维护工单编码"
@@ -21,17 +35,28 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <!-- <a-col
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="点检方法名称">
              <j-input
                placeholder="请输入点检方法名称"
                v-model="queryParam.name"
              ></j-input>
            <a-form-item label="统一编码">
              <a-input
                placeholder="请输入统一编码"
                v-model="queryParam.equipmentNum"
              ></a-input>
            </a-form-item>
          </a-col> -->
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
            <a-form-item label="设备名称">
              <a-input
                placeholder="请输入设备名称"
                v-model="queryParam.equipmentName"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
@@ -60,7 +85,7 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button
      <!-- <a-button
        @click="handleAdd"
        type="primary"
        icon="plus"
@@ -70,7 +95,7 @@
        type="primary"
        @click="batchAssign"
        style="margin-left: 8px"
      >工单派工</a-button>
      >工单派工</a-button> -->
    </div>

    <!-- table区域-begin -->
@@ -107,6 +132,7 @@
          <a-popconfirm
            title="确定下发工单吗?"
            @confirm="() => handleOrderIssue(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '1'">下发</a>
          </a-popconfirm>
@@ -117,6 +143,7 @@
          <a-popconfirm
            title="确定撤回工单吗?"
            @confirm="() => handleOrderReset(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '2'">撤回</a>
          </a-popconfirm>
@@ -127,6 +154,7 @@
          <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '7'">恢复</a>
          </a-popconfirm>
@@ -137,6 +165,7 @@
          <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >
            <a v-if="record.status == '2'">作废</a>
          </a-popconfirm>
@@ -147,20 +176,19 @@
          <a-popconfirm
            title="确定领取工单吗?"
            @confirm="() => handleOrderGet(record)"
            v-has="'predictiveWorkOrder:get&do'"
          >
            <a v-if="record.status == '2' && record.assignMode == '1'">领取</a>
          </a-popconfirm>
          <a
            v-if="record.status == '2' && record.assignMode == '2'  "
            @click="handleAssignOrder(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >派工</a>
          <a
            v-if="record.status == '2'&& record.assignMode == '3'  && record.inspectionUserName != null  "
            v-if="record.status == '2'&& record.assignMode == '3'&&record.maintenanceUserName!=null"
            @click="handleAssignOrder(record)"
          >改派</a>
          <a
            v-if="record.status == '3'"
            @click="handleAssignOrder(record)"
            v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
          >改派</a>
          <a-divider
            v-if="record.status == '2'"
@@ -173,6 +201,7 @@
          <a
            v-if="record.status === '3' || record.status === '4'  "
            @click="handleOrderExe(record)"
            v-has="'predictiveWorkOrder:get&do'"
          >执行</a>
          <a-divider
            v-if="record.status === '3' || record.status === '4' "
@@ -181,6 +210,7 @@
          <a
            v-if="record.status === '1'"
            @click="handleEdit(record)"
            v-has="'predictiveWorkOrder:edit&delete'"
          >编辑</a>
          <a-divider
            v-if="record.status === '1'"
@@ -196,6 +226,7 @@
                <a-popconfirm
                  title="确定删除吗?"
                  @confirm="() => handleDelete(record.id)"
                  v-has="'predictiveWorkOrder:edit&delete'"
                >
                  <a v-if="record.status === '1'">删除</a>
                </a-popconfirm>
@@ -227,6 +258,12 @@
      ref="PredictiveWorkOrderDrawer"
      @ok="modalFormOk"
    ></predictive-work-order-drawer>
    <order-assign-modal
      ref="OrderAssign"
      @ok="modalFormOk"
    >

    </order-assign-modal>
  </a-card>
</template>

@@ -238,14 +275,14 @@
import { getAction, postAction, requestPut } from '@/api/manage'
import PredictiveWorkOrderModel from './modules/predictiveWorkOrder/PredictiveWorkOrderModel'
import PredictiveWorkOrderDrawer from './modules/predictiveWorkOrder/PredictiveWorkOrderDrawer'


import OrderAssignModal from './modules/predictiveWorkOrder/OrderAssignModal.vue'
export default {
  name: 'PredictiveWorkOrderList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    PredictiveWorkOrderModel,
    PredictiveWorkOrderDrawer
    PredictiveWorkOrderDrawer,
    OrderAssignModal
  },
  data() {
    return {
@@ -279,7 +316,7 @@
          dataIndex: 'monitorType_dictText'
        },
        {
          title: '设备编码',
          title: '统一编码',
          align: "center",
          dataIndex: 'equipmentNum',
        },
@@ -350,17 +387,17 @@
          dataIndex: 'actualEndTime',
          width: 170
        },
        {
          title: '创建人',
          align: "center",
          dataIndex: 'createBy'
        },
        {
          title: '创建日期',
          align: "center",
          dataIndex: 'createTime',
          width: 170
        },
        // {
        //   title: '创建人',
        //   align: "center",
        //   dataIndex: 'createBy'
        // },
        // {
        //   title: '创建日期',
        //   align: "center",
        //   dataIndex: 'createTime',
        //   width: 170
        // },
        {
          title: '操作',
          dataIndex: 'action',
@@ -376,8 +413,8 @@
        deleteBatch: "/eam/specialtyMaintenanceOrder/deleteBatch",
        exportXlsUrl: "/eam/specialtyMaintenanceOrder/exportXls",
        importExcelUrl: "eam/specialtyMaintenanceOrder/importExcel",
        edit: "/eam/specialtyMaintenanceOrder/editStatus",
        orderGet: "/eam/specialtyMaintenanceOrder/orderGet",
        edit: "/eam/predictiveworkorder/editStatus",
        orderGet: "/eam/predictiveworkorder/orderGet",
      },
    }
  },
@@ -409,25 +446,25 @@
    },

    handleOrderExe(record) {
      this.$refs. PredictiveWorkOrderDrawer.visible = true
      this.$refs. PredictiveWorkOrderDrawer.title = '专业保养工单执行'
      this.$refs. PredictiveWorkOrderDrawer.handleShow(record)
      this.$refs.PredictiveWorkOrderDrawer.visible = true
      this.$refs.PredictiveWorkOrderDrawer.title = '专业保养工单执行'
      this.$refs.PredictiveWorkOrderDrawer.handleShow(record)
      if (record.status === '3') {
        this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true//保存、暂存、报工
        this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true//撤销按钮
        this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = false//开工按钮
        this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true//保存、暂存、报工
        this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true//撤销按钮
        this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = false//开工按钮
      } else if (record.status === '4') {
        this.$refs. PredictiveWorkOrderDrawer.buttonDistable = false
        this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
        this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
        this.$refs.PredictiveWorkOrderDrawer.buttonDistable = false
        this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true
        this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
      } else if (record.status === '5') {
        this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
        this.$refs. PredictiveWorkOrderDrawer.revocationDistable = false
        this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
        this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true
        this.$refs.PredictiveWorkOrderDrawer.revocationDistable = false
        this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
      } else if (record.status === '7') {
        this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
        this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
        this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
        this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true
        this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true
        this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
      }
    },

@@ -491,9 +528,9 @@
      })
    },
    handleAssignOrder: function (record) {
      this.$refs.SpecialtyMaintenanceOrderAssignModal.edit(record)
      this.$refs.SpecialtyMaintenanceOrderAssignModal.title = '工单改派'
      this.$refs.SpecialtyMaintenanceOrderAssignModal.disableSubmit = false
      this.$refs.OrderAssign.edit(record)
      this.$refs.OrderAssign.title = '工单改派'
      this.$refs.OrderAssign.disableSubmit = false
    },
    // modalFormOk() {
    //   alert(0)