Merge remote-tracking branch 'origin/master'

chenyao

2026-06-30 4b3c357f2fa24a27eac3fe59cbf64e34255ab212

 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.workOrderType) }}</div>
        <div class="val">{{ getTaskTypeLabel(formData.skilledTaskType, workOrderTypeXT) }}</div>
      </el-col>
     <el-col :span="12">
        <div class="label">项目经验</div>
@@ -159,20 +159,17 @@
            </el-col>
            <el-col :span="12">
               <el-form-item label="擅长任务类型" prop="skilledTaskType">
                  <el-select
                     class="gd-select"
                     popper-class="gd-select-popper"
                  <el-cascader
                     class="gd-cascader"
                     popper-class="gd-cascader-popper"
                     v-model="formData.skilledTaskType"
                     :options="workOrderTypeXT"
                     :props="{ ...taskTypeCascaderProps, multiple: true }"
                     placeholder="请选择"
                     :disabled="dialogType === 'view'"
                  >
                     <el-option
                        v-for="item in dictObj.workOrderType"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
                     />
                  </el-select>
                     clearable
                     collapse-tags
                  />
               </el-form-item>
            </el-col>
            <el-col :span="24">
@@ -207,6 +204,10 @@
import { submitFlyingHand } from './flyingHandApi'
import { ElMessage } from 'element-plus'
import { getDictLabel } from '@ztzf/utils'
import {
   getTaskTypeLabel,
   taskTypeCascaderProps,
} from '../orderManage/taskTypeOptions'

import { fieldRules } from '@ztzf/utils'

@@ -227,6 +228,7 @@
})

const dictObj = inject('dictObj') // 擅长任务类型
const workOrderTypeXT = inject('workOrderTypeXT', ref([]))

const flyingHandList = inject('flyingHandList') // 飞手列表
const flyingHandEditList = inject('flyingHandEditList') // 飞手建档列表
@@ -262,6 +264,7 @@
   projectExperience: '',
   technicalStrength: '',
   skilledUavType: '',
   skilledTaskType: [],
   certification: [], // 证书
   regionCode: '', // 区域编码
   flyerAddress: '', // 飞手地址
@@ -318,6 +321,7 @@
      if (newData) {
         Object.assign(formData.value, newData)
         formData.value.flightHours = Number(newData.flightHours)
         formData.value.skilledTaskType = newData.skilledTaskType || []
      }
   },
   { deep: true, immediate: true }
@@ -353,7 +357,7 @@
      projectExperience: '',
      technicalStrength: '',
      skilledUavType: '',
      skilledTaskType: ''
      skilledTaskType: []
   })
}