港口带出国家

src/components/CostEntry/actionBar.vue

@@ -132,7 +132,7 @@
       </div>
     </div>
     <!-- 引入历史数据弹窗 -->
-    <HistoryDrawer ref="historyDrawer" @submit="submitHistory" :tbType='tbType'></HistoryDrawer>
+    <HistoryDrawer ref="historyDrawer" @submit="submitHistory" :tbType='tbType' :details="details"></HistoryDrawer>
     <!-- 费用模版弹窗 -->
     <FeeTemDrawer ref="feeDrawer" @submit="submitTem"></FeeTemDrawer>
     <!-- 保存到费用模版 -->

src/components/CostEntry/components/historyDrawer.vue

@@ -22,8 +22,8 @@
         @register="registerTable"
         @row-click="onRowClick"
       ></BasicTable>
-      <div class="info mt15">
-        <h4>费用明细 <span class="fee-checkbox"><a-checkbox v-model:checked="checked">引入结算对象</a-checkbox></span></h4>
+      <div class="info">
+        <h4>费用明细 <span style="margin-left: 100px;"><a-checkbox v-model:checked="checked"><span style="font-size: 12px; font-weight: 12px;">引入结算对象</span></a-checkbox></span></h4>
         <feeTable
           ref="feeTabel"
           :tbType='tbType'
@@ -47,6 +47,10 @@
   const props = defineProps({
     tbType: {
       type: String
+    },
+    details: {
+      type: Object,
+      default: {}
     }
   })
   const [registerTable] = useTable({
@@ -106,6 +110,30 @@
     if (data && data.length == 0) {
       return createMessage.warning('请勾选要引入的费用！')
     }
+    if (checked.value == false) {
+      data.forEach(item => {
+        // 订舱口
+        if (item.customerType == 'booking') {
+          item.customerName = props.details.forwarder
+          item.customerId = props.details.forwarderId
+        }
+        // 委托单位
+        if (item.customerType == 'controller') {
+          item.customerName = props.details.customerName
+          item.customerId = props.details.customerId
+        }
+        // 场站
+        if (item.customerType == 'yard') {
+          item.customerName = props.details.yard
+          item.customerId = props.details.yardId
+        }
+      })
+    }
+    console.log(props.details)
+    data.forEach(item => {
+      item.id = 0
+    })
+    return
     emits('submit', data)
   }
   const historyChange = (v) => {

src/components/CostEntry/feeTable.vue

@@ -776,7 +776,6 @@
     SubmitFee(postData)
       .then((res) => {
         loading.value = false
-        createMessage.success(res.message)
         // 刷新统计表格数据
         emits('refreshStatic')
         init()

src/layouts/default/setting/SettingDrawer.tsx

@@ -378,8 +378,8 @@ export default defineComponent({
         width={330}
         class="setting-drawer"
       >
-        {unref(getShowDarkModeToggle) && <Divider>{() => t('layout.setting.darkMode')}</Divider>}
-        {unref(getShowDarkModeToggle) && <AppDarkModeToggle class="mx-auto" />}
+        {/* {unref(getShowDarkModeToggle) && <Divider>{() => t('layout.setting.darkMode')}</Divider>}
+        {unref(getShowDarkModeToggle) && <AppDarkModeToggle class="mx-auto" />} */}
         <Divider>{() => t('layout.setting.sysTheme')}</Divider>
         {renderMainTheme()}
         <Divider>{() => t('layout.setting.headerTheme')}</Divider>

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

@@ -1147,9 +1147,10 @@
   // }
   // 订舱审核
   const approveDc = async (remark) => {
+    if (!remark) {
+      // 审批通过判断是否是最后一个审批人
       const flag = await save('dc')
       if (flag || flag === undefined) {
-      if (!remark) {
         IsLastMarker({
           bsType: 1,
           bsId: id.value,
@@ -1170,6 +1171,9 @@
           }
         })
       }
+    } else {
+      // 驳回
+      seaExportTaskAudit(remark, false)
     }
   }
   // 审单接口

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

@@ -931,10 +931,10 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
               ? formActionType.linkageForm({ key: 'dischargePortCode', value: obj })
               : null
             formModel.dischargePortId = obj.id
-            formModel.dischargePort = obj.portName
+            formModel.dischargePort = obj.portName + ',' + obj.countryEnName
             // 带出交货地
             formModel.deliveryPlaceId = obj.id
-            formModel.deliveryPlace = obj.portName
+            formModel.deliveryPlace = obj.portName + ',' + obj.countryEnName
             formModel.deliveryPlaceCode = e
           }
           if (!e && !obj) {
@@ -967,7 +967,7 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         onChange: (e, obj) => {
           if (e && obj) {
             formModel.deliveryPlaceId = obj.id
-            formModel.deliveryPlace = obj.portName
+            formModel.deliveryPlace = obj.portName + ',' + obj.countryEnName
           }
           if (!e && !obj) {
             formModel.deliveryPlaceId = null
@@ -995,7 +995,7 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         showName: 'ediCode',
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.receiptPlace = obj.portName
+            formModel.receiptPlace = obj.portName + ',' + obj.countryEnName
             formModel.receiptPlaceId = obj.id
           }
           if (!e && !obj) {
@@ -1027,7 +1027,7 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         onChange: (e, obj) => {
           if (e && obj) {
             formModel.transPortId = obj.id
-            formModel.transPort = obj.portName
+            formModel.transPort = obj.portName + ',' + obj.countryEnName
           }
           if (!e && !obj) {
             formModel.transPortId = null