Merge branch 'feature-task'

wlzboy

2025-10-26 2c86a8bd60deed0dd0e044bad6fb83f75d19a332

 ruoyi-ui/src/views/task/vehicle/index.vue

New file
@@ -0,0 +1,525 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="任务" prop="taskId">
        <el-select v-model="queryParams.taskId" placeholder="请选择任务" clearable filterable style="width: 200px">
          <el-option
            v-for="task in taskList"
            :key="task.taskId"
            :label="task.taskCode + ' - ' + getTaskTypeName(task.taskType)"
            :value="task.taskId"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="车辆" prop="vehicleId">
        <el-select v-model="queryParams.vehicleId" placeholder="请选择车辆" clearable filterable style="width: 200px">
          <el-option
            v-for="vehicle in vehicleList"
            :key="vehicle.vehicleId"
            :label="vehicle.vehicleNo + ' - ' + vehicle.deptName"
            :value="vehicle.vehicleId"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="车牌号" prop="vehicleNo">
        <el-input
          v-model="queryParams.vehicleNo"
          placeholder="请输入车牌号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="关联状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="请选择关联状态" clearable>
          <el-option
            v-for="dict in dict.type.sys_task_vehicle_status"
            :key="'search-' + dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="分配人" prop="assignBy">
        <el-input
          v-model="queryParams.assignBy"
          placeholder="请输入分配人"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['task:vehicle:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['task:vehicle:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['task:vehicle:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['task:vehicle:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="taskVehicleList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="任务编号" align="center" prop="taskCode" />
      <el-table-column label="任务类型" align="center" prop="taskType">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_task_type" :value="scope.row.taskType"/>
        </template>
      </el-table-column>
      <el-table-column label="车牌号" align="center" prop="vehicleNo" />
      <el-table-column label="车辆类型" align="center" prop="vehicleType">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_vehicle_type" :value="scope.row.vehicleType"/>
        </template>
      </el-table-column>
      
      <el-table-column label="分配时间" align="center" prop="assignTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.assignTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="分配人" align="center" prop="assignBy" />
      <el-table-column label="关联状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_task_vehicle_status" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['task:vehicle:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['task:vehicle:remove']"
          >删除</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-refresh"
            @click="handleStatusChange(scope.row)"
            v-hasPermi="['task:vehicle:edit']"
          >状态变更</el-button>
        </template>
      </el-table-column>
    </el-table>
    
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- 添加或修改任务车辆关联对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="任务" prop="taskId">
          <el-select v-model="form.taskId" placeholder="请选择任务" filterable clearable style="width: 100%" @change="handleTaskChange" :loading="taskListLoading">
            <el-option
              v-for="task in taskList"
              :key="task.taskId"
              :label="task.taskCode + ' - ' + getTaskTypeName(task.taskType) + ' - ' + (task.taskDescription || '无描述')"
              :value="task.taskId"
            >
              <div style="display: flex; justify-content: space-between; align-items: center;">
                <div>
                  <div style="font-weight: bold; color: #303133;">{{ task.taskCode }}</div>
                  <div style="font-size: 12px; color: #909399;">ID: {{ task.taskId }}</div>
                </div>
                <div style="text-align: right;">
                  <div style="color: #409EFF; font-size: 13px;">{{ getTaskTypeName(task.taskType) }}</div>
                  <div style="color: #8492a6; font-size: 12px;">{{ task.taskDescription || '无描述' }}</div>
                </div>
              </div>
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="车辆" prop="vehicleId">
          <el-select v-model="form.vehicleId" placeholder="请选择车辆" filterable clearable style="width: 100%" @change="handleVehicleChange" :loading="vehicleListLoading">
            <el-option
              v-for="vehicle in vehicleList"
              :key="vehicle.vehicleId"
              :label="vehicle.vehicleNo + ' - ' + (vehicle.deptName || '未分配部门')"
              :value="vehicle.vehicleId"
            >
              <div style="display: flex; justify-content: space-between; align-items: center;">
                <div>
                  <div style="font-weight: bold; color: #303133;">{{ vehicle.vehicleNo }}</div>
                  <div style="font-size: 12px; color: #909399;">ID: {{ vehicle.vehicleId }}</div>
                </div>
                <div style="text-align: right;">
                  <div style="color: #67C23A; font-size: 13px;">{{ getVehicleTypeName(vehicle.vehicleType) }}</div>
                  <div style="color: #E6A23C; font-size: 12px;">{{ vehicle.deptName || '未分配部门' }}</div>
                </div>
              </div>
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="关联状态" prop="status">
          <el-select v-model="form.status" placeholder="请选择关联状态" style="width: 100%">
            <el-option
              v-for="dict in dict.type.sys_task_vehicle_status"
              :key="'form-' + dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 状态变更对话框 -->
    <el-dialog title="状态变更" :visible.sync="statusOpen" width="400px" append-to-body>
      <el-form ref="statusForm" :model="statusForm" :rules="statusRules" label-width="80px">
        <el-form-item label="当前状态">
          <dict-tag :options="dict.type.sys_task_vehicle_status" :value="statusForm.oldStatus"/>
        </el-form-item>
        <el-form-item label="新状态" prop="newStatus">
          <el-select v-model="statusForm.newStatus" placeholder="请选择新状态">
            <el-option
              v-for="dict in dict.type.sys_task_vehicle_status"
              :key="'status-' + dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitStatusChange">确 定</el-button>
        <el-button @click="cancelStatusChange">取 消</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import { listTaskVehicle, getTaskVehicle, delTaskVehicle, addTaskVehicle, updateTaskVehicle, updateTaskVehicleStatus, listTask } from "@/api/task";
import { listVehicle } from "@/api/system/vehicle";

export default {
  name: "TaskVehicle",
  dicts: ['sys_task_vehicle_status', 'sys_vehicle_type', 'sys_task_type'],
  data() {
    return {
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 任务车辆关联表格数据
      taskVehicleList: [],
      // 任务列表
      taskList: [],
      // 车辆列表
      vehicleList: [],
      // 任务列表加载状态
      taskListLoading: false,
      // 车辆列表加载状态
      vehicleListLoading: false,
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示状态变更弹出层
      statusOpen: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        taskId: null,
        vehicleId: null,
        vehicleNo: null,
        status: null,
        assignBy: null,
      },
      // 表单参数
      form: {},
      // 状态变更表单参数
      statusForm: {},
      // 表单校验
      rules: {
        taskId: [
          { required: true, message: "任务ID不能为空", trigger: "blur" }
        ],
        vehicleId: [
          { required: true, message: "车辆ID不能为空", trigger: "blur" }
        ],
        status: [
          { required: true, message: "关联状态不能为空", trigger: "change" }
        ]
      },
      // 状态变更表单校验
      statusRules: {
        newStatus: [
          { required: true, message: "新状态不能为空", trigger: "change" }
        ]
      }
    };
  },
  created() {
    this.getList();
    this.getTaskList();
    this.getVehicleList();
  },
  methods: {
    /** 查询任务车辆关联列表 */
    getList() {
      this.loading = true;
      listTaskVehicle(this.queryParams).then(response => {
        this.taskVehicleList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    /** 获取任务列表 */
    getTaskList() {
      this.taskListLoading = true;
      // 获取所有任务列表用于下拉选择
      listTask({ pageNum: 1, pageSize: 1000 }).then(response => {
        this.taskList = response.rows || [];
        this.taskListLoading = false;
      }).catch(() => {
        this.taskListLoading = false;
      });
    },
    /** 获取车辆列表 */
    getVehicleList() {
      this.vehicleListLoading = true;
      // 获取所有车辆列表用于下拉选择
      listVehicle({ pageNum: 1, pageSize: 1000 }).then(response => {
        this.vehicleList = response.rows || [];
        this.vehicleListLoading = false;
      }).catch(() => {
        this.vehicleListLoading = false;
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        id: null,
        taskId: null,
        vehicleId: null,
        assignTime: null,
        assignBy: null,
        status: null,
        remark: null
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      // 设置默认状态为已分配
      this.form.status = 'ASSIGNED';
      this.open = true;
      this.title = "添加任务车辆关联";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
      getTaskVehicle(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改任务车辆关联";
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          // 检查是否已存在相同的任务车辆关联
          if (this.form.id == null) {
            const exists = this.taskVehicleList.find(item => 
              item.taskId === this.form.taskId && item.vehicleId === this.form.vehicleId
            );
            if (exists) {
              this.$modal.msgError("该任务和车辆的关联关系已存在，请勿重复添加");
              return;
            }
          }
          
          if (this.form.id != null) {
            updateTaskVehicle(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addTaskVehicle(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除任务车辆关联编号为"' + ids + '"的数据项？').then(function() {
        return delTaskVehicle(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('task/vehicle/management/export', {
        ...this.queryParams
      }, `task_vehicle_${new Date().getTime()}.xlsx`)
    },
    /** 状态变更按钮操作 */
    handleStatusChange(row) {
      this.statusForm = {
        id: row.id,
        oldStatus: row.status,
        newStatus: null
      };
      this.statusOpen = true;
    },
    /** 提交状态变更 */
    submitStatusChange() {
      this.$refs["statusForm"].validate(valid => {
        if (valid) {
          updateTaskVehicleStatus(this.statusForm.id, this.statusForm.newStatus).then(response => {
            this.$modal.msgSuccess("状态变更成功");
            this.statusOpen = false;
            this.getList();
          });
        }
      });
    },
    /** 取消状态变更 */
    cancelStatusChange() {
      this.statusOpen = false;
      this.statusForm = {};
    },
    /** 任务选择变化 */
    handleTaskChange(taskId) {
      if (taskId) {
        const selectedTask = this.taskList.find(task => task.taskId === taskId);
        if (selectedTask) {
          console.log('选择的任务:', selectedTask);
        }
      }
    },
    /** 车辆选择变化 */
    handleVehicleChange(vehicleId) {
      if (vehicleId) {
        const selectedVehicle = this.vehicleList.find(vehicle => vehicle.vehicleId === vehicleId);
        if (selectedVehicle) {
          console.log('选择的车辆:', selectedVehicle);
        }
      }
    },
    /** 获取车辆类型名称 */
    getVehicleTypeName(vehicleType) {
      const typeDict = this.dict.type.sys_vehicle_type;
      if (typeDict && typeDict.length > 0) {
        const typeItem = typeDict.find(item => item.value === vehicleType);
        return typeItem ? typeItem.label : vehicleType;
      }
      return vehicleType;
    },
    /** 获取任务类型名称 */
    getTaskTypeName(taskType) {
      const typeDict = this.dict.type.sys_task_type;
      if (typeDict && typeDict.length > 0) {
        const typeItem = typeDict.find(item => item.value === taskType);
        return typeItem ? typeItem.label : taskType;
      }
      return taskType;
    }
  }
};
</script>