From 08ab4ebee26bb6c275b68c350bfa93ae770d6fee Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 16:26:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 fffc611..29fff53 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.skilledTaskType) }}</div>
+ <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.patrolTaskType) }}</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.skilledTaskType"
+ v-for="item in dictObj.patrolTaskType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
@@ -184,14 +184,14 @@
</el-row>
</el-form>
<template #footer>
- <el-button color="#F2F3F5" @click="handleClose">取消</el-button>
+ <el-button v-if="dialogType !== 'view'" color="#F2F3F5" @click="handleClose">取消</el-button>
<el-button
v-if="dialogType !== 'view'"
type="primary"
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':
--
Gitblit v1.9.3