feat: 收费单问题修复

src/mocp/components/global-upload-image/global-upload-image.vue

@@ -23,7 +23,7 @@ import { computed, ref, watch } from 'vue'
 import { cloneDeep } from 'lodash'
 import { upload } from 'mocp/utils/http'
 
-const es = defineEmits(['update:modelValue', 'change'])
+const es = defineEmits(['update:modelValue', 'change', 'getFileList'])
 const ps = defineProps({
     fileList: {
         type: Array,
@@ -122,6 +122,7 @@ watch(
         }
         es('update:modelValue', files)
         es('change', files)
+        es('getFileList', cloneDeep(value))
     },
     { deep: true, immediate: true }
 )

src/pages/modules/mocp/panel/electronicBill/deicing/add.vue

@@ -75,8 +75,11 @@
                     <global-picker pickAlign="right" v-model="formData.deicingMix" dictkey="eb_antiicingMix" clearable></global-picker>
                 </up-form-item>
                 <up-form-item label="自定义混合比" prop="deicingMix" :borderBottom="true" v-if="formData.deicingMix == 'Other'">
-                    <up-input type="number" v-model="formData.deicingMix1" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
-                    <up-input type="number" v-model="formData.deicingMix2" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
+                    <view style="display: flex; align-items: center">
+                        <up-input type="number" v-model="formData.deicingMix1" placeholder="请输入" clearable></up-input>
+                        <text style="margin: 0 20rpx">:</text>
+                        <up-input type="number" v-model="formData.deicingMix2" placeholder="请输入" clearable></up-input>
+                    </view>
                 </up-form-item>
                 <view class="sample-table">
                     <view class="sample-thead">
@@ -208,22 +211,11 @@
                     <global-picker pickAlign="right" v-model="formData.antiicingMix" dictkey="eb_antiicingMix" clearable></global-picker>
                 </up-form-item>
                 <up-form-item label="自定义混合比" prop="antiicingMix" :borderBottom="true" v-if="formData.antiicingMix == 'Other'">
-                    <up-input
-                        type="number"
-                        v-model="formData.antiicingMix1"
-                        inputAlign="right"
-                        border="none"
-                        placeholder="请输入"
-                        clearable
-                    ></up-input>
-                    <up-input
-                        type="number"
-                        v-model="formData.antiicingMix2"
-                        inputAlign="right"
-                        border="none"
-                        placeholder="请输入"
-                        clearable
-                    ></up-input>
+                    <view style="display: flex; align-items: center">
+                        <up-input type="number" v-model="formData.antiicingMix1" placeholder="请输入" clearable></up-input>
+                        <text style="margin: 0 20rpx">:</text>
+                        <up-input type="number" v-model="formData.antiicingMix2" placeholder="请输入" clearable></up-input>
+                    </view>
                 </up-form-item>
                 <view class="sample-table">
                     <view class="sample-thead">
@@ -361,7 +353,14 @@
             <view class="warn-title">请填写超量使用原因</view>
             <up-input v-model="formData.deicingRemark" border="bottom" placeholder="请输入" clearable></up-input>
             <view class="warn-upload">
-                <global-upload-image v-model="formData.deicingFile" map-field-name="id" :width="165" :height="165"></global-upload-image>
+                <global-upload-image
+                    v-model="formData.deicingFile"
+                    map-field-name="id"
+                    :width="165"
+                    :height="165"
+                    :file-list="deicingFile"
+                    @getFileList="getDeicingFile"
+                ></global-upload-image>
             </view>
         </view>
     </up-modal>
@@ -371,7 +370,14 @@
             <view class="warn-title">请填写超量使用原因</view>
             <up-input v-model="formData.antiicingRemark" border="bottom" placeholder="请输入" clearable></up-input>
             <view class="warn-upload">
-                <global-upload-image v-model="formData.antiicingFile" map-field-name="id" :width="165" :height="165"></global-upload-image>
+                <global-upload-image
+                    v-model="formData.antiicingFile"
+                    map-field-name="id"
+                    :width="165"
+                    :height="165"
+                    :file-list="antiicingFile"
+                    @getFileList="getAntiicingFile"
+                ></global-upload-image>
             </view>
         </view>
     </up-modal>
@@ -380,7 +386,17 @@
 <script setup>
 import useBaseStore from 'mocp/store/base'
 import useElectronicBillStore from 'mocp/store/electronicBill'
-import { formData, rules, formRef, showDeicing, showAntiicing, deicingFlag, antiicingFlag } from './constants/add.compositions'
+import {
+    formData,
+    rules,
+    formRef,
+    showDeicing,
+    showAntiicing,
+    deicingFlag,
+    antiicingFlag,
+    deicingFile,
+    antiicingFile
+} from './constants/add.compositions'
 import { navigateTo } from 'mocp/utils/jump'
 import {
     changeAcreg,
@@ -389,7 +405,9 @@ import {
     confirmDeicing,
     confirmAntiicing,
     submitDeicing,
-    submitAntiicing
+    submitAntiicing,
+    getDeicingFile,
+    getAntiicingFile
 } from './constants/add.functionals'
 import { watch, watchEffect } from 'vue'
 
@@ -449,6 +467,15 @@ watch([() => formData.antiicingQuantityTotal, () => formData.weatherToday, () =>
 })
 </script>
 <style lang="scss" scoped>
+:deep(.u-fade-zoom-enter-active) {
+    z-index: 100 !important;
+}
+:deep(.u-fade-enter-active) {
+    z-index: 100 !important;
+}
+:deep(.u-fade-leave-active) {
+    z-index: 100 !important;
+}
 @import 'mocpStatic/css/table.scss';
 .mocp-form {
     background: #fff;

src/pages/modules/mocp/panel/electronicBill/deicing/constants/add.compositions.js

@@ -143,6 +143,8 @@ export const formRef = ref()
 //除冰弹框
 export const deicingFlag = ref(false)
 export const showDeicing = ref(false)
+export const deicingFile = ref([])
 //防冰弹框
 export const antiicingFlag = ref(false)
 export const showAntiicing = ref(false)
+export const antiicingFile = ref([])

src/pages/modules/mocp/panel/electronicBill/deicing/constants/add.functionals.js

 import { getAirlineAcregApi } from 'mocp/api/electronicBill'
-import { antiicingFlag, deicingFlag, formData, formRef, showAntiicing, showDeicing } from './add.compositions'
+import { antiicingFile, antiicingFlag, deicingFile, deicingFlag, formData, formRef, showAntiicing, showDeicing } from './add.compositions'
 import { validateParameters } from 'mocp/utils/tool'
 import { showToast } from 'mocp/utils/message'
 
@@ -21,6 +21,12 @@ export const changeAcreg = async (acreg) => {
         uni.$mocpMessage.error(res.message)
     }
 }
+export const getDeicingFile = (value) => {
+    deicingFile.value = value
+}
+export const getAntiicingFile = (value) => {
+    antiicingFile.value = value
+}
 export const deicingValidate = () => {
     if (!formData.modelType) {
         return uni.$mocpMessage.warning('请选择机型类别')

src/pages/modules/mocp/panel/electronicBill/deicing/constants/sign.functionals.js

 import { upload } from 'mocp/utils/http'
 import { canvasImage } from './sign.compositions'
-import { antiicingFlag, deicingFlag, formData, showAntiicing, showDeicing } from './add.compositions'
+import { antiicingFile, antiicingFlag, deicingFile, deicingFlag, formData, showAntiicing, showDeicing } from './add.compositions'
 import { addDeicingApi } from 'mocp/api/electronicBill'
 
 export const handleSubmit = async () => {
@@ -38,84 +38,89 @@ export const addDeicing = async () => {
     const res = await addDeicingApi(formData, { loading: true })
     if (res.code == 200) {
         uni.$mocpJump.navigateBack()
-        Object.assign(formData, {
-            acreg: '',
-            aircaraftoperator: '',
-            antiicingCartNo1: '',
-            antiicingCartNo2: '',
-            antiicingCartNo3: '',
-            antiicingCartNo4: '',
-            antiicingDuration: '',
-            antiicingEndTime: '',
-            antiicingMix: '',
-            antiicingMix1: undefined,
-            antiicingMix2: undefined,
-            antiicingPersion1: '',
-            antiicingPersion2: '',
-            antiicingPersion3: '',
-            antiicingPersion4: '',
-            antiicingQuantity1: undefined,
-            antiicingQuantity2: undefined,
-            antiicingQuantity3: undefined,
-            antiicingQuantity4: undefined,
-            antiicingQuantityTotal: undefined,
-            antiicingStartTime: '',
-            antiicingType: '',
-            antiicingUnit1: '',
-            antiicingUnit2: '',
-            antiicingUnit3: '',
-            antiicingUnit4: '',
-            customerSignImg: '',
-            date: '',
-            deicingCartNo1: '',
-            deicingCartNo2: '',
-            deicingCartNo3: '',
-            deicingCartNo4: '',
-            deicingEndTime: '',
-            deicingMix: '',
-            deicingMix1: undefined,
-            deicingMix2: undefined,
-            deicingPersion1: '',
-            deicingPersion2: '',
-            deicingPersion3: '',
-            deicingPersion4: '',
-            deicingQuantity1: undefined,
-            deicingQuantity2: undefined,
-            deicingQuantity3: undefined,
-            deicingQuantity4: undefined,
-            deicingQuantityTotal: undefined,
-            deicingStartTime: '',
-            deicingType: '',
-            deicingUnit1: '',
-            deicingUnit2: '',
-            deicingUnit3: '',
-            deicingUnit4: '',
-            expectDeicing: 0,
-            fixedPointDeicing: 0,
-            flightNoIn: '',
-            flightNoOut: '',
-            id: undefined,
-            legs: '',
-            model: '',
-            nickname: '',
-            originalAircraftPositionDeicing: 0,
-            station: '',
-            username: '',
-            guaranteeUnit: '',
-            weatherToday: '',
-            modelType: '',
-            remark: '',
-            deicingFile: '',
-            deicingRemark: '',
-            antiicingFile: '',
-            antiicingRemark: ''
-        })
-        showDeicing.value = false
-        showAntiicing.value = false
-        deicingFlag.value = false
-        antiicingFlag.value = false
+        resetData()
         uni.$mocpMessage.success(res.message)
     } else {
         uni.$mocpMessage.error(res.message)
     }
 }
+export const resetData = () => {
+    Object.assign(formData, {
+        acreg: '',
+        aircaraftoperator: '',
+        antiicingCartNo1: '',
+        antiicingCartNo2: '',
+        antiicingCartNo3: '',
+        antiicingCartNo4: '',
+        antiicingDuration: '',
+        antiicingEndTime: '',
+        antiicingMix: '',
+        antiicingMix1: undefined,
+        antiicingMix2: undefined,
+        antiicingPersion1: '',
+        antiicingPersion2: '',
+        antiicingPersion3: '',
+        antiicingPersion4: '',
+        antiicingQuantity1: undefined,
+        antiicingQuantity2: undefined,
+        antiicingQuantity3: undefined,
+        antiicingQuantity4: undefined,
+        antiicingQuantityTotal: undefined,
+        antiicingStartTime: '',
+        antiicingType: '',
+        antiicingUnit1: '',
+        antiicingUnit2: '',
+        antiicingUnit3: '',
+        antiicingUnit4: '',
+        customerSignImg: '',
+        date: '',
+        deicingCartNo1: '',
+        deicingCartNo2: '',
+        deicingCartNo3: '',
+        deicingCartNo4: '',
+        deicingEndTime: '',
+        deicingMix: '',
+        deicingMix1: undefined,
+        deicingMix2: undefined,
+        deicingPersion1: '',
+        deicingPersion2: '',
+        deicingPersion3: '',
+        deicingPersion4: '',
+        deicingQuantity1: undefined,
+        deicingQuantity2: undefined,
+        deicingQuantity3: undefined,
+        deicingQuantity4: undefined,
+        deicingQuantityTotal: undefined,
+        deicingStartTime: '',
+        deicingType: '',
+        deicingUnit1: '',
+        deicingUnit2: '',
+        deicingUnit3: '',
+        deicingUnit4: '',
+        expectDeicing: 0,
+        fixedPointDeicing: 0,
+        flightNoIn: '',
+        flightNoOut: '',
+        id: undefined,
+        legs: '',
+        model: '',
+        nickname: '',
+        originalAircraftPositionDeicing: 0,
+        station: '',
+        username: '',
+        guaranteeUnit: '',
+        weatherToday: '',
+        modelType: '',
+        remark: '',
+        deicingFile: '',
+        deicingRemark: '',
+        antiicingFile: '',
+        antiicingRemark: ''
+    })
+    showDeicing.value = false
+    showAntiicing.value = false
+    deicingFlag.value = false
+    antiicingFlag.value = false
+    deicingFile.value = []
+    antiicingFile.value = []
+}