From 6a15a201470e1f1ca7323b7cb8cee9a8a41c733f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 03 Feb 2026 17:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/subPackages/flightApplication/add.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/add.vue b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
index 3c522c5..ec51e8f 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/add.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
@@ -370,20 +370,20 @@
<view class="confirm-btn" @click="onPickerAircraftInfo">确定</view>
</view>
<view class="select-content">
- <up-checkbox-group
+ <u-checkbox-group
v-model="formParams.spacecraftId"
placement="column"
@change="checkboxChange"
>
- <up-checkbox
+ <u-checkbox
:customStyle="{marginBottom: '8px'}"
v-for="(item, index) in aircraftInfoList"
:key="item.id"
:label="item.label"
:name="item.value"
>
- </up-checkbox>
- </up-checkbox-group>
+ </u-checkbox>
+ </u-checkbox-group>
</view>
</scroll-view>
</u-popup>
@@ -408,20 +408,20 @@
<view class="confirm-btn" @click="onPickerPilotInfo">确定</view>
</view>
<view class="select-content">
- <up-checkbox-group
+ <u-checkbox-group
v-model="formParams.pilotId"
placement="column"
@change="checkboxPilotChange"
>
- <up-checkbox
+ <u-checkbox
:customStyle="{marginBottom: '8px'}"
v-for="(item, index) in pilotInfoList"
:key="item.id"
:label="item.label"
:name="item.value"
>
- </up-checkbox>
- </up-checkbox-group>
+ </u-checkbox>
+ </u-checkbox-group>
</view>
</scroll-view>
</u-popup>
@@ -641,7 +641,7 @@
// isShowAircraftInfo.value = false
// }
function checkboxChange(val) {
- formParams.value.spacecraftId = val.join(',')
+ formParams.value.spacecraftId = val
formParams.value.spacecraftText = aircraftInfoList.value.filter(item => val.includes(item.value)).map(item => item.label).join(',')
}
const onPickerAircraftInfo = () => {
@@ -662,7 +662,7 @@
})
}
function checkboxPilotChange(val) {
- formParams.value.pilotId = val.join(',')
+ formParams.value.pilotId = val
formParams.value.pilotText = pilotInfoList.value.filter(item => val.includes(item.value)).map(item => item.label).join(',')
}
const onPickerPilotInfo = (e) => {
@@ -771,6 +771,8 @@
const submitForm = async () => {
await formRef.value.validate()
isSubmitDisabled.value = true
+ formParams.value.pilotId = formParams.value.pilotId.join(',')
+ formParams.value.spacecraftId = formParams.value.spacecraftId.join(',')
flightPlanSaveApi(formParams.value).then(res => {
if (res.data.code === 200) {
isSubmitDisabled.value = true
--
Gitblit v1.9.3