9.10海运出口禅道迭代

src/views/baseinfo/port/columns.tsx

@@ -143,6 +143,12 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+  {
+    field: 'portName',
+    label: '港口英文名称',
+    component: 'Input',
+    colProps: { span: 4 }
+  },
   {
     field: 'countryId',
     label: '国家',

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

@@ -1963,7 +1963,7 @@ export function EditShippingBillPartCtn(data) {
   })
 }
 
-// 提单信息删除
+// 提单箱信息删除
 export function BatchDelBillManageCtn(data) {
   return request({
     url: '/opApi/SeaExportBillManage/BatchDelBillManageCtn',
@@ -1972,6 +1972,15 @@ export function BatchDelBillManageCtn(data) {
   })
 }
 
+// 提单信息删除
+export function BatchDelBillManage(data) {
+  return request({
+    url: '/opApi/SeaExportBillManage/BatchDelBillManage',
+    method: 'post',
+    data,
+  })
+}
+
 // 历史提单信息历史列表
 export function GetBillManageHistoryList(data) {
   return request({

src/views/operation/seaexport/detail/components/container.vue

@@ -59,6 +59,13 @@
     },
     setFieldsValue: {
       type: Function
+    },
+    // 新建的集装箱数据
+    ctnInfo: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   })
   // 表格ref
@@ -334,7 +341,7 @@
       queryCondition: JSON.stringify([
         {
           FieldName: 'bsno',
-          FieldValue: props.id,
+          FieldValue: props.details.id,
           ConditionalType: 1,
         },
       ]),
@@ -369,7 +376,8 @@
         }
       }
     })
-    GetCtnList()
+    list.value = props.ctnInfo
+    hot.loadData(props.ctnInfo)
   })
   defineExpose({
     list,

src/views/operation/seaexport/detail/components/ladingInfo.vue

@@ -19,7 +19,7 @@
             <SvgIcon class="ml30" size="18" name="delete" @click="deleteRow" />
           </a-tooltip>
           <a-tooltip placement="top" title="打印">
-            <SvgIcon class="ml30" size="18" name="print" />
+            <SvgIcon class="ml30" size="18" name="print" @click="print" />
           </a-tooltip>
           <!-- <a-popconfirm
             :visible="deleteFlag"
@@ -69,7 +69,11 @@
             <img src="../../../../../assets/images/nodata.png" alt="">
             <div class="no-message">暂无数据</div>
           </div>
-
+          <ul class="h-list">
+            <li v-for="item in list" :key="item.id" class="mt10" :class="{ 'active-li': item.id == activeId }" @click="setFormValue(item)">
+              <span class="iconfont icon-renwu_"></span> <span>{{ item.hblno }}</span>
+            </li>
+          </ul>
         </div>
         <!-- <BasicTable
           class="ds-table-detail"
@@ -95,6 +99,7 @@
                     ref="contBox"
                     :id="id"
                     :setFieldsValue="setFieldsValue3"
+                    :ctnInfo="ctnInfo"
                   ></container>
                   <a-form
                     v-model="formData"
@@ -175,11 +180,11 @@
               </div>
             </a-spin>
           </a-tab-pane>
-          <a-tab-pane key="2" tab="其他信息" size="small">
+          <!-- <a-tab-pane key="2" tab="其他信息" size="small">
             <BasicForm
               @register="OtherForm"
             />
-          </a-tab-pane>
+          </a-tab-pane> -->
         </a-tabs>
       </div>
     </a-spin>
@@ -188,6 +193,7 @@
       :reload="init"
       ref="ladHistory"
     />
+    <DsPrint ref="dsPrint" :code="code" :paramJsonStr="paramJsonStr" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -202,7 +208,7 @@
   const container = defineAsyncComponent(() => import("./container.vue"))
   // 历史提单弹窗
   const ladingHistory = defineAsyncComponent(() => import("./ladingHistory.vue"))
-  import { EditSeaExportBillManage, BatchDelBillManageCtn, GetSeaExportBillManageInfo } from '../../api/BookingLedger'
+  import { EditSeaExportBillManage, BatchDelBillManage, BatchDelBillManageCtn, GetSeaExportBillManageInfo } from '../../api/BookingLedger'
   // 引入提示信息
   import { useMessage } from '/@/hooks/web/useMessage'
   const { createMessage } = useMessage()
@@ -214,24 +220,10 @@
     // 详情信息
     details: { type: Object, default: {} }
   })
+  // tab页签
   const activeKey = ref('1')
-  const selectiChange = (v) => {
+  // 当前激活的列表数据
-    if (v.length == 0) {
+  const activeId = ref(null)
-      resetFields1()
-      resetFields2()
-      resetFields3()
-      resetFields4()
-      formData.agentId = ''
-      formData.agentContent = ''
-      formData.cntrSealNo = ''
-      formData.description = ''
-      formData.marks = ''
-      setFieldsValue5({
-        ...props.details
-      })
-    }
-    setFormValue()
-  }
   // 提单信息第一个表单(收发通)
   const [registerForm, { setFieldsValue: setFieldsValue1, validate: validate1, resetFields: resetFields1 }] =
     useForm({
@@ -284,16 +276,21 @@
   const deleteRow = () => {
     loading.value = true
     deleteFlag.value = false
-    BatchDelBillManageCtn({ id: props.id, ids: state.rowKeys }).then(res => {
+    if (!activeId.value) return createMessage.warning('请选择要删除的数据！')
+    BatchDelBillManage({ id: props.id, ids: [activeId.value] }).then(res => {
+      createMessage.success('删除成功！')
       loading.value = false
+      activeId.value = null
       init()
+    }).catch(() => {
+      loading.value = false
     })
   }
   const dloading = ref(false)
   // 设置表单的值
-  const setFormValue = () => {
+  const setFormValue = (row) => {
-    const row = getSelectRows()[0]
     const id = row?.id
+    activeId.value = id
     if (id) {
       dloading.value = true
       GetSeaExportBillManageInfo({ id }).then(res => {
@@ -637,8 +634,15 @@
   }
   // 集装箱
   const contBox = ref(null)
+  // 集装箱数据
+  const ctnInfo = ref([])
+  // 打印
+  const print = () => {
+    
+  }
   // 新建
   const create = () => {
+    activeId.value = null
     resetFields1()
     resetFields2()
     resetFields3()
@@ -649,7 +653,8 @@
     formData.description = ''
     formData.marks = ''
     setFieldsValue1({
-      ...props.details
+      ...props.details,
+      id: null
     })
     setFieldsValue2({
       ...props.details
@@ -661,13 +666,21 @@
       ...props.details
     })
     setFieldsValue5({
-      ...props.details
+      ...props.details,
+      hblno: null
     })
     formData.agentId = props.details.agentId
     formData.agentContent = props.details.agentContent
     formData.cntrSealNo = props.details.cntrSealNo
     formData.description = props.details.description
     formData.marks = props.details.marks
+    // 如果主单存在集装箱，清空集装箱id
+    if (props.details.ctnInfo && props.details.ctnInfo.length) {
+      props.details.ctnInfo.forEach(item => {
+        item.id = ''
+      })
+      ctnInfo.value = props.details.ctnInfo
+    }
     createMessage.success('表单已置为新建状态！')
   }
   // 调入主单信息
@@ -727,6 +740,27 @@
       margin-bottom: 0!important;
     }
   }
+  .h-list {
+    li {
+      cursor: pointer;
+      line-height: 22px;
+      padding: 0 5px;
+      border-radius: 2px;
+    }
+    li:hover {
+      background: #F5F9FC;
+    }
+    span {
+      color: #7A8798;
+      font-size: 12px;
+    }
+    .active-li {
+      background: #F5F9FC;
+      span {
+        color: #257AFA;
+      }
+    }
+  }
   .ml30 {
     margin-left: 30px;
   }

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

@@ -18,10 +18,10 @@
       </a-button>
     </ConfigForm>
     <div>
-      <span v-if="userStore.getUserInfo.tenantId == '1750335377144680448'" class="customerNo">
+      <!-- <span v-if="userStore.getUserInfo.tenantId == '1750335377144680448'" class="customerNo">
         {{ formData.customerNo }}
-      </span>
+      </span> -->
-      <span v-else>
+      <span>
         <input
           ref="customerNoRef"
           :style="{ width: `${formData.customerNo?.length * 7}px` }"