From d7c19e87b419e92340f0ab6f9ec03f4d4cf2b2a4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 16:40:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index 39fd082..22b4e67 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -5,7 +5,7 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
- width="60%"
+ width="75%"
:close-on-click-modal="false"
>
<div class="gd-dialog-form">
@@ -86,7 +86,7 @@
@change="handlePatrolTaskTypeChange($index, $event)"
>
<el-option
- v-for="item in dictObj.patrolTaskType"
+ v-for="item in dictObj.workOrderType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -158,7 +158,7 @@
<el-input class="gd-input" v-model="row.taskDesc" placeholder="请输入" :disabled="dialogReadonly" />
</template>
</el-table-column>
- <el-table-column label="操作" width="80" fixed="right" v-if="dialogMode === 'add'">
+ <el-table-column label="操作" width="90" fixed="right" v-if="dialogMode === 'add'">
<template v-slot="{ $index }">
<el-button type="primary" :icon="Plus" circle size="small" @click="addTaskRow" />
<el-button
@@ -221,7 +221,7 @@
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const dialogReadonly = computed(() => dialogMode.value === 'view')
-const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
+const titleEnum = ref({ edit: '新增', view: '查看', add: '新增' })
// 工单相关
const workOrderList = ref([]) // 工单列表
@@ -286,6 +286,7 @@
async function getFlyerList(index, skilledTaskType) {
const res = await gdFlyerPageApi({
size: 999,
+ current: 1,
skilledTaskType,
})
flyerListMap.value[index] = res?.data?.data?.records ?? []
@@ -294,7 +295,7 @@
// 获取设备列表
async function getDeviceList() {
const res = await gdManageDeviceListApi({
- deviceIds: selectedWorkOrder.value.recommendDeviceIds,
+ deviceIds: selectedWorkOrder.value?.recommendDeviceIds,
})
deviceList.value = res?.data?.data ?? []
}
@@ -302,6 +303,7 @@
watch(
() => selectedWorkOrderId.value,
() => {
+ handleWorkOrderChange(selectedWorkOrderId.value)
getDeviceList()
}
)
@@ -365,6 +367,7 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
dialogMode.value = mode
+ await getWorkOrderList()
if (dialogMode.value === 'add') {
selectedWorkOrderId.value = null
selectedWorkOrder.value = null
@@ -381,7 +384,6 @@
getFlyerList(0, row.patrolTaskType)
}
}
- getWorkOrderList()
}
onMounted(() => {
--
Gitblit v1.9.3