海运出口详情ui

src/views/operation/seaexport/detail/index.vue

@@ -13,9 +13,9 @@
       @change="changeTab"
     >
       <a-tab-pane key="1" tab="主单信息" :forceRender="true" class="main-bill">
-        <div class="flex">
+        <a-spin :spinning="loading">
-          <div class="main-bill-box">
+          <div class="flex">
-            <a-spin :spinning="loading">
+            <div class="main-bill-box">
               <div class="flex" style="position: relative;">
                 <ActionBar
                   v-if="source == 'edit'"
@@ -102,43 +102,43 @@
                   </a-button>
                 </ApproveBtns>
               </div>
-            </a-spin>
+            </div>
+            <!-- 其他信息 -->
+            <transition name="slide" v-if="source == 'edit'">
+              <otherInfo
+                class="sea-other-info"
+                v-if="source == 'edit'"
+                ref="OtherInfo"
+                :details="bookingDetails"
+                @openFlag="otherOpenFlag"
+              >
+                <Divider type="horizontal" />
+                <!-- 联系人信息 -->
+                <ContactList v-if="source == 'edit' && id" :id="id"></ContactList>
+              </otherInfo>
+            </transition>
+            <transition name="slide" v-if="source == 'edit'">
+              <rightContent
+                class="right-content"
+                ref="RefrightContent"
+                :id="id"
+                :details="bookingDetails"
+                :PexcuteRules="excuteRules"
+                :PexcuteRulesType="excuteRulesType"
+                @fileNewUpadte="fileNewUpadte"
+                @changeAtd="changeAtd"
+                @changeDetail="changeDetailFun"
+                @handleComplete="handleComplete"
+                @rules="getRules"
+                @upDateRight="upDateRightFun"
+                @inGoodsSave="inGoodsSaveFun"
+                @handleRefsh="handleRefshRight"
+                @openFlag="setOpenFlag"
+              >
+              </rightContent>
+            </transition>
           </div>
-          <!-- 其他信息 -->
+        </a-spin>
-          <transition name="slide" v-if="source == 'edit'">
-            <otherInfo
-              class="sea-other-info"
-              v-if="source == 'edit'"
-              ref="OtherInfo"
-              :details="bookingDetails"
-              @openFlag="otherOpenFlag"
-            >
-              <Divider type="horizontal" />
-              <!-- 联系人信息 -->
-              <ContactList v-if="source == 'edit' && id" :id="id"></ContactList>
-            </otherInfo>
-          </transition>
-          <transition name="slide" v-if="source == 'edit'">
-            <rightContent
-              class="right-content"
-              ref="RefrightContent"
-              :id="id"
-              :details="bookingDetails"
-              :PexcuteRules="excuteRules"
-              :PexcuteRulesType="excuteRulesType"
-              @fileNewUpadte="fileNewUpadte"
-              @changeAtd="changeAtd"
-              @changeDetail="changeDetailFun"
-              @handleComplete="handleComplete"
-              @rules="getRules"
-              @upDateRight="upDateRightFun"
-              @inGoodsSave="inGoodsSaveFun"
-              @handleRefsh="handleRefshRight"
-              @openFlag="setOpenFlag"
-            >
-            </rightContent>
-          </transition>
-        </div>
       </a-tab-pane>
       <a-tab-pane key="3" tab="提单信息">
         <LadingInfo :id="id" :details="bookingDetails"></LadingInfo>
@@ -193,7 +193,6 @@
     SetTaskStatus
   } from '../api/BookingLedger'
   const appStore = useAppStore()
-  // const go = useGo()
   const { notification, createMessage } = useMessage()
   import operationArea from './modules/operationArea.vue'
   import basicInfo from './modules/basicInfo.vue'
@@ -520,6 +519,12 @@
           } else {
             createMessage.success('新增成功!')
             id.value = res.data
+            // 关闭当前页面
+            const { fullPath } = route //获取当前路径
+            tabStore.closeTabByKey(fullPath, router)
+            setTimeout(() => {
+              go(`/BookingDetail?id=${res.data}&source=edit`)
+            }, 50)
           }
           init()
         }

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -1682,6 +1682,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     field: 'blType',
     label: '装运方式',
     component: 'Input',
+    defaultValue: '整箱',
     show: false
   },
   {
@@ -1862,21 +1863,21 @@ export const otherInfoFormSchema: FormSchema[] = [
     show: false
   },
   {
-    label: '船司航线',
+    label: '名称',
     field: 'lane',
     component: 'Input',
     show: false,
   },
   {
-    label: '船司航线code',
+    label: 'code',
     field: 'laneCode',
     component: 'Input',
     show: false,
   },
   {
-    label: '船司航线',
+    label: '航线',
     field: 'laneId',
-    component: 'Input',
+    component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 12 },

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

@@ -74,14 +74,6 @@
       <template #hblno="item">
         <span v-show="item.values.hblno" class="iconfont icon-fuzhi11" @click="copyTxt(item, 'hblno')"></span>
       </template>
-      <!-- 结算方式 -->
-      <template #stlName="{ model }">
-        <span class="read-only">{{ model.stlName ? model.stlName : '自动生成' }}</span>
-      </template>
-      <!-- 结算日期 -->
-      <template #stlDate="{ model }">
-        <span class="read-only">{{ model.stlDate ? model.stlDate.split(' ')[0] : '自动生成' }}</span>
-      </template>
     </BasicForm>
   </div>
 </template>

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

@@ -12,8 +12,8 @@
       </h4>
       <Divider type="horizontal" />
       <div>
-        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-chakan mr5"></span>会计期间：</span>{{ details.accountDate }}</div>
+        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-chakan mr5"></span>会计期间：</span>{{ details.accountDate || '自动生成' }}</div>
-        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-calendar mr5"></span>结算日期：</span>{{ details.stlDate }}<span v-if="details.stlName">({{ details.stlName }})</span></div>
+        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-calendar mr5"></span>结算日期：</span>{{ details.stlDate || '自动生成' }}<span v-if="details.stlName">({{ details.stlName }})</span></div>
       </div>
       <div class="lock-box">
         <a-dropdown>
@@ -22,8 +22,8 @@
               <a-menu-item v-for="item in FnblType" :key="item.value" @click="toggleType(item.value)">{{ item.label }}</a-menu-item>
             </a-menu>
           </template>
-          <a-button type="link" :class="{ 'S': typeId == 'S', 'R': typeId == 'R', 'D': typeId == 'D', 'O': typeId == 'O' }">
+          <a-button type="link">
-            <span class="iconfont" :class="{ 'icon-xiangzi': typeId == 'S', 'icon-xuehua1': typeId == 'R', 'icon-jinggao2': typeId == 'D', 'icon-Icon-': typeId == 'O' }"></span>
+            <span class="iconfont" :class="{ 'icon-xiangzi': typeId == '整箱', 'icon-shichuang-duoge': typeId == '拼箱主票', 'icon-liebiao1': typeId == '拼箱分票', 'icon-a-1': typeId == '拼箱单票', 'icon-hebing': typeId == '合票主票', 'icon-cengji': typeId == '合票分票' }"></span>
             {{ typeName }}
             <span class="iconfont icon-30jiantouxiangxiafill"></span>
           </a-button>
@@ -122,6 +122,11 @@
     () => props.details,
     (v) => {
       setFieldsValue(v)
+      if (v.blType) {
+        typeId.value = v.blType
+      } else {
+        typeId.value = '整箱'
+      }
     }
   )
   defineExpose({
@@ -157,9 +162,19 @@
     .mr5 {
       margin-right: 5px;
     }
+    .icon-30jiantouxiangxiafill {
+      margin-left: 3px;
+    }
     .ant-divider-vertical {
       color: #CED5D9!important;
-      margin: 0 15px!important;
+      margin: 0 15px 0 0!important;
+    }
+    .ant-dropdown-trigger {
+      position: relative;
+      top: -0.5px;
+      span {
+        color: #257AFA!important;
+      }
     }
     .lock-box {
       width: 100%;
@@ -168,7 +183,7 @@
       border-radius: 2px;
       margin: 8px 0;
       .iconfont {
-        line-height: 25px;
+        line-height: 22px;
       }
     }
     position: relative;