Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

IPC-610

2024-10-15 79ad6097cbe4b4d6cee66dd8ad9c3c1c8f2b5243

 Web/src/views/wcs/wcsTask/index.vue

@@ -1,8 +1,8 @@
<template>
  <div class="wcsTask-container">
    <el-row :gutter="8" style="width: 100%; height: 100%; flex: 1">
      <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
        <el-card class="full-table" shadow="hover" ::body-style="{ height: 'calc(100% - 51px)' }">
      <el-col :span="14" :xs="24" style="display: flex; height: 100%; flex: 1">
        <el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
          <template #header>
            <el-icon size="16"
              style="margin-right: 3px; display: inline; vertical-align: middle"><ele-Collection /></el-icon>任务日志
@@ -67,7 +67,8 @@
          <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" row-key="id"
            @cell-click="handleClick" @sort-change="sortChange" border="">
            <el-table-column type="index" label="序号" width="55" align="center" />
            <el-table-column prop="taskNo" label="任务号" show-overflow-tooltip="" />
            <el-table-column prop="taskNo" label="任务号" width="130" show-overflow-tooltip="" />
            <el-table-column prop="levels" label="优先级" width="55" show-overflow-tooltip="" />
            <el-table-column prop="taskType" width="85" label="任务类型" show-overflow-tooltip="">
              <template #default="scope">
                <el-tag :type="dv('TaskTypeEnum', scope.row.taskType)?.tagType"> {{ dv('TaskTypeEnum',
@@ -114,7 +115,7 @@
                <ModifyRecord :data="scope.row" />
              </template>
            </el-table-column> -->
            <el-table-column prop="操作" label="操作" width="150" align="center" fixed="right" show-overflow-tooltip=""
            <el-table-column prop="操作" label="操作" width="200" align="center" fixed="right" show-overflow-tooltip=""
              v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
              <template #default="scope">
                <template v-if="scope.row.status <= 1">
@@ -127,6 +128,10 @@
                  <el-button icon="ele-Upload" size="small" text="" type="primary" @click="uploadTask(scope.row)"
                    v-auth="'wcsTask:cancell'"> 上传 </el-button>
                </template>
                <template v-if="scope.row.status == 0">
                  <el-button icon="ele-Top" size="small" text="" type="primary" @click="topUpTask(scope.row)"
                    v-auth="'wcsTask:cancell'"> 置顶 </el-button>
                </template>
              </template>
            </el-table-column>
          </el-table>
@@ -138,7 +143,7 @@
          <editDialog ref="editDialogRef" :title="editWcsTaskTitle" @reloadTable="handleQuery" />
        </el-card>
      </el-col>
      <el-col :span="12" :xs="24" style="display: flex; height: 100%; flex: 1">
      <el-col :span="10" :xs="24" style="display: flex; height: 100%; flex: 1">
        <el-card class="full-table" shadow="hover" :body-style="{ height: 'calc(100% - 51px)' }">
          <template #header>
            <el-icon size="16"
@@ -148,10 +153,10 @@
            <el-row>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
                <el-form-item label="任务号">
                  <el-input v-model="queryParams2.taskNo" clearable="" placeholder="请输入任务号" />
                  <el-input v-model="queryParams2.taskNo" clearable="" placeholder="请输入任务号"style="width: 130px;" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" style="margin-left: 20px;">
                <el-form-item>
                  <el-button type="primary" icon="ele-Search" @click="handleQuery2"> 查询
                  </el-button>
@@ -195,7 +200,7 @@

import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
import { pageWcsTask, finshWcsTask, uploadWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsTask, finshWcsTask, uploadWcsTask,topUpWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';

@@ -333,10 +338,27 @@
  })
    .then(async () => {
      var param = Object.assign(row);
      await uploadWcsTask(param);
      await topUpTask(param);
      handleQuery();
      handleQuery2();
      ElMessage.success("上传任务成功");
      ElMessage.success("置顶任务成功");
    })
    .catch(() => { });

}
//置顶任务
const topUpTask = async (row: any) => {
  ElMessageBox.confirm(`确定要置顶任务吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(async () => {
      var param = Object.assign(row);
      await topUpWcsTask(param);
      handleQuery();
      handleQuery2();
      ElMessage.success("置顶任务成功");
    })
    .catch(() => { });