Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-27 7319ec49da9f1490ad35f47e0da62546d1cc7ff4

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

@@ -10,7 +10,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightPlanName" border="none"></u-input>
            <u-input v-model="formParams.flightPlanName" readonly border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="任务类型"
@@ -21,8 +21,7 @@
        >
            <u-input
                v-model="formParams.flightTaskType"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -35,8 +34,7 @@
        >
            <u-input
                v-model="formParams.flightRule"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -49,8 +47,7 @@
        >
            <u-input
                v-model="formParams.flightMode"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -61,7 +58,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightStartTime" border="none" suffixIcon="calendar"></u-input>
            <u-input v-model="formParams.flightStartTime" border="none" readonly suffixIcon="calendar"></u-input>
        </u-form-item>
         <u-form-item
                label="飞行活动结束日期"
@@ -70,7 +67,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.flightEndTime" border="none" suffixIcon="calendar"></u-input>
            <u-input v-model="formParams.flightEndTime" readonly border="none" suffixIcon="calendar"></u-input>
        </u-form-item>

        <u-form-item
@@ -82,8 +79,7 @@
        >
            <u-input
                v-model="formParams.planType"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -94,7 +90,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.contactPerson" border="none"></u-input>
            <u-input v-model="formParams.contactPerson" readonly border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="联系电话"
@@ -103,7 +99,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.contactPhone" border="none"></u-input>
            <u-input v-model="formParams.contactPhone" readonly border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="承办人"
@@ -112,7 +108,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.undertaker" border="none"></u-input>
            <u-input v-model="formParams.undertaker" readonly border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="承办人联系电话"
@@ -121,7 +117,7 @@
                :borderBottom="true"
                ref="item1"
        >
            <u-input v-model="formParams.undertakerPhone" border="none"></u-input>
            <u-input v-model="formParams.undertakerPhone" readonly border="none"></u-input>
        </u-form-item>
        <u-form-item
                label="临时空域批件"
@@ -140,7 +136,8 @@
                ref="item1"
        >
            <u-input
                    v-model="formParams.weatherCondition"
                    v-model="formParams.weatherCondition" 
                    readonly
                    border="none"
            ></u-input>
        </u-form-item>
@@ -154,8 +151,7 @@
        >
            <u-input
                v-model="formParams.aircraftId"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -168,8 +164,7 @@
        >
            <u-input
                v-model="formParams.pilotId"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -183,8 +178,7 @@
        >
            <u-input
                v-model="formParams.airspaceId"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -197,8 +191,7 @@
        >
            <u-input
                v-model="formParams.routeId"
                disabled
                disabledColor="#ffffff"
                readonly
                border="none"
            ></u-input>
        </u-form-item>
@@ -317,16 +310,19 @@
     flightPlanDetailsApi(options.id).then(res => {
        // return
        const result = res.data.data
        console.log(result, '7777')
        formParams.value = result
        formParams.value.routeId = result.routeInfo.name
        formParams.value.airspaceId = result.airspaceInfo.taskName || '无'
        formParams.value.aircraftId = result.airspaceInfo.aircraftInfoList.map(item => item.name).join(',') || '无'
        formParams.value.pilotId = result.operatorInfoList.map(item => item.name).join(',') || '无'
        // 字典
        formParams.value.flightRule = actionsFlightRule.value.find(item => item.dictValue === result.flightRule)?.dictLabel || '无'
        formParams.value.flightMode = actionsFlightMode.value.find(item => item.dictValue === result.flightMode)?.dictLabel || '无'
        formParams.value.planType = actionsPlanType.value.find(item => item.dictValue === result.planType)?.dictLabel || '无'
        formParams.value.flightTaskType = actionsFlightTaskType.value.find(item => item.dictValue === result.flightTaskType)?.dictLabel || '无'
        // 数据
        formParams.value.routeId = result?.routeInfo?.name || '无'
        formParams.value.airspaceId = result?.airspaceInfo?.taskName || '无'
        formParams.value.aircraftId = result?.airspaceInfo?.aircraftInfoList?.map(item => item.name).join(',') || '无'
        formParams.value.pilotId = result?.operatorInfoList?.map(item => item.name).join(',') || '无'
        
    })
})
onMounted(() => {