From 4b3c357f2fa24a27eac3fe59cbf64e34255ab212 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 30 Jun 2026 11:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 125 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index af58260..fa779ae 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -6,28 +6,58 @@
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="任务名称" prop="patrolTaskName">
- <el-input class="gd-input gray" v-model="searchParams.patrolTaskName" placeholder="请输入" clearable
- @clear="handleSearch" />
+ <el-input
+ class="gd-input gray"
+ v-model="searchParams.patrolTaskName"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
</el-form-item>
<el-form-item label="任务类型" prop="patrolTaskType">
- <el-cascader class="gd-cascader gray" popper-class="gd-cascader-popper" v-model="searchParams.patrolTaskType"
- :options="workOrderTypeXT" :props="taskTypeFilterCascaderProps" placeholder="请选择" clearable
- @change="handleSearch" />
+ <el-cascader
+ class="gd-cascader gray"
+ popper-class="gd-cascader-popper"
+ v-model="searchParams.patrolTaskType"
+ :options="workOrderTypeXT"
+ :props="taskTypeCascaderProps"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ />
</el-form-item>
<el-form-item label="任务状态" prop="taskStatus">
- <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.taskStatus"
- placeholder="请选择" clearable @change="handleSearch">
- <el-option v-for="item in dictObj.taskStatus" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey" />
+ <el-select
+ class="gd-select gray"
+ popper-class="gd-select-popper"
+ v-model="searchParams.taskStatus"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in dictObj.taskStatus"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey"
+ />
</el-select>
</el-form-item>
<el-form-item label="执行时间" prop="executeTime">
- <el-date-picker class="gd-date-picker gray" popper-class="gd-date-picker-popper" v-model="dateRange"
- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
- value-format="YYYY-MM-DD HH:mm:ss" @change="handleSearch" />
+ <el-date-picker
+ class="gd-date-picker gray"
+ popper-class="gd-date-picker-popper"
+ v-model="dateRange"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ @change="handleSearch"
+ />
</el-form-item>
<el-form-item class="gd-search-actions">
@@ -38,8 +68,7 @@
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-toolbar">
- <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary"
- @click="openForm('add')">
+ <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
拆分工单
</el-button>
</div>
@@ -75,15 +104,25 @@
</div>
<div class="gd-pagination-parent">
- <el-pagination popper-class="gd-select-popper" v-model:current-page="searchParams.current"
- v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
- @change="getList" />
+ <el-pagination
+ popper-class="gd-select-popper"
+ v-model:current-page="searchParams.current"
+ v-model:page-size="searchParams.size"
+ layout="total, prev, pager, next, sizes"
+ :total="total"
+ @change="getList"
+ />
</div>
</div>
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
- <ViewDiaLog ref="viewDiaLogRef" @success="getList" @refusalAccept="refusalAccept" v-if="viewDiaLogVisible"
- v-model="viewDiaLogVisible" />
+ <ViewDiaLog
+ ref="viewDiaLogRef"
+ @success="getList"
+ @refusalAccept="refusalAccept"
+ v-if="viewDiaLogVisible"
+ v-model="viewDiaLogVisible"
+ />
</basic-container>
</template>
<script setup>
@@ -97,7 +136,11 @@
import { gdPatrolTaskPageApi, gdPatrolTaskRemoveApi } from './inspectionRequestApi'
import ViewDiaLog from '@/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue'
import { useStore } from 'vuex'
-import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
+import {
+ getTaskTypeLabel,
+ normalizeTaskTypeOptions,
+ taskTypeCascaderProps,
+} from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
@@ -136,28 +179,27 @@
provide('workOrderTypeXT', workOrderTypeXT)
const colors = {
- 0: '#F6A000',//0待签收
- 1: '#FF0202',//1拒绝签收
- 2: '#FF0202',//2已撤回
- 3: '#212BF4',//3待审核
- 4: '#FF0000',//4审核驳回
- 5: '#0068F0',//5审核通过
- 6: '#FD6716',//6待验收
- 7: '#FF0000',//7拒绝验收
- 8: '#019612',//8验收通过
+ 0: '#F6A000', //0待签收
+ 1: '#FF0202', //1拒绝签收
+ 2: '#FF0202', //2已撤回
+ 3: '#212BF4', //3待审核
+ 4: '#FF0000', //4审核驳回
+ 5: '#0068F0', //5审核通过
+ 6: '#FD6716', //6待验收
+ 7: '#FF0000', //7拒绝验收
+ 8: '#019612', //8验收通过
}
-
// 获取列表
-async function getList () {
+async function getList() {
const range = dateRangeFormat(dateRange.value)
loading.value = true
try {
const res = await gdPatrolTaskPageApi({
...searchParams.value,
startTime: range[0],
- endTime: range[1],
createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
+ patrolTaskType: searchParams?.value?.patrolTaskType?.join?.(','),
})
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
@@ -166,20 +208,20 @@
}
}
-function tabsClick (tab, event) {
+function tabsClick(tab, event) {
activeName.value = tab.props.name
resetForm()
handleSearch()
}
// 查询
-function handleSearch () {
+function handleSearch() {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm () {
+function resetForm() {
queryParamsRef.value?.resetFields()
dateRange.value = []
searchParams.value.current = 1
@@ -187,7 +229,7 @@
}
// 新增/编辑/查看 弹框
-function openForm (mode, row) {
+function openForm(mode, row) {
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode, row })
@@ -196,7 +238,7 @@
// 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回
// 5审核通过、6待验收、7拒绝验收、8验收通过
-function viewDiaLogView (row) {
+function viewDiaLogView(row) {
viewDiaLogVisible.value = true
nextTick(() => {
let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
@@ -205,13 +247,12 @@
}
// 勾选值设置
-function handleSelectionChange (rows) {
+function handleSelectionChange(rows) {
selectedIds.value = rows.map(item => item.id)
}
-
// 获取字典
-function getDictList () {
+function getDictList() {
getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
dictObj.value = res.data.data
})
@@ -220,7 +261,7 @@
})
}
-function refusalAccept (row) {
+function refusalAccept(row) {
dialogVisible.value = true
nextTick(() => {
dialogRef.value?.open({ mode: 'edit', row })
@@ -228,7 +269,7 @@
}
// 获取两个tab的总条数
-async function getTabTotals () {
+async function getTabTotals() {
const allRes = await gdPatrolTaskPageApi({
current: 1,
size: 1,
--
Gitblit v1.9.3