审批完成

qushaowei

2023-09-01 ee3df152bfd2b3dd4083f7856caaf7f02601e180

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -117,7 +117,7 @@
      <a-table
        ref="table"
        size="middle"
        :scroll="{ x: 'calc(2500px + 50%)', y: 900 }"
        :scroll="{ x: 'calc(2800px + 50%)', y: 900 }"
        bordered
        rowKey="id"
        :columns="columns"
@@ -129,94 +129,6 @@
        :rowSelection="rowSelection"
        :rowClassName="tableRowClass"
      >
        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
        <!-- <span
          slot="action"
          slot-scope="text, record"
        >
          <a-popconfirm
            title="确定下发工单吗?"
            @confirm="() => handleOrderIssue(record)"
          >
            <a v-if="record.status === '1'">下发</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status === '1'"
            type="vertical"
          />
          <a-popconfirm
            title="确定撤回工单吗?"
            @confirm="() => handleOrderReset(record)"
          >
            <a v-if="record.status === '2'">撤回</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status === '2'"
            type="vertical"
          />
          <a-popconfirm
            title="确定恢复工单吗?"
            @confirm="() => handleOrderRecover(record)"
          >
            <a v-if="record.status === '7'">恢复</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status === '7'"
            type="vertical"
          />
          <a-popconfirm
            title="确定作废工单吗?"
            @confirm="() => handleOrderCancel(record)"
          >
            <a v-if="record.status === '2'">作废</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status === '2'"
            type="vertical"
          />
          <a-popconfirm
            title="确定领取工单吗?"
            @confirm="() => handleOrderGet(record)"
          >
            <a v-if="record.status === '2'">领取</a>
          </a-popconfirm>
          <a-divider
            v-if="record.status === '2'"
            type="vertical"
          />
          <a
            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '7' "
            @click="handleOrderExe(record)"
          >执行</a>
          <a-divider
            v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
            type="vertical"
          />
          <a
            v-if="record.status === '1'"
            @click="handleEdit(record)"
          >编辑</a>
          <a-divider
            v-if="record.status === '1'"
            type="vertical"
          />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm
                  title="确定删除吗?"
                  @confirm="() => handleDelete(record.id)"
                >
                  <a v-if="record.status === '1'">删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span> -->

        <span
          slot="action"
@@ -313,6 +225,14 @@
            v-if="record.status === '1'"
            type="vertical"
          />
          <a
            v-if="record.status === '5'"
            @click="handleFinish(record)"
          >确认</a>
          <a-divider
            v-if="record.status === '5'"
            type="vertical"
          />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
@@ -351,6 +271,10 @@
      ref="modalForm"
      @ok="modalFormOk"
    ></maintenance-order-modal>
    <finish-devolution-modal
      ref="FinishDevolutionModal"
      @ok="modalFormOk"
    ></finish-devolution-modal>
    <maintenance-order-assign-modal
      ref="MaintenanceOrderAssignModal"
      @ok="modalFormOk"
@@ -368,6 +292,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MaintenanceOrderModal from './modules/dailyMaintenanceOrder/MaintenanceOrderModal'
import FinishDevolutionModal from './modules/dailyMaintenanceOrder/FinishDevolutionModal'
import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
import DailyMaintenanceOrderExeDrawer from './modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer'
import { getAction, postAction, requestPut } from '@/api/manage'
@@ -377,6 +302,7 @@
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    MaintenanceOrderModal,
    FinishDevolutionModal,
    MaintenanceOrderAssignModal,
    DailyMaintenanceOrderExeDrawer
  },
@@ -487,6 +413,11 @@
          dataIndex: 'maintenanceUserName'
        },
        {
          title: '问题及相应处理措施描述',
          align: "center",
          dataIndex: 'description'
        },
        {
          title: '创建人',
          align: "center",
          dataIndex: 'createBy'
@@ -575,6 +506,12 @@
      }
    },

    handleFinish: function (record) {
      this.$refs.FinishDevolutionModal.edit(record);
      this.$refs.FinishDevolutionModal.title = "生产设备二级保养完工移交单";
      this.$refs.FinishDevolutionModal.disableSubmit = false;
    },

    handleOrderIssue(record) {
      const that = this;
      requestPut(that.url.edit, { id: record.id, status: '2' }).then((res) => {