Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/baseinfo/CodeCheckBill/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"

src/views/baseinfo/accountMaintenance/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"

src/views/baseinfo/clientflowtemplate/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"

src/views/baseinfo/columnset/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"

src/views/baseinfo/country/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:country:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入国家信息
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:country:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:country:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入国家信息
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/ctn/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:ctn:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入集装箱信息
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:ctn:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:ctn:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入集装箱信息
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/edi/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:edi:add')">
           <span class="iconfont icon-new_document"></span>
           添加

src/views/baseinfo/factory/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:factory:add')">
           <span class="iconfont icon-new_document"></span>
           添加

src/views/baseinfo/formcopy/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"

src/views/baseinfo/frt/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:frt:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入付费方式
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:frt:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:frt:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入付费方式
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/goods/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:goods:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入商品信息
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:goods:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:goods:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入商品信息
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -52,7 +51,8 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineComponent, onMounted, ref } from 'vue'
+  import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/goodsStatus/index.vue

@@ -1,12 +1,16 @@
-<!--
- * @Author: lijingjia lijj_xl@163.com
- * @Date: 2024-07-24 18:51:54
- * @Description: 订舱货物状态管理
--->
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
+        <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:edi:add')">
+          <span class="iconfont icon-new_document"></span>
+          添加
+        </a-button>
+        <a-button type="link" @click="handleDel" :disabled="checkPermissions('op:edi:import')">
+          <span class="iconfont icon-shanchu2"></span>
+          删除
+        </a-button>
+        <Divider type="vertical" />
         <a-upload
           :before-upload="beforeUpload"
           :maxCount="1"
@@ -14,24 +18,12 @@
           name="file"
           accept=".xlsm,.xlsx,.xls"
         >
-          <a-button
+          <a-button type="link">
-            type="link"
-          >
             <span class="iconfont icon-xiazai"></span>
             导入货物状态
           </a-button>
         </a-upload>
       </template>
-      <template #toolbar>
-        <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:edi:add')">
-          <span class="iconfont icon-new_document"></span>
-          添加
-        </a-button>
-        <a-button type="link" @click="handleDel" :disabled="checkPermissions('op:edi:import')">
-          <span class="iconfont icon-shanchu2"></span>
-          删除
-        </a-button>
-      </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
@@ -52,6 +44,7 @@
 </template>
 <script lang="ts" setup>
   import { onMounted } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { formatParams } from '/@/hooks/web/common'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
@@ -132,7 +125,7 @@
   function beforeUpload(file) {
     const formData = new FormData()
     formData.append('file', file)
-    ImportBookingStatusConfigByExcel(formData).then(res => {
+    ImportBookingStatusConfigByExcel(formData).then((res) => {
       if (res.succeeded) {
         reload()
         createMessage.success('导入成功！')

src/views/baseinfo/goodstype/index.vue

@@ -2,16 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button
-          type="link"
-          @click="importFlow"
-          :disabled="checkPermissions('op:goodstype:import')"
-        >
-          <span class="iconfont icon-xiazai"></span>
-          导入商品类型
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button
           type="link"
           @click="handleCreate"
@@ -31,7 +21,17 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button
+          type="link"
+          @click="importFlow"
+          :disabled="checkPermissions('op:goodstype:import')"
+        >
+          <span class="iconfont icon-xiazai"></span>
+          导入商品类型
+        </a-button>
       </template>
+      <template #toolbar> </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
@@ -61,6 +61,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/infoclient/columns.tsx

@@ -192,12 +192,12 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 150,
   },
-  {
+  // {
-    title: '收单据模式',
+  //   title: '收单据模式',
-    dataIndex: 'rcvMode',
+  //   dataIndex: 'rcvMode',
-    sorter: true,
+  //   sorter: true,
-    width: 150,
+  //   width: 150,
-  },
+  // },
   {
     title: '电话',
     dataIndex: 'tel',
@@ -604,15 +604,15 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 6 },
   },
-  {
+  // {
-    field: 'rcvMode',
+  //   field: 'rcvMode',
-    label: '收单据模式',
+  //   label: '收单据模式',
-    // required: true,
+  //   // required: true,
-    // component: 'Select',
+  //   // component: 'Select',
-    component: 'Input',
+  //   component: 'Input',
-    defaultValue: '',
+  //   defaultValue: '',
-    colProps: { span: 6 },
+  //   colProps: { span: 6 },
-  },
+  // },
   {
     field: 'tel',
     label: '电话',

src/views/baseinfo/infoclient/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"
@@ -21,17 +21,17 @@
                 onClick: handleAudit.bind(null, record),
                 disabled: checkPermissions('op:infoclient:edit'),
               },
-              {
+              // {
-                icon: 'ant-design:delete-outlined',
+              //   icon: 'ant-design:delete-outlined',
-                tooltip: '删除',
+              //   tooltip: '删除',
-                color: 'error',
+              //   color: 'error',
-                popConfirm: {
+              //   popConfirm: {
-                  title: '是否要删除此条数据？',
+              //     title: '是否要删除此条数据？',
-                  okText: '是',
+              //     okText: '是',
-                  cancelText: '否',
+              //     cancelText: '否',
-                  confirm: handleDelete.bind(null, record)
+              //     confirm: handleDelete.bind(null, record)
-                }
+              //   }
-              }
+              // }
             ]"
           />
         </template>
@@ -141,17 +141,17 @@
     })
   }
 
-  // 删除
+  // // 删除
-  async function handleDelete(record: Recordable) {
+  // async function handleDelete(record: Recordable) {
-    const res: API.DataResult = await BatchDelClientParam({
+  //   const res: API.DataResult = await BatchDelClientParam({
-      id: '',
+  //     id: '',
-      ids: [record.id],
+  //     ids: [record.id],
-    })
+  //   })
-    if (res.succeeded) {
+  //   if (res.succeeded) {
-      createMessage.success(res.message)
+  //     createMessage.success(res.message)
-      reload()
+  //     reload()
-    }
+  //   }
-  }
+  // }
   function handleAudit(record: Recordable) {
     if (!checkPermissions('op:infoclient:edit')) {
       openModal(true, {

src/views/baseinfo/issuetype/index.vue

@@ -2,16 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button
-          type="link"
-          @click="importFlow"
-          :disabled="checkPermissions('op:issuetype:import')"
-        >
-          <span class="iconfont icon-xiazai"></span>
-          导入签单方式
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button
           type="link"
           @click="handleCreate"
@@ -31,7 +21,17 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button
+          type="link"
+          @click="importFlow"
+          :disabled="checkPermissions('op:issuetype:import')"
+        >
+          <span class="iconfont icon-xiazai"></span>
+          导入签单方式
+        </a-button>
       </template>
+
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
           <TableAction
@@ -61,6 +61,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/lanes/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:lanes:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入航线信息
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:lanes:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:lanes:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入航线信息
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/package/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:package:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入包装类型
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:package:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:package:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入包装类型
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/port/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:port:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入港口信息
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:port:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:port:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入港口信息
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/sendReciveTem/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"

src/views/baseinfo/source/DictDataModal.vue

@@ -8,7 +8,7 @@
     @ok="handleOk"
   >
     <BasicTable class="ds-table" @register="registerTable">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button type="link" @click="handleCreate">
           <span class="iconfont icon-new_document"></span>
           新增

src/views/baseinfo/source/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:source:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入业务来源
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:source:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:source:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入业务来源
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -61,6 +60,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/stlmode/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:stlmode:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入结算方式
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:stlmode:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:stlmode:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入结算方式
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -53,6 +52,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/baseinfo/userEmail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
-      <template #toolbar>
+      <template #tableTitle>
         <a-button
           type="link"
           @click="handleCreate"

src/views/baseinfo/vessel/index.vue

@@ -2,12 +2,6 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:vessel:import')">
-          <span class="iconfont icon-xiazai"></span>
-          导入船名
-        </a-button>
-      </template>
-      <template #toolbar>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:vessel:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -23,6 +17,11 @@
             删除
           </a-button>
         </a-popconfirm>
+        <Divider type="vertical" />
+        <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:vessel:import')">
+          <span class="iconfont icon-xiazai"></span>
+          导入船名
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -55,6 +54,7 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
+  import { Divider } from 'ant-design-vue'
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
   import ImportFlow from './importFlow.vue'

src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx

@@ -268,7 +268,7 @@ export const formSchema: FormSchema[] = [
     label: '车队',
     component: 'ApiSelect',
     defaultValue: '',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
         // style: 'width:100%',
@@ -299,7 +299,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 24,
+      span: 12,
     },
   },
   {
@@ -308,7 +308,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 4,
+      span: 6,
     },
   },
   {
@@ -317,7 +317,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
   {
@@ -326,7 +326,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
   {
@@ -335,25 +335,25 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
-    },
-  },
-  {
-    label: '',
-    field: 'Space1',
-    component: 'Space',
-    defaultValue: '',
-    colProps: {
-      span: 5,
     },
   },
+  // {
+  //   label: '',
+  //   field: 'Space1',
+  //   component: 'Space',
+  //   defaultValue: '',
+  //   colProps: {
+  //     span: 5,
+  //   },
+  // },
   {
     label: 'FROM',
     field: 'fromName',
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 4,
+      span: 6,
     },
   },
   {
@@ -362,7 +362,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
   {
@@ -371,27 +371,28 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
   {
-    label: 'FROM 手机号',
+    label: 'FROM 邮箱',
-    field: 'fromMobile',
+    field: 'fromEmail',
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
   {
-    label: 'FROM 邮箱',
+    label: 'FROM 手机号',
-    field: 'fromEmail',
+    field: 'fromMobile',
     component: 'Input',
     defaultValue: '',
     colProps: {
-      span: 5,
+      span: 6,
     },
   },
+
   {
     field: 'divider-selects',
     component: 'Divider',
@@ -555,7 +556,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
         immediate: false,
@@ -596,7 +597,7 @@ export const formSchema: FormSchema[] = [
     component: 'DatePicker',
     defaultValue: '',
     colProps: {
-      span: 12,
+      span: 6,
     },
     componentProps: {
       showTime: true,

src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckDetails.vue

@@ -6,28 +6,31 @@
     width="90%"
     @register="registerModal"
   >
-    <a-row>
+    <a-row :gutter="16">
       <a-col :span="6">
-        <BasicTable @register="registerOpBusinessTruckTable">
+        <BasicTable @register="registerOpBusinessTruckTable" @row-click="onRowClick">
           <template #tableTitle>
-            <div class="buttonGroup">
+            <a-button type="link" @click="FnClickAdd" class="pl0">
-              <div class="nav" @click="FnClickAdd">
+              <span class="iconfont icon-new_document"></span>
-                <i class="iconfont icon-jiahao2fill"></i>新建
+              新建
-              </div>
+            </a-button>
-              <a-popconfirm
+            <a-popconfirm
-                title="确定要删除所选数据?"
+              title="确定要删除所选数据?"
-                ok-text="确定"
+              ok-text="确定"
-                cancel-text="取消"
+              cancel-text="取消"
-                @confirm="FnClickDel"
+              @confirm="FnClickDel"
-              >
+            >
-                <div class="nav"> <i class="iconfont icon-shanchu"></i>删除 </div>
+              <a-button type="link">
-              </a-popconfirm>
+                <span class="iconfont icon-shanchu21"></span>
-            </div>
+                删除
+              </a-button>
+            </a-popconfirm>
           </template>
         </BasicTable>
       </a-col>
       <a-col :span="18" class="OPCol">
         <OpBusinessTruckEdit
+          ref="YardEdit"
           :business-id="businessId"
           :select-id="selectId"
           @success="handleSuccess"
@@ -43,8 +46,8 @@
 <script lang="ts" setup>
   import { ref } from 'vue'
   import { columns } from './OpBusinessYardColumns'
-  import { BasicModal, useModalInner, useModal } from '/@/components/Modal'
+  import { BasicModal, useModalInner } from '/@/components/Modal'
-  import { BasicTable, useTable, TableAction } from '/@/components/Table'
+  import { BasicTable, useTable } from '/@/components/Table'
   import { GetOpBusinessTruckList, BatchDelOpBusinessTruck } from './LetterApi'
   import OpBusinessTruckEdit from './OpBusinessTruckEdit.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -105,12 +108,18 @@
     rowSelection: {
       type: 'radio',
       onSelect: (e) => {
-        console.log(e)
         selectId.value = e.id
       },
     },
   })
-
+  // 派车编辑组件
+  const YardEdit: any = ref()
+  // 行点击事件
+  const onRowClick = (record) => {
+    YardEdit.value.setFieldsValue({
+      ...record,
+    })
+  }
   // 删除
   function FnClickDel() {
     if (getSelectRows().length) {

src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckEdit.vue

@@ -2,24 +2,29 @@
   <a-spin :spinning="spinning">
     <div class="MainBox">
       <div class="buttonGroup">
-        <div class="nav" @click="handleSave"> <i class="iconfont icon-jiahao2fill"></i>保存 </div>
+        <a-button type="link" @click="handleSave" class="pl0">
+          <span class="iconfont icon-baocun"></span>
+          保存
+        </a-button>
       </div>
       <div class="Content">
         <BasicForm @register="registerForm" />
         <div>
-          <div class="buttonGroup">
+          <a-button type="link" @click="TableAdd" class="pl0">
-            <div class="nav" @click="TableAdd">
+            <span class="iconfont icon-new_document"></span>
-              <i class="iconfont icon-jiahao2fill"></i>新增明细
+            新增明细
-            </div>
+          </a-button>
-            <a-popconfirm
+          <a-popconfirm
-              title="确定要删除所选数据?"
+            title="确定要删除所选数据?"
-              ok-text="确定"
+            ok-text="确定"
-              cancel-text="取消"
+            cancel-text="取消"
-              @confirm="FnClickDel"
+            @confirm="FnClickDel"
-            >
+          >
-              <div class="nav"> <i class="iconfont icon-shanchu"></i>删除明细 </div>
+            <a-button type="link" @click="handleSave" class="pl0">
-            </a-popconfirm>
+              <span class="iconfont icon-shanchu21"></span>
-          </div>
+              删除明细
+            </a-button>
+          </a-popconfirm>
         </div>
         <hot-table ref="hotTb" :data="list" :settings="settings">
           <img
@@ -371,8 +376,6 @@
   .MainBox {
     height: 100%;
     position: relative;
-    .buttonGroup {
-    }
     .Content {
       height: calc(100% - 28px);
       overflow-y: auto;

src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardDetails.vue

@@ -118,7 +118,7 @@
   // 行点击事件
   const onRowClick = (record) => {
     YardEdit.value.setFieldsValue({
-      ...record
+      ...record,
     })
     YardEdit.value.setFieldsValue1({
       ...record