From 7ddb7f6d597bf264a294393008d18ca89e7084da Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 28 Jan 2026 18:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 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 d0cc686..f8988f7 100644
--- a/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
+++ b/applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -7,12 +7,57 @@
destroy-on-close
:close-on-click-modal="false"
>
+ <el-row class="detail-row-view" v-if="dialogType === 'view'">
+ <el-col :span="12">
+ <div class="label">飞手姓名</div>
+ <div class="val">{{ formData.flyerName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">飞手电话</div>
+ <div class="val">{{ formData.flyerPhone }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">飞行时长</div>
+ <div class="val">{{ formData.flightHours }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">技术特长</div>
+ <div class="val">{{ getDictLabel(formData.technicalStrength, dictObj.technicalStrength) }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">擅长机型</div>
+ <div class="val">{{ getDictLabel(formData.skilledUavType, dictObj.skilledUavType) }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">擅长任务类型</div>
+ <div class="val">{{ getDictLabel(formData.skilledTaskType, dictObj.skilledTaskType) }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">项目经验</div>
+ <div class="val">{{ formData.projectExperience }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">飞手证书</div>
+ <div class="val">
+ <el-image
+ v-for="(item, index) in formData.certification"
+ :key="index"
+ :src="item"
+ :preview-src-list="formData.certification"
+ class="gd-image"
+ style="width: 100px; height: 100px; margin-right: 10px;"
+ />
+ </div>
+ </el-col>
+ </el-row>
+
<el-form
ref="formRef"
:model="formData"
:rules="rules"
class="gd-form"
label-width="160px"
+ v-else
>
<el-row>
<el-col :span="12">
@@ -124,7 +169,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="dialogType === 'view'">
+ <!-- <el-col :span="24" v-if="dialogType === 'view'">
<el-form-item label="飞手证书" prop="certification">
<el-image
v-for="(item, index) in formData.certification"
@@ -135,11 +180,11 @@
style="width: 100px; height: 100px; margin-right: 10px;"
/>
</el-form-item>
- </el-col>
+ </el-col> -->
</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"
@@ -155,6 +200,7 @@
import { ref, reactive, computed, watch, inject } from 'vue'
import { submitFlyingHand } from './flyingHandApi'
import { ElMessage } from 'element-plus'
+import { getDictLabel } from '@ztzf/utils'
import { fieldRules } from '@ztzf/utils'
@@ -188,11 +234,11 @@
const dialogTitle = computed(() => {
switch (props.dialogType) {
case 'add':
- return '添加飞手信息'
+ return '新增'
case 'edit':
- return '编辑飞手信息'
+ return '编辑'
case 'view':
- return '查看飞手信息'
+ return '查看'
default:
return '飞手信息'
}
--
Gitblit v1.9.3