From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 89a664d..9d51b21 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -15,6 +15,16 @@
/>
</el-form-item>
+ <el-form-item label="工单编号" prop="workOrderCode">
+ <el-input
+ class="gd-input gray"
+ v-model="searchParams.workOrderCode"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
+ </el-form-item>
+
<el-form-item label="工单类型" prop="workOrderType">
<el-cascader
class="gd-cascader gray"
@@ -60,6 +70,25 @@
/>
</el-form-item>
+ <el-form-item label="需求方名称" prop="createUserName">
+ <el-input
+ class="gd-input gray"
+ v-model="searchParams.createUserName"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
+ </el-form-item>
+ <el-form-item label="服务方名称" prop="serviceParty">
+ <el-input
+ class="gd-input gray"
+ v-model="searchParams.serviceParty"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
+ </el-form-item>
+
<el-form-item class="gd-search-actions">
<el-button :icon="RefreshRight" @click="resetForm"></el-button>
<el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
@@ -74,11 +103,11 @@
</div>
<div class="gd-table-content gd-table-content-bg">
- <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
+ <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange" @sort-change="handleSortChange">
<el-table-column type="index" width="64" label="序号" />
<el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
<el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />
- <el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型">
+ <el-table-column prop="workOrderType" show-overflow-tooltip label="工单类型" sortable="custom">
<template v-slot="{ row }">
{{ getTaskTypeLabel(row.workOrderType, workOrderTypeXT) }}
</template>
@@ -104,7 +133,7 @@
<el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
<el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
<el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" fixed="right">
<template v-slot="{ row }">
<el-link type="primary" @click="openFormChange(row)">查看</el-link>
<el-link type="primary" @click="routeManagement(row)">航线管理</el-link>
@@ -157,10 +186,14 @@
// 初始化查询参数
const initSearchParams = () => ({
workOrderName: '', // 工单名称
+ workOrderCode: '', // 工单编号
workOrderType: '', // 工单类型
workOrderStatus: '', // 工单状态
executeStartTime: '', // 执行开始时间
executeEndTime: '', // 执行结束时间
+ createUserName: '', // 需求方名称
+ serviceParty: '', // 服务方名称
+ typePinyinFirst: '', // 工单类型拼音首字母（大写）
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -196,6 +229,7 @@
endTime: range[1],
createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
workOrderType: searchParams?.value?.workOrderType?.join?.(','),
+ typePinyinFirst: typePinyinFirst.value,
})
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
@@ -311,10 +345,47 @@
myTotal.value = myRes?.data?.data?.total ?? 0
}
+// 工单类型排序方向：asc（升序）/ desc（降序）/ ''（不排序）
+const typePinyinFirst = ref('')
+
+// 点击工单类型排序三角：上三角传 asc，下三角传 desc
+function handleSortChange({ prop, order }) {
+ if (prop !== 'workOrderType') return
+ typePinyinFirst.value = order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : ''
+ searchParams.value.current = 1
+ getList()
+}
+
onMounted(() => {
getTabTotals()
getList()
getDictList()
})
</script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.gd-search-form {
+ // 搜索项较多，用栅格分两排整齐排列（4 列 × 2 行）
+ display: grid;
+ grid-template-columns: repeat(5, max-content);
+ gap: 16px 40px;
+ align-items: center;
+
+ // 清除公共样式里的行内间距，交给 grid 的 gap 统一控制
+ :deep(.el-form-item) {
+ margin: 0 !important;
+ }
+
+ // 固定 label 宽度，让每一列的输入框起点对齐
+ :deep(.el-form-item__label) {
+ width: 84px;
+ margin-right: 12px;
+ flex-shrink: 0;
+ }
+
+ // 操作按钮紧跟最后一个搜索项
+ :deep(.gd-search-actions) {
+ justify-self: start;
+ margin-left: 30px !important;
+ }
+}
+</style>
--
Gitblit v1.9.3