Merge remote-tracking branch 'origin/master'

张含笑

2026-02-03 91bb9f7781ce95e3a7acde3602eeae0c1c3613ff

 uniapps/work-wx/src/subPackages/flightApplication/add.vue

@@ -360,32 +360,30 @@
    <u-popup
    :show="isShowAircraftInfo"
    mode="bottom"
    round="20"
    round="0"
    @close="isShowAircraftInfo = false"
  >
  <scroll-view scroll-y>
    <view class="select-header">
        <view>请选择飞行器</view>
        <view class="select-header-btn">
            <view class="cancel-btn" @click="isShowAircraftInfo = false">取消</view>
            <view @click="onPickerAircraftInfo">确定</view>
        </view>
        <!-- <view>请选择飞行器</view> -->
        <view class="cancel-btn" @click="isShowAircraftInfo = false">取消</view>
        <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>
@@ -400,32 +398,30 @@
    <u-popup
    :show="isShowPilotInfo"
    mode="bottom"
    round="20"
    round="0"
    @close="isShowPilotInfo = false"
  >
  <scroll-view scroll-y>
    <view class="select-header">
        <view>请选择飞手</view>
        <view class="select-header-btn">
            <view class="cancel-btn" @click="isShowPilotInfo = false">取消</view>
            <view @click="onPickerPilotInfo">确定</view>
        </view>
        <!-- <view>请选择飞手</view> -->
        <view class="cancel-btn" @click="isShowPilotInfo = false">取消</view>
        <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>
@@ -645,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 = () => {
@@ -666,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) => {
@@ -775,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
@@ -953,19 +951,17 @@
        padding: 20rpx 20rpx;
        font-size: 32rpx;
        color: #222324;
        .select-header-btn {
            display: flex;
            font-size: 28rpx;
        .cancel-btn {
            color: #86909C;
            margin-right: 20rpx;
        }
        .confirm-btn {
            color: #1D6FE9;
            .cancel-btn {
                color: #86909C;
                margin-right: 20rpx;
            }
        }
    }

    .select-content {
        height: 600rpx;
        height: 480rpx;
        text-align: center;
        padding: 20rpx 20rpx;
    }