diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 3b9ac8d0..ebe72732 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -13,9 +13,9 @@ @change="changeTab" > -
-
- + +
+
- +
+ + + + + + + + + + + +
- - - - - - - - - - - - -
+ @@ -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() } diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index 04acf17c..87b20560 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/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 }, diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue index 7c82afae..8b92e582 100644 --- a/src/views/operation/seaexport/detail/modules/basicInfo.vue +++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue @@ -74,14 +74,6 @@ - - - -
diff --git a/src/views/operation/seaexport/detail/modules/otherInfo.vue b/src/views/operation/seaexport/detail/modules/otherInfo.vue index 7b8b7349..18990016 100644 --- a/src/views/operation/seaexport/detail/modules/otherInfo.vue +++ b/src/views/operation/seaexport/detail/modules/otherInfo.vue @@ -12,8 +12,8 @@
-
会计期间:{{ details.accountDate }}
-
结算日期:{{ details.stlDate }}({{ details.stlName }})
+
会计期间:{{ details.accountDate || '自动生成' }}
+
结算日期:{{ details.stlDate || '自动生成' }}({{ details.stlName }})
@@ -22,8 +22,8 @@ {{ item.label }} - - + + {{ typeName }} @@ -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;