新增部分功能

src/views/operation/seaexport/api/BookingLedger.js

@@ -34,6 +34,14 @@ export function GetUserQuerySet(parameter) {
     params: parameter,
   })
 }
+// 获取船公司
+export function GetCarrierlist(parameter) {
+  return request({
+    url: '/mainApi/ClientCommon/GetCarrierClientList',
+    method: 'get',
+    params: parameter,
+  })
+}
 /**
  * 获取订舱明细
  * @params Id
@@ -68,17 +76,6 @@ export function DjyCustomerSuggest(parameter) {
     params: parameter,
   })
 }
-/**
- * 获取船公司
- * @params CnName
- */
-export function GetCarrierlist(parameter) {
-  return request({
-    url: '/commondb/carrierlist',
-    method: 'get',
-    params: parameter,
-  })
-}
 
 /**
  * 获取船名

src/views/operation/seaexport/detail/modules/basicInfo.vue

@@ -5,7 +5,7 @@
         <a-form
           style="margin-bottom: 10px"
           size="small"
-          ref="basicFrom"
+          ref="RefbasicFrom"
           :selfUpdate="true"
           :model="details"
           :rules="rules"
@@ -966,6 +966,7 @@
     },
   })
   const id = ref()
+  const RefbasicFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -1301,6 +1302,9 @@
     }
     return tree
   }
+  defineExpose({
+    RefbasicFrom,
+  })
 </script>
 <style lang="less" scoped>
   /deep/ .ant-form-explain {

src/views/operation/seaexport/detail/modules/cargoInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-collapse class="collapse-box" :bordered="false" v-model="showKey">
+  <a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
     <a-collapse-panel key="1" :showArrow="false">
       <template #header>
         <div class="base-tit"
@@ -13,7 +13,7 @@
         ></div>
       </template>
       <div class="container cargo-info">
-        <a-form :selfUpdate="true" ref="cargoFrom" :model="details" :rules="rules">
+        <a-form :selfUpdate="true" ref="RefcargoFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
             <a-col :span="5">
               <div
@@ -639,6 +639,7 @@
   const kgstotalRes = ref(0)
   const cbmtotalRes = ref(0)
   const id = ref()
+  const RefcargoFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -969,6 +970,9 @@
     textEntryModalTitle.value = ''
     textEntryType.value = false
   }
+  defineExpose({
+    RefcargoFrom,
+  })
 </script>
 <style lang="less" scoped>
   .copy-btn {

src/views/operation/seaexport/detail/modules/mailingInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-collapse class="collapse-box" :bordered="false" v-model="showKey">
+  <a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
     <a-collapse-panel key="1" :showArrow="false">
       <template #header>
         <div class="base-tit">
@@ -13,7 +13,7 @@
         </div>
       </template>
       <div class="mail-info" style="padding-bottom: 18px">
-        <a-form :selfUpdate="true" ref="mailingFrom" :model="details" :rules="rules">
+        <a-form :selfUpdate="true" ref="RefmailingFrom" :model="details" :rules="rules">
           <a-row :gutter="10">
             <a-col class="left-sender-box" :xs="24" :sm="24" :md="24" :lg="10" :xl="8">
               <a-form-item
@@ -1114,6 +1114,7 @@
   const shippernameInput = ref()
   const consigneenameInput = ref()
   const notifypartynameInput = ref()
+  const RefmailingFrom = ref()
   watch(
     () => props.details,
     (nval) => {
@@ -1609,6 +1610,9 @@
   function handleOpenFd() {
     visibleJW.value = true
   }
+  defineExpose({
+    RefmailingFrom,
+  })
 </script>
 <style lang="less" scoped>
   @import url('../index.less');

src/views/operation/seaexport/detail/modules/operationArea.vue

@@ -846,7 +846,14 @@
     lineHeight: '30px',
   })
   const mskBookingOrder = ref()
-  // ===========
+  // ============================================
+  //保存
+  function saveFun() {
+    if (!appStore.getsaveFlag) {
+      emit('save')
+    }
+  }
+  // ============================================
   function refreshPage() {
     emit('refresh')
   }
@@ -856,11 +863,7 @@
   function copyBooking() {
     emit('copy')
   }
-  function saveFun() {
+
-    if (!appStore.getsaveFlag) {
-      emit('save')
-    }
-  }
   function FSnhowPrintModal() {
     cateCode.value = 'zhudan_print'
     let DprintType = ''

src/views/operation/seaexport/index.vue

@@ -83,12 +83,9 @@
             <vxe-toolbar>
               <template #buttons>
                 <div class="nav-box">
-                  <div class="nav" @click="addBooking"
+                  <div class="nav" @click="addBooking">
-                    ><i class="iconfont icon-jiahao2fill"></i>新建</div
+                    <i class="iconfont icon-jiahao2fill"></i>新建
-                  >
+                  </div>
-                  <div class="nav" @click="addBooking2"
-                    ><i class="iconfont icon-jiahao2fill"></i>Test跳转</div
-                  >
                   <div class="nav" @click="copyBooking"
                     ><i class="iconfont icon-fuzhi"></i>复制</div
                   >
@@ -1082,45 +1079,6 @@
           </a-spin>
         </div>
       </a-modal>
-      <a-modal
-        :maskClosable="false"
-        :width="1700"
-        :visible="addVisible"
-        @ok="addSubmit"
-        @cancel="addCancel"
-      >
-        <a-radio-group class="group-label-box" v-model="carrierRadio">
-          <p v-if="RecentlyCarrierData.length" class="Awrapper"
-            >最近使用 <span class="line"></span
-          ></p>
-          <div class="group-label" v-if="RecentlyCarrierData.length">
-            <a-radio
-              :style="radioStyle"
-              :value="item.code"
-              v-for="item in RecentlyCarrierData"
-              :key="item.code"
-            >
-              <img class="radio-logo" :src="item.ImgSrc" />
-              {{ item.cnName }}
-            </a-radio>
-          </div>
-
-          <div v-for="e in Object.keys(RcarrierData)" :key="e">
-            <p class="Awrapper">{{ e }}<span class="line"></span></p>
-            <div class="group-label">
-              <a-radio
-                :style="radioStyle"
-                :value="item.code"
-                v-for="item in RcarrierData[e]"
-                :key="item.code"
-              >
-                <img class="radio-logo" :src="item.ImgSrc" />
-                {{ item.cnName }}
-              </a-radio>
-            </div>
-          </div>
-        </a-radio-group>
-      </a-modal>
       <a-modal
         title="多提单号查询"
         :maskClosable="false"
@@ -1663,7 +1621,6 @@
   })
   const tableOrderLabel = ref('')
   const tableOrderType = ref('')
-  const addVisible = ref(false)
   const carrierRadio = ref('CMA')
   const RecentlyCarrierData = ref([])
   const addNum = ref(0)
@@ -2036,6 +1993,10 @@
         console.log(err)
       })
   }
+  function addBooking() {
+    addNum.value = Math.round(Math.random() * 1000)
+    go(`/BookingDetail?type=OOCL&addNum=${addNum.value}`)
+  }
   // ====================================================
   function getListByone(listId, listIndex) {
     PageDataByBooking({ id: listId }).then((res) => {
@@ -2139,7 +2100,6 @@
     }
     FnGetUserQuerySet()
     getConfigUser(true)
-    getCarrier()
   }
   async function FnGetUserQuerySet() {
     const res: API.DataResult = await GetUserQuerySet({
@@ -2653,104 +2613,6 @@
         return GetTenantLineList
     }
   }
-  function addBooking() {
-    addVisible.value = !addVisible.value
-  }
-  function addBooking2() {
-    go(`/BookingDetail?type=Add`)
-  }
-  function addSubmit() {
-    const data = []
-    data.push(carrierRadio.value)
-    if (RecentlyCarrierData.value.length) {
-      RecentlyCarrierData.value.forEach((item) => {
-        if (item.code != carrierRadio.value && data.length < 10) {
-          data.push(item.code)
-        }
-      })
-    }
-
-    DjyUserConfigAdd({
-      type: 'booking_memory',
-      configJson: JSON.stringify(data),
-    }).then((res) => {
-      getCarrier()
-      addVisible.value = false
-      addNum.value = Math.round(Math.random() * 1000)
-      go(`/BookingDetail?type=${carrierRadio.value}&addNum=${addNum.value}`)
-    })
-  }
-  function getCarrier() {
-    const Rdata = (data) => {
-      const RData = {}
-      for (var i = 0; i < 26; i++) {
-        RData[String.fromCharCode(65 + i)] = []
-        data.forEach((item) => {
-          if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
-            RData[String.fromCharCode(65 + i)].push(item)
-          }
-        })
-      }
-      const Obj = {
-        'A-D': ['A', 'B', 'C', 'D'],
-        'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
-        'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
-        'S-U': ['S', 'T', 'U'],
-        'V-Z': ['V', 'W', 'X', 'Y', 'Z'],
-      }
-      const Data = {
-        'A-D': [],
-        'E-L': [],
-        'M-R': [],
-        'S-U': [],
-        'V-Z': [],
-      }
-      Object.keys(Obj).forEach((e) => {
-        Obj[e].forEach((item) => {
-          RData[item].forEach((Ai, AiIndex) => {
-            let imgSrc = ''
-            try {
-              imgSrc = require(`@/assets/logo/${Ai.code}.png`)
-            } catch (error) {
-              // imgSrc = require('@/assets/logo/default.png')
-            }
-            RData[item][AiIndex].ImgSrc = imgSrc
-          })
-          Data[e].push(...RData[item])
-        })
-      })
-      RcarrierData.value = Data
-    }
-    GetCarrierlist()
-      .then((res) => {
-        if (res.code === 200) {
-          Rdata(res.data)
-          DjyUserConfigGet({ type: 'booking_memory' })
-            .then((e) => {
-              if (e.data) {
-                const data = []
-                JSON.parse(e.data.configJson).forEach((item) => {
-                  res.data.forEach((item2) => {
-                    if (item == item2.code) {
-                      data.push(item2)
-                    }
-                  })
-                })
-                RecentlyCarrierData.value = data
-              }
-            })
-            .catch(() => {
-              Rdata(res.data)
-            })
-        }
-      })
-      .catch((err) => {
-        console.log(err)
-      })
-  }
-  function addCancel() {
-    addVisible.value = false
-  }
   function copyBooking() {
     const select = xGrid.value.getCheckboxRecords()
     const pkIdArr = select.map((item, index) => {