vxe

src/api/common/index.ts

@@ -65,6 +65,8 @@ enum Api {
   GetClientListByCode = '/mainApi/ClientCommon/GetClientListByCode',
   // 供应商客户类型
   GetSupplierListByCode = '/mainApi/ClientCommon/GetSupplierListByCode',
+  // 全部单位下拉
+  GetSupplierAndClientListByCode = '/mainApi/ClientCommon/GetSupplierAndClientListByCode',
   // 费用名称下拉数据
   GetFeeCodeSelectList = '/mainApi/ClientCommon/GetFeeCodeSelectList',
   // 获取箱型下拉数据
@@ -205,7 +207,14 @@ export function GetSupplierListByCode(params) {
     params,
   })
 }
-
+// 全部单位下拉
+export function GetSupplierAndClientListByCode(params) {
+  return request<DataResult>({
+    url: Api.GetSupplierAndClientListByCode,
+    method: 'get',
+    params,
+  })
+}
 // 获取费用名称下拉数据
 export function GetFeeCodeSelectList() {
   return request<DataResult>({

src/components/CostEntry/api.ts

@@ -19,7 +19,7 @@ enum Api {
   GetPrintInfo = '/feeApi/FeeRecord/GetPrintInfo',
   GetFees = '/feeApi/PaymentApplication/GetFees',
   ApplyBusinessAudit = '/feeApi/FeeRecord/ApplyBusinessAudit',
-  WithdrawBusiness = '/feeApi/FeeRecordWithdrawBusiness',
+  WithdrawBusiness = '/feeApi/FeeRecord/WithdrawBusiness',
   SubmitWithAudit = '/feeApi/FeeRecord/SubmitWithAudit'
 }
 // 列表 (Auth)

src/components/CostEntry/feeTable.vue

@@ -62,7 +62,7 @@
   import { feeStatusList } from './columns'
   import { GetList, SubmitFee, DeleteFee, ApplyAudit, Withdraw, SubmitWithAudit } from './api'
   // 结算对象下拉数据
-  import { GetClientListByCode } from '/@/api/common'
+  import { GetSupplierAndClientListByCode } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
   // 引入字典接口
   import { getDictOption } from '/@/utils/dictUtil'
@@ -239,7 +239,7 @@
       visible: true,
       source: async (query, process) => {
         if (query && query.indexOf('~') > -1) query = query.split('~')[1]
-        GetClientListByCode({ queryKey: query }).then((res) => {
+        GetSupplierAndClientListByCode({ queryKey: query }).then((res) => {
           const { data } = res
           data.forEach((item) => {
             item['label'] = item.shortName

src/components/Table/src/BasicTable.vue

@@ -28,6 +28,7 @@
         size="mini"
         :loading="getBindValues.loading"
         @cell-dblclick="dbclickVxeRow"
+        @checkbox-change="vxeCheckBoxChange"
       >
         <vxe-column type="checkbox" width="40"></vxe-column>
         <vxe-column
@@ -77,7 +78,6 @@
 </template>
 <script lang="ts">
 import type { BasicTableProps, TableActionType, SizeType, ColumnChangeParam } from './types/table'
-
 import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect } from 'vue'
 import { Table, Pagination } from 'ant-design-vue'
 import { BasicForm, useForm } from '/@/components/Form/index'
@@ -375,12 +375,16 @@ export default defineComponent({
       emit('row-dbClick', row)
       // props.rowDbClick(row)
     }
+    const vxeCheckBoxChange = (v) => {
+      console.log(v)
+    }
     return {
       formRef,
       tableElRef,
       getBindValues,
       getLoading,
       registerForm,
+      vxeCheckBoxChange,
       handleSearchInfoChange,
       getEmptyDataIsShowTable,
       handleTableChange,

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

@@ -131,8 +131,6 @@
   }
   onMounted(() => {
     emitter.on('sendBaseInfo', (v) => {
-      console.log(v)
-      console.log(changeType)
       if (changeType == 'controller') {
         setFieldsValue({
           customerName: v.customerName || null,
@@ -143,7 +141,7 @@
           customerId: v.forwarderId,
           customerName: v.forwarder
         })
-      } else if (changeType == 'shipper') {
+      } else if (changeType == 'shippercn') {
         setFieldsValue({
           customerName: v.shipperCn,
           customerId: v.shipperCnId