From b248152cc5d600d41e3b0be287a3c43415e46ed1 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 30 Jan 2026 16:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
index f58c380..712e13a 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -30,7 +30,7 @@
</el-col>
<el-col :span="12">
<div class="label">擅长任务类型</div>
- <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.patrolTaskType) }}</div>
+ <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.workOrderType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">项目经验</div>
@@ -149,7 +149,7 @@
:disabled="dialogType === 'view'"
>
<el-option
- v-for="item in dictObj.patrolTaskType"
+ v-for="item in dictObj.workOrderType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -191,7 +191,7 @@
color="#4C34FF"
@click="handleSubmit"
>
- 确定
+ 保存
</el-button>
</template>
</el-dialog>
@@ -234,7 +234,7 @@
const dialogTitle = computed(() => {
switch (props.dialogType) {
case 'add':
- return '新增'
+ return '飞手建档'
case 'edit':
return '编辑'
case 'view':
@@ -309,7 +309,7 @@
if (newData) {
Object.assign(formData.value, newData)
formData.value.flightHours = Number(newData.flightHours)
- }
+ }
},
{ deep: true, immediate: true }
)
@@ -374,4 +374,4 @@
margin-bottom: 20px;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3