From 5ef2c94f03d08448e876c3a2b212ef86837483dd Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 27 Jan 2026 12:24:32 +0800
Subject: [PATCH] feat:更新小程序

---
 uniapps/work-wx/src/subPackages/flightApplication/add.vue      |   13 ++++--
 uniapps/work-wx/src/subPackages/deviceRegistration/details.vue |   54 ++++++++++++++-------------
 uniapps/work-wx/src/subPackages/flightApplication/details.vue  |   52 ++++++++++++--------------
 3 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/uniapps/work-wx/src/subPackages/deviceRegistration/details.vue b/uniapps/work-wx/src/subPackages/deviceRegistration/details.vue
index c1f61a7..e10db1d 100644
--- a/uniapps/work-wx/src/subPackages/deviceRegistration/details.vue
+++ b/uniapps/work-wx/src/subPackages/deviceRegistration/details.vue
@@ -9,7 +9,7 @@
                 :borderBottom="true"
                 ref="item1"
         >
-            <u-input v-model="formParams.name" border="none"></u-input>
+            <u-input v-model="formParams.name" readonly border="none"></u-input>
         </u-form-item>
         <u-form-item
                 label="SN(出厂序列号)"
@@ -18,7 +18,7 @@
                 :borderBottom="true"
                 ref="item2"
         >
-            <u-input v-model="formParams.sn" border="none"></u-input>
+            <u-input v-model="formParams.sn" readonly border="none"></u-input>
         </u-form-item>
         <u-form-item
                 label="飞行器厂商"
@@ -28,9 +28,8 @@
                 ref="item2"
         >
             <u-input
-                v-model="formParams.manufacturer"
-                disabled
-                disabledColor="#ffffff"
+                v-model="formParams.manufacturerText"
+                readonly
                 border="none"
             ></u-input>
         </u-form-item>
@@ -41,7 +40,7 @@
                 :borderBottom="true"
                 ref="item1"
         >
-            <u-input v-model="formParams.model" border="none"></u-input>
+            <u-input v-model="formParams.model" readonly border="none"></u-input>
         </u-form-item>
         <u-form-item
                 label="是否改装"
@@ -52,8 +51,7 @@
         >
             <u-input
                 v-model="formParams.isModified"
-                disabled
-                disabledColor="#ffffff"
+                readonly
                 border="none"
             ></u-input>
         </u-form-item>
@@ -66,8 +64,7 @@
         >
             <u-input
                 v-model="formParams.type"
-                disabled
-                disabledColor="#ffffff"
+                readonly
                 border="none"
             ></u-input>
         </u-form-item>
@@ -79,7 +76,8 @@
                 ref="item1"
         >
             <u-input
-                    v-model="formParams.holder"
+                    v-model="formParams.holder" 
+                    readonly
                     border="none"
             ></u-input>
         </u-form-item>
@@ -90,7 +88,7 @@
                 :borderBottom="true"
                 ref="item1"
         >
-            <u-input v-model="formParams.purchaseDate" border="none" placeholder="请选择日期" suffixIcon="calendar"></u-input>
+            <u-input v-model="formParams.purchaseDate" readonly border="none" placeholder="请选择日期" suffixIcon="calendar"></u-input>
         </u-form-item>
         <u-form-item
                 label="有无保险"
@@ -101,8 +99,7 @@
         >
             <u-input
                 v-model="formParams.hasInsurance"
-                disabled
-                disabledColor="#ffffff"
+                readonly
                 border="none"
             ></u-input>
         </u-form-item>
@@ -115,8 +112,7 @@
         >
             <u-input
                 v-model="formParams.region"
-                disabled
-                disabledColor="#ffffff"
+                readonly
                 border="none"
             ></u-input>
         </u-form-item>
@@ -128,7 +124,8 @@
                 ref="item1"
         >
             <u-input
-                    v-model="formParams.caacRegistrationCode"
+                    v-model="formParams.caacRegistrationCode" 
+                    readonly
                     border="none"
             ></u-input>
         </u-form-item>
@@ -140,7 +137,8 @@
                 ref="item1"
         >
             <u-input
-                    v-model="formParams.deviceImage"
+                    v-model="formParams.deviceImage" 
+                    readonly
                     border="none"
             ></u-input>
         </u-form-item>
@@ -152,7 +150,8 @@
                 ref="item1"
         >
             <u-input
-                    v-model="formParams.remarks"
+                    v-model="formParams.remarks" 
+                    readonly
                     border="none"
             ></u-input>
         </u-form-item>
@@ -314,11 +313,13 @@
         current: 1,
         size: 1000,
     }).then(res => {
-        manufacturerList.value = res.data.data.records.map(item => ({
-            ...item,
-            label: item.unitName,
-            value: item.id,
-        }))
+        // manufacturerList.value = res.data.data.records.map(item => ({
+        //     ...item,
+        //     label: item.unitName,
+        //     value: item.id,
+        // }))
+        console.log(formParams.value.manufacturer, res.data.data.records.find(item => item.id === formParams.value.manufacturer))
+        formParams.value.manufacturerText = res.data.data.records.find(item => item.id === formParams.value.manufacturer)?.unitName || ''
     })
 }
 onLoad((options) => {
@@ -326,16 +327,17 @@
         formParams.value = res.data.data
         formParams.value.isModified = res.data.data.isModified ? '是' : '否'
         formParams.value.hasInsurance = res.data.data.hasInsurance === '1' ? '有' : '无'
-        formParams.value.manufacturer = manufacturerList.value.find(item => item.value === res.data.data.manufacturer)?.label || ''
+        // formParams.value.manufacturer = manufacturerList.value.find(item => item.value === res.data.data.manufacturer)?.label || ''
         formParams.value.type = typeList.value.find(item => item.value === res.data.data.type)?.label || ''
         formParams.value.region = res.data.data.region
+        getManufacturerInfoApi()
     })
     
     
 })
 onMounted(async () => {
+    // getManufacturerInfoApi()
     getProTypeApi()
-    getManufacturerInfoApi()
     // 动态导入xzqhData,确保在使用前已初始化
     const { xzqhData } = await import('@/static/xzqh/index')
     areaData.value = xzqhData
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/add.vue b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
index 080da5c..d660720 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/add.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
@@ -329,20 +329,22 @@
         @confirm="onPickerPlanType"
         @cancel="isShowPlanType = false"
     />
-    <up-datetime-picker
+    <u-datetime-picker
             :show="isShowStartTime"
             v-model="startTime"
             mode="datetime"
+            :min-date="minDate"
             @confirm="onConfirmStartTime"
              @cancel="isShowStartTime = false"
-        ></up-datetime-picker>
-        <up-datetime-picker
+        ></u-datetime-picker>
+        <u-datetime-picker
             :show="isShowEndTime"
             v-model="endTime"
             mode="datetime"
+            :min-date="minDate"
             @confirm="onConfirmEndTime"
             @cancel="isShowEndTime = false"
-        ></up-datetime-picker>
+        ></u-datetime-picker>
     <!-- <u-calendar :show="isShowTimeRange" mode="date" @confirm="onConfirmTimeRange" @close="isShowTimeRange = false" :close-on-click-overlay="true"></u-calendar> -->
     <!-- <u-calendar :show="isShowTimeRange" mode="range" @confirm="onConfirmTimeRange" @close="isShowTimeRange = false" :close-on-click-overlay="true" :allow-same-day="true" :show-time="true" time-format="HH:mm:ss"></u-calendar> -->
     <!-- 飞行器 -->
@@ -541,6 +543,7 @@
 const isShowStartTime = ref(false)
 // 是否显示结束时间选择器
 const isShowEndTime = ref(false)
+const minDate = ref(Date.now()); // 设置最小日期为当前时间戳
 const startTime = ref(Date.now()); // 设置默认值为当前时间戳
 const endTime = ref(Date.now()); // 设置默认值为当前时间戳
 
@@ -714,6 +717,8 @@
         duration: 2000
       })
     }
+  }).finally(() => {
+    isSubmitDisabled.value = false
   })
 }
 onMounted(() => {
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/details.vue b/uniapps/work-wx/src/subPackages/flightApplication/details.vue
index 6d8e44e..2369026 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/details.vue
+++ b/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(() => {

--
Gitblit v1.9.3