重构海运出口

src/components/Form/src/components/FormAction.vue

@@ -1,6 +1,6 @@
 <template>
   <a-col v-if="showActionButtonGroup" v-bind="actionColOpt">
-    <div style="width: 100%" :style="{ textAlign: actionColOpt.style.textAlign }">
+    <div :style="{ textAlign: actionColOpt.style.textAlign }" style="margin-top: 22px">
       <FormItem>
         <slot name="resetBefore"></slot>
         <Button

src/components/Table/src/BasicTable.vue

@@ -6,6 +6,7 @@
       submit-on-reset
       v-bind="getFormProps"
       :table-action="tableAction"
+      :autoSubmitOnEnter="true"
       @register="registerForm"
       @submit="handleSearchInfoChange"
       @advanced-change="redoHeight"

src/views/operation/seaexport/components/tableActionBar.vue

@@ -32,18 +32,15 @@
       ok-text="是"
       cancel-text="否"
       @confirm="removeMoreFun"
-      @cancel="cancelRemove"
     >
       <div class="nav"><i class="iconfont icon-shanchu2"></i>删除</div>
     </a-popconfirm>
-    <!-- <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
+    <div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
 
     <div class="nav" @click="handleSearchTxxp">
-      <a-spin :spinning="txxpLoading">
-        <i class="iconfont icon-xiaopiaodayin"></i>小票状态
-      </a-spin>
+      <i class="iconfont icon-xiaopiaodayin"></i>小票状态
     </div>
-    <div class="nav" @click="openTraceModel"
+    <!-- <div class="nav" @click="openTraceModel"
       ><i class="iconfont icon-yunshu1"></i>运踪订阅</div
     >
     <div class="nav">
@@ -104,7 +101,7 @@
       </a-form>
     </a-modal>
     <!-- 批量操作 -->
-    <!-- <BatchModification v-if="batchFlag" @register="registerModal" @success="BMSuccess" /> -->
+    <BatchModification @register="registerModal" @success="BMSuccess" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -113,8 +110,8 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { useRouter } from 'vue-router'
   import { useModal } from '/@/components/Modal'
-  import { SeaExportBatchDel } from '../api/BookingLedger.js'
-  // import BatchModification from '../modules/BatchModification.vue'
+  import { SeaExportBatchDel, SaveBookingTxxp } from '../api/BookingLedger.js'
+  import BatchModification from '../modules/BatchModification.vue'
   const router = useRouter()
   const { createMessage } = useMessage()
   const go = useGo()
@@ -190,7 +187,7 @@
       return item.id
     })
     batchFlag.value = true
-    openModal(true, { removeArr })
+    openModal(true, { removeArr, flag: true })
   }
   function BMSuccess() {
     props.reload()
@@ -224,6 +221,25 @@
         console.log(err)
       })
   }
+  const xGrid = ref()
+  const txxpForm = ref({})
+  // 小票状态
+  function handleSearchTxxp() {
+    return
+    const select = xGrid.value.getCheckboxRecords()
+    if (select.length === 0) {
+      createMessage.warning('请选择操作订单！')
+      return false
+    }
+    const pkIdArr = select.map((item, index) => {
+      return item.id
+    })
+    SaveBookingTxxp({ Id: pkIdArr[0] }).then((res) => {
+      if (res.succeeded) {
+        txxpForm.value = res.data
+      }
+    })
+  }
 </script>
 
 <style lang="scss">

src/views/operation/seaexport/index.vue

@@ -165,7 +165,7 @@
   import { PageDataByBooking, GetUserQuerySet, UpdateUserQuerySet } from './api/BookingLedger.js'
   import { getColumnsByClient } from '/@/views/baseinfo/formcopy/api'
   import { useModal } from '/@/components/Modal'
-  import { columns, searchFormSchema, FeeStatus } from './listColumns'
+  import { columns, searchFormSchema, FeeStatus } from './columns'
   import { useGo } from '/@/hooks/web/usePage'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { formatTableData } from '/@/hooks/web/common'

src/views/operation/seaexport/modules/BatchModification.vue

@@ -34,8 +34,8 @@
   import { ref, computed, unref } from 'vue'
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
-  import { BatchModificationFormSchema } from '../detail/columns'
-  import { SeaExportBatchEdit } from '../api/BookingLedger.js'
+  import { BatchModificationFormSchema } from '../columns'
+  import { SeaExportBatchEdit, SaveBookingTxxp } from '../api/BookingLedger.js'
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
@@ -50,6 +50,7 @@
   })
   const ids = ref()
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    flag.value = true
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     ids.value = data.removeArr
@@ -64,7 +65,6 @@
       console.log(values)
       // loading.value = true;
       const res: API.DataResult = await SeaExportBatchEdit({ ...values, ids: ids.value })
-      console.log(res)
       if (res.succeeded) {
         createMessage.success(res.message)
         emit('success')