From 09e6dc3fb7266620fafb5e341808a8eb36e080a1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 13 十二月 2025 22:51:52 +0800
Subject: [PATCH] feat:增加企业微信消息提醒
---
ruoyi-ui/src/views/task/general/index.vue | 67 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/ruoyi-ui/src/views/task/general/index.vue b/ruoyi-ui/src/views/task/general/index.vue
index 44fcef9..382cc4a 100644
--- a/ruoyi-ui/src/views/task/general/index.vue
+++ b/ruoyi-ui/src/views/task/general/index.vue
@@ -29,6 +29,14 @@
/>
</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="璁″垝寮�濮嬫椂闂�">
<el-date-picker
v-model="dateRange"
@@ -94,64 +102,46 @@
<el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浠诲姟缂栧彿" align="center" prop="taskCode" min-width="180">
+ <el-table-column label="浠诲姟缂栧彿" align="center" prop="showTaskCode" min-width="120">
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['task:general:query']"
style="font-family: 'Courier New', monospace; font-size: 13px;"
- >{{ scope.row.taskCode }}</el-button>
+ >{{ scope.row.showTaskCode }}</el-button>
</template>
</el-table-column>
<el-table-column label="浠诲姟绫诲瀷" align="center" prop="taskType" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_task_type" :value="scope.row.taskType"/>
- <el-tag v-if="scope.row.taskType === 'EMERGENCY_TRANSFER'" type="danger" size="mini" style="margin-left: 5px;">
- <i class="el-icon-warning"></i>
- </el-tag>
+
</template>
</el-table-column>
- <el-table-column label="鍚屾鐘舵��" align="center" prop="syncStatus" width="120" v-if="hasEmergencyTask">
- <template slot-scope="scope">
- <span v-if="scope.row.taskType !== 'EMERGENCY_TRANSFER'" style="color: #C0C4CC;">--</span>
- <el-tag v-else-if="!scope.row.emergencyInfo" type="info" size="mini">--</el-tag>
- <el-tag v-else-if="scope.row.emergencyInfo.syncStatus === 0" type="info" size="mini">
- <i class="el-icon-warning"></i> 鏈悓姝�
- </el-tag>
- <el-tag v-else-if="scope.row.emergencyInfo.syncStatus === 1" type="warning" size="mini">
- <i class="el-icon-loading"></i> 鍚屾涓�
- </el-tag>
- <el-tag v-else-if="scope.row.emergencyInfo.syncStatus === 2" type="success" size="mini">
- <i class="el-icon-success"></i> 宸插悓姝�
- </el-tag>
- <el-tag v-else-if="scope.row.emergencyInfo.syncStatus === 3" type="danger" size="mini">
- <i class="el-icon-error"></i> 鍚屾澶辫触
- </el-tag>
- </template>
- </el-table-column>
+
<el-table-column label="浠诲姟鐘舵��" align="center" prop="taskStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_task_status" :value="scope.row.taskStatus"/>
</template>
</el-table-column>
- <el-table-column label="鍑哄彂鍦板潃" align="center" prop="departureAddress" show-overflow-tooltip />
- <el-table-column label="鐩殑鍦板潃" align="center" prop="destinationAddress" show-overflow-tooltip />
+ <el-table-column label="杞︾墝鍙�" align="center" prop="vehicleNo" width="120">
+ <template slot-scope="scope">
+ <span v-if="scope.row.vehicleNo">{{ scope.row.vehicleNo }}</span>
+ <span v-else style="color: #C0C4CC;">--</span>
+ </template>
+ </el-table-column>
+
+ <!-- <el-table-column label="鐩殑鍦板潃" align="center" prop="destinationAddress" show-overflow-tooltip /> -->
<el-table-column label="棰勮鍏噷鏁�" align="center" prop="estimatedDistance" width="120">
<template slot-scope="scope">
<span v-if="scope.row.estimatedDistance">{{ scope.row.estimatedDistance }} km</span>
<span v-else style="color: #C0C4CC;">--</span>
</template>
</el-table-column>
- <el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" prop="plannedStartTime" width="180">
- <template slot-scope="scope">
- <span v-if="scope.row.plannedStartTime">{{ parseTime(scope.row.plannedStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- <span v-else style="color: #C0C4CC;">--</span>
- </template>
- </el-table-column>
+
<el-table-column label="鍒涘缓浜�" align="center" prop="creatorName" />
- <el-table-column label="鎵ц浜�" align="center" prop="assigneeName" />
+
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -166,27 +156,27 @@
@click="handleView(scope.row)"
v-hasPermi="['task:general:query']"
>鏌ョ湅</el-button>
- <el-button
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['task:general:edit']"
- >淇敼</el-button>
- <el-button
+ >淇敼</el-button> -->
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-user"
@click="handleAssign(scope.row)"
v-hasPermi="['task:general:assign']"
- >鍒嗛厤</el-button>
- <el-button
+ >鍒嗛厤</el-button> -->
+ <!-- <el-button
size="mini"
type="text"
icon="el-icon-refresh"
@click="handleStatusChange(scope.row)"
v-hasPermi="['task:general:status']"
- >鐘舵��</el-button>
+ >鐘舵��</el-button> -->
<el-button
size="mini"
type="text"
@@ -435,6 +425,7 @@
taskCode: null,
taskType: null,
taskStatus: null,
+ vehicleNo: null,
plannedStartTimeBegin: null,
plannedStartTimeEnd: null,
},
--
Gitblit v1.9.1