diff --git a/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt b/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt
index 832ab43b..f88513f0 100644
--- a/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt
+++ b/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeDetailVO.kt
@@ -52,4 +52,6 @@ data class AdvanceChargeDetailVO (
     var files: List<FileDataBO>? = null,
 
     var remark: String? = null,
+
+    var status: Int? = null,
 )
diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java
index d2a061b7..734ee7fe 100644
--- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherShipmentsServiceImpl.java
@@ -294,7 +294,7 @@ public Response<String> addOrUpdateOtherShipments(OtherShipmentDTO otherShipment
         if(!otherShipmentsDTO.getTableData().isEmpty()) {
             for (StorageShipmentStockBO stockBO : otherShipmentsDTO.getTableData()) {
                 totalProductNumber += stockBO.getProductNumber();
-                totalAmount = totalAmount.add(stockBO.getAmount());
+                totalAmount = totalAmount.add(Optional.ofNullable(stockBO.getAmount()).orElse(BigDecimal.ZERO));
             }
         }
 
diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java
index e8e252a4..c4771234 100644
--- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/OtherStorageServiceImpl.java
@@ -297,7 +297,7 @@ public Response<String> addOrUpdateOtherStorage(OtherStorageDTO otherStorageDTO)
         if(!otherStorageDTO.getTableData().isEmpty()) {
             for (StorageShipmentStockBO stockBO : otherStorageDTO.getTableData()) {
                 totalProductNumber += stockBO.getProductNumber();
-                totalAmount = totalAmount.add(stockBO.getAmount());
+                totalAmount = totalAmount.add(Optional.ofNullable(stockBO.getAmount()).orElse(BigDecimal.ZERO));
             }
         }
 
diff --git a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/CustomerServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/CustomerServiceImpl.kt
index 6730ec60..8e1e3155 100644
--- a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/CustomerServiceImpl.kt
+++ b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/CustomerServiceImpl.kt
@@ -98,7 +98,9 @@ open class CustomerServiceImpl(
             queryCustomerDTO?.phoneNumber?.let { like(Customer::getPhoneNumber, it) }
             queryCustomerDTO?.startDate?.let { ge(Customer::getCreateTime, it) }
             queryCustomerDTO?.endDate?.let { le(Customer::getCreateTime, it) }
+            eq(Customer::getStatus, CommonConstants.STATUS_NORMAL)
             eq(Customer::getDeleteFlag, CommonConstants.NOT_DELETED)
+           .orderByAsc(Customer::getSort)
         }
         val list = customerMapper.selectList(wrapper)
         val listVo = list.map { customer ->
diff --git a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/MemberServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/MemberServiceImpl.kt
index fae20eae..38b1e6cd 100644
--- a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/MemberServiceImpl.kt
+++ b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/MemberServiceImpl.kt
@@ -173,6 +173,7 @@ open class MemberServiceImpl(
                 .eq(StringUtils.hasLength(memberDTO?.phoneNumber), Member::getPhoneNumber, memberDTO?.phoneNumber)
                 .ge(StringUtils.hasLength(memberDTO?.startDate), Member::getCreateTime, memberDTO?.startDate)
                 .le(StringUtils.hasLength(memberDTO?.endDate), Member::getCreateTime, memberDTO?.endDate)
+                .eq(Member::getStatus, CommonConstants.STATUS_NORMAL)
                 .eq(Member::getDeleteFlag, CommonConstants.NOT_DELETED)
                 .orderByAsc(Member::getSort)
         )
diff --git a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/SupplierServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/SupplierServiceImpl.kt
index 53129cee..b19eaf64 100644
--- a/core/service/src/main/kotlin/com/wansenai/service/basic/impl/SupplierServiceImpl.kt
+++ b/core/service/src/main/kotlin/com/wansenai/service/basic/impl/SupplierServiceImpl.kt
@@ -136,7 +136,9 @@ open class SupplierServiceImpl(
             supplier?.phoneNumber?.let { like(Supplier::getPhoneNumber, it) }
             supplier?.startDate?.let { ge(Supplier::getCreateTime, it) }
             supplier?.endDate?.let { le(Supplier::getCreateTime, it) }
+            eq(Supplier::getStatus, CommonConstants.STATUS_NORMAL)
             eq(Supplier::getDeleteFlag, CommonConstants.NOT_DELETED)
+            orderByAsc(Supplier::getSort)
         }
         val list = supplierMapper.selectList(wrapper)
         val listVo = list.map { supplier ->
diff --git a/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt
index 61038845..83be32b3 100644
--- a/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt
+++ b/core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt
@@ -247,6 +247,7 @@ open class AdvanceChargeServiceImpl(
             val financialPerson = operatorService.getOperatorById(financialMain.operatorId)
             val subData = financialSubService.lambdaQuery()
                 .eq(FinancialSub::getFinancialMainId, id)
+                .eq(FinancialSub::getDeleteFlag, CommonConstants.NOT_DELETED)
                 .list()
 
             val tableData = ArrayList<AdvanceChargeDataBO>()
@@ -288,7 +289,8 @@ open class AdvanceChargeServiceImpl(
                 collectedAmount = financialMain.changeAmount,
                 tableData = tableData,
                 remark = financialMain.remark,
-                files = filesData
+                files = filesData,
+                status = financialMain.status
             )
             return Response.responseData(resultVO);
         }
diff --git a/web/package.json b/web/package.json
index 624743c7..4f7a1fe2 100644
--- a/web/package.json
+++ b/web/package.json
@@ -104,8 +104,8 @@
     "vue-router": "^4.2.3",
     "vue-types": "^5.1.0",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "^4.4.5",
-    "vxe-table-plugin-export-xlsx": "^3.0.4",
+    "vxe-table": "^4.5.14",
+    "vxe-table-plugin-export-xlsx": "3.1.0",
     "xe-utils": "^3.5.11",
     "xlsx": "^0.18.5"
   },
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index 66aabdb7..efd614c3 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -123,11 +123,11 @@ importers:
         specifier: ^4.1.0
         version: registry.npmmirror.com/vuedraggable@4.1.0(vue@3.3.4)
       vxe-table:
-        specifier: ^4.4.5
-        version: registry.npmmirror.com/vxe-table@4.5.8(vue@3.3.4)(xe-utils@3.5.12)
+        specifier: ^4.5.14
+        version: registry.npmmirror.com/vxe-table@4.5.14(vue@3.3.4)(xe-utils@3.5.12)
       vxe-table-plugin-export-xlsx:
-        specifier: ^3.0.4
-        version: registry.npmmirror.com/vxe-table-plugin-export-xlsx@3.0.5(vxe-table@4.5.8)
+        specifier: 3.1.0
+        version: registry.npmmirror.com/vxe-table-plugin-export-xlsx@3.1.0(vxe-table@4.5.14)
       xe-utils:
         specifier: ^3.5.11
         version: registry.npmmirror.com/xe-utils@3.5.12
@@ -9372,10 +9372,10 @@ packages:
     name: dom-scroll-into-view
     version: 2.0.1
 
-  registry.npmmirror.com/dom-zindex@1.0.0:
-    resolution: {integrity: sha512-pBKBPSfInArD3L+NPnGny/9l3g6NmFbbOEacpc0nB28PGXdcphZdnr794KFnPglNm2Wdt2hYOdUkYYej8CbvsQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.0.tgz}
+  registry.npmmirror.com/dom-zindex@1.0.1:
+    resolution: {integrity: sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.1.tgz}
     name: dom-zindex
-    version: 1.0.0
+    version: 1.0.1
     dev: false
 
   registry.npmmirror.com/domexception@2.0.1:
@@ -13323,27 +13323,27 @@ packages:
       vue: 3.3.4
     dev: false
 
-  registry.npmmirror.com/vxe-table-plugin-export-xlsx@3.0.5(vxe-table@4.5.8):
-    resolution: {integrity: sha512-9vZuqIEFdyjNAiUaHsE2fc0RyI8q/DsbpsVvi2flOeTqyUDjvpyDYzTjiF9W3rXMPwxZ8w3DHc0OoCFooexcDw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.0.5.tgz}
-    id: registry.npmmirror.com/vxe-table-plugin-export-xlsx/3.0.5
+  registry.npmmirror.com/vxe-table-plugin-export-xlsx@3.1.0(vxe-table@4.5.14):
+    resolution: {integrity: sha512-ieEsN6h+QaKHgwQ6k1MtjvW17T+FCS9Bw2Xhg67HKIbuLMS+SprcF+EBrMtHIOfzQ2i41KAoLsCvXRbd5uChAA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-3.1.0.tgz}
+    id: registry.npmmirror.com/vxe-table-plugin-export-xlsx/3.1.0
     name: vxe-table-plugin-export-xlsx
-    version: 3.0.5
+    version: 3.1.0
     peerDependencies:
-      vxe-table: ^4.0.27
+      vxe-table: ^4.5.0
     dependencies:
-      vxe-table: registry.npmmirror.com/vxe-table@4.5.8(vue@3.3.4)(xe-utils@3.5.12)
+      vxe-table: registry.npmmirror.com/vxe-table@4.5.14(vue@3.3.4)(xe-utils@3.5.12)
     dev: false
 
-  registry.npmmirror.com/vxe-table@4.5.8(vue@3.3.4)(xe-utils@3.5.12):
-    resolution: {integrity: sha512-phfQ2C2/7b940VYYPQNDPKyJmKoAdB21U89kxmmAuUUWpuKMojzvB+3+Vd6LKrdyBqY6C0z0BCJcPIjTayEMmg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vxe-table/-/vxe-table-4.5.8.tgz}
-    id: registry.npmmirror.com/vxe-table/4.5.8
+  registry.npmmirror.com/vxe-table@4.5.14(vue@3.3.4)(xe-utils@3.5.12):
+    resolution: {integrity: sha512-S+6pAYQsoY5DZj9qLXQLDKcA/+AO5CSrs9tGn+/By8WxYWJNLw3i5cjbXsriUaJeuj8Qi1aYfdhrNfeMCwE9Iw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vxe-table/-/vxe-table-4.5.14.tgz}
+    id: registry.npmmirror.com/vxe-table/4.5.14
     name: vxe-table
-    version: 4.5.8
+    version: 4.5.14
     peerDependencies:
       vue: ^3.2.28
       xe-utils: ^3.5.0
     dependencies:
-      dom-zindex: registry.npmmirror.com/dom-zindex@1.0.0
+      dom-zindex: registry.npmmirror.com/dom-zindex@1.0.1
       vue: 3.3.4
       xe-utils: registry.npmmirror.com/xe-utils@3.5.12
     dev: false
diff --git a/web/src/api/financial/model/advanceModel.ts b/web/src/api/financial/model/advanceModel.ts
index 8129629c..871e6410 100644
--- a/web/src/api/financial/model/advanceModel.ts
+++ b/web/src/api/financial/model/advanceModel.ts
@@ -7,7 +7,7 @@ export interface FileData {
     fileSize: number;
 }
 
-interface AdvanceChargeData {
+export interface AdvanceChargeData {
     accountId: number | string;
     accountName: string;
     amount: number;
diff --git a/web/src/components/SimpleMenu/src/SimpleSubMenu.vue b/web/src/components/SimpleMenu/src/SimpleSubMenu.vue
index 068d0c21..1accfc7f 100644
--- a/web/src/components/SimpleMenu/src/SimpleSubMenu.vue
+++ b/web/src/components/SimpleMenu/src/SimpleSubMenu.vue
@@ -54,10 +54,12 @@
   import SubMenu from './components/SubMenuItem.vue';
   import { propTypes } from '/@/utils/propTypes';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import SimpleMenuTag from "@/components/SimpleMenu/src/SimpleMenuTag.vue";
 
   export default defineComponent({
     name: 'SimpleSubMenu',
     components: {
+      SimpleMenuTag,
       SubMenu,
       MenuItem,
       Icon,
diff --git a/web/src/layouts/default/header/components/user-dropdown/index.vue b/web/src/layouts/default/header/components/user-dropdown/index.vue
index d46a5293..11f93183 100644
--- a/web/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/web/src/layouts/default/header/components/user-dropdown/index.vue
@@ -38,7 +38,6 @@
     </template>
   </Dropdown>
   <LockAction @register="register" />
-  <AccountSetting/>
 </template>
 <script lang="ts">
   // components
diff --git a/web/src/views/basic/income-expense/components/AddEditModal.vue b/web/src/views/basic/income-expense/components/AddEditModal.vue
index 34a21a98..b6d75b0d 100644
--- a/web/src/views/basic/income-expense/components/AddEditModal.vue
+++ b/web/src/views/basic/income-expense/components/AddEditModal.vue
@@ -15,7 +15,7 @@ import { addOrUpdateIncomeExpense } from '@/api/basic/incomeExpense';
 const rowId = ref('');
 const isUpdate = ref(true);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增收支项目' : '编辑收支项目'));
-const emitSuccess = defineEmits(['success']);
+const emitSuccess = defineEmits(['success', 'register']);
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
diff --git a/web/src/views/basic/member/components/MemberModal.vue b/web/src/views/basic/member/components/MemberModal.vue
index f33d8872..18a4cad9 100644
--- a/web/src/views/basic/member/components/MemberModal.vue
+++ b/web/src/views/basic/member/components/MemberModal.vue
@@ -15,7 +15,7 @@ import { addOrUpdateMember } from '@/api/basic/member';
   const rowId = ref('');
   const isUpdate = ref(true);
   const getTitle = computed(() => (!unref(isUpdate) ? '新增会员信息' : '编辑会员信息'));
-  const emitSuccess = defineEmits(['success']);
+  const emitSuccess = defineEmits(['success','register']);
 
   const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
     labelWidth: 100,
diff --git a/web/src/views/basic/operator/components/OperatorModal.vue b/web/src/views/basic/operator/components/OperatorModal.vue
index 39460398..2293a07c 100644
--- a/web/src/views/basic/operator/components/OperatorModal.vue
+++ b/web/src/views/basic/operator/components/OperatorModal.vue
@@ -15,7 +15,7 @@ import { addOrUpdateOperator } from '@/api/basic/operator';
 const rowId = ref('');
 const isUpdate = ref(true);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增操作员' : '编辑操作员'));
-const emitSuccess = defineEmits(['success']);
+const emitSuccess = defineEmits(['success', 'register']);
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
diff --git a/web/src/views/basic/settlement-account/components/FinancialAccountModal.vue b/web/src/views/basic/settlement-account/components/FinancialAccountModal.vue
index 079f893c..d2d11262 100644
--- a/web/src/views/basic/settlement-account/components/FinancialAccountModal.vue
+++ b/web/src/views/basic/settlement-account/components/FinancialAccountModal.vue
@@ -15,7 +15,7 @@ import { addOrUpdateAccount } from '@/api/financial/account';
 const rowId = ref('');
 const isUpdate = ref(true);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增结算账户' : '编辑结算账户'));
-const emitSuccess = defineEmits(['success']);
+const emitSuccess = defineEmits(['success','register']);
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
diff --git a/web/src/views/basic/warehouse/components/WarehouseModal.vue b/web/src/views/basic/warehouse/components/WarehouseModal.vue
index ce6c7bba..371e1bc9 100644
--- a/web/src/views/basic/warehouse/components/WarehouseModal.vue
+++ b/web/src/views/basic/warehouse/components/WarehouseModal.vue
@@ -15,7 +15,7 @@ import { addOrUpdateWarehouse } from '@/api/basic/warehouse';
 const rowId = ref('');
 const isUpdate = ref(true);
 const getTitle = computed(() => (!unref(isUpdate) ? '新增仓库' : '编辑仓库'));
-const emitSuccess = defineEmits(['success']);
+const emitSuccess = defineEmits(['success', 'register']);
 
 const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
   labelWidth: 100,
diff --git a/web/src/views/financial/advance-charge/advance.data.ts b/web/src/views/financial/advance-charge/advance.data.ts
index 0a243dd9..3f63d828 100644
--- a/web/src/views/financial/advance-charge/advance.data.ts
+++ b/web/src/views/financial/advance-charge/advance.data.ts
@@ -143,7 +143,7 @@ export const tableColumns = [
 ]
 
 interface FormState {
-    id: string;
+    id: string | undefined;
     memberId: string;
     receiptNumber: string;
     financialPersonnelId: string;
diff --git a/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue b/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue
index 9654bc08..44594392 100644
--- a/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue
+++ b/web/src/views/financial/advance-charge/components/AdvanceChargeModal.vue
@@ -5,7 +5,7 @@
       :confirm-loading="confirmLoading"
       v-bind:prefixNo="prefixNo"
       :id="prefixNo"
-      :keyboard="false"
+      :keyboard="true"
       :forceRender="true"
       switchHelp
       switchFullscreen
@@ -39,7 +39,7 @@
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="单据编号" data-step="2"
                          data-title="单据编号">
-              <a-input placeholder="请输入单据编号" v-model:value="formState.receiptNumber" :readOnly="true"/>
+              <a-input placeholder="请输入单据编号" v-model:value="formState.receiptNumber" readOnly/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -78,7 +78,7 @@
                     v-model:value="editableData[record.key][column.key]"
                     style="width: 100%"
                     placeholder="请选择账户名称"
-                    @change="handleAccountChange(record.key, column.key, $event)">
+                    @change="handleAccountChange(record.key, column.key, $event)" >
                   <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                     {{ item.accountName }}
                   </a-select-option>
@@ -87,7 +87,7 @@
               <template v-else>
                 <template v-if="column.key !== 'accountId'">
                   <a-input v-model:value="editableData[record.key][column.key]"
-                           :placeholder="`请输入${getColumnTitle(column)}`" @change="valueChange"/>
+                           :placeholder="`请输入${getColumnTitle(column)}`" @change="valueChange" :rules="[{ required: true}]"/>
                 </template>
                 <template v-else>
                   {{ record[column.key] }}
@@ -177,6 +177,10 @@ import {AccountResp} from "@/api/financial/model/accountModel";
 import {useMessage} from "@/hooks/web/useMessage";
 import {addOrUpdateAdvance, getAdvanceDetail} from "@/api/financial/advance";
 import {AddOrUpdateAdvanceReq, AdvanceChargeData} from "@/api/financial/model/advanceModel";
+import weekday from "dayjs/plugin/weekday";
+import localeData from "dayjs/plugin/localeData";
+dayjs.extend(weekday);
+dayjs.extend(localeData);
 dayjs.locale('zh-cn');
 export default defineComponent({
   name: 'AdvanceChargeModal',
@@ -241,7 +245,6 @@ export default defineComponent({
     const totalPrice = ref<number>(0.00);
 
     function handleCancelModal() {
-      close();
       open.value = false;
       context.emit('cancel');
       clearData();
@@ -340,17 +343,30 @@ export default defineComponent({
 
     async function handleOk(review: number) {
       if (!formState.memberId) {
-        createMessage.error('请选择付款会员');
+        createMessage.warn('请选择付款会员');
         return;
       }
       if (!formState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (tableData.value.length === 0) {
-        createMessage.error('请插入一行数据，录入收预付款信息');
+        createMessage.warn('请插入一行数据，录入收预付款信息');
         return;
       }
+      console.info(editableData)
+      for (const key in editableData) {
+        console.info(editableData[key])
+        if (!editableData[key].accountId) {
+          createMessage.warn('请选择账户名称');
+          return;
+        }
+        if (!editableData[key].amount) {
+          createMessage.warn('请输入金额');
+          return;
+        }
+      }
+
 
       const files = [];
       if (fileList && fileList.value) {
@@ -397,6 +413,7 @@ export default defineComponent({
 
     const clearData = () => {
       formRef.value.resetFields();
+      formState.id = undefined;
       formState.receiptNumber = '';
       formState.receiptDate = undefined;
       formState.memberId = '';
@@ -407,6 +424,9 @@ export default defineComponent({
       tableData.value = [];
       fileList.value = [];
       totalPrice.value = 0.00;
+      for (const key in editableData) {
+        delete editableData[key];
+      }
     };
 
     const editableData = reactive({});
@@ -477,7 +497,7 @@ export default defineComponent({
     function beforeUpload(file: any) {
       const isLt2M = file.size / 1024 / 1024 < 2;
       if (!isLt2M) {
-        createMessage.error(`${file.name}，该文件超过2MB大小限制`);
+        createMessage.warn(`${file.name}，该文件超过2MB大小限制`);
         return isLt2M || Upload.LIST_IGNORE
       }
     }
diff --git a/web/src/views/financial/collection/addEditCollection.data.ts b/web/src/views/financial/collection/addEditCollection.data.ts
index 2494ad88..f9949387 100644
--- a/web/src/views/financial/collection/addEditCollection.data.ts
+++ b/web/src/views/financial/collection/addEditCollection.data.ts
@@ -60,15 +60,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true,
         zoom: true,
         custom: true
     },
-    proxyConfig: {
-        sort: false,
-        filter: false,
-        form: true,
-    },
     columns: [
         { type: 'checkbox', field:'id', title: 'ID', width: 180},
         {   field: 'saleReceiptNumber',
diff --git a/web/src/views/financial/collection/components/AddEditCollectionModal.vue b/web/src/views/financial/collection/components/AddEditCollectionModal.vue
index ce1faf3c..b3799581 100644
--- a/web/src/views/financial/collection/components/AddEditCollectionModal.vue
+++ b/web/src/views/financial/collection/components/AddEditCollectionModal.vue
@@ -164,7 +164,7 @@ import {
   Tabs,
   Tooltip,
   TreeSelect,
-  Upload,
+  Upload, Divider,
 } from "ant-design-vue";
 import {
   collectionFormState,
@@ -193,7 +193,7 @@ import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import {AccountResp} from "@/api/financial/model/accountModel";
 import {CustomerResp} from "@/api/basic/model/customerModel";
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -203,7 +203,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 dayjs.extend(weekday);
 dayjs.extend(localeData);
 dayjs.locale('zh-cn');
@@ -243,6 +243,7 @@ export default defineComponent({
     'vxe-button': VxeButton,
     'plus-outlined': PlusOutlined,
     'upload-outlined': UploadOutlined,
+    'a-divider': Divider,
   },
   setup(_, context) {
     const [operatorModal, {openModal}] = useModal();
@@ -271,7 +272,6 @@ export default defineComponent({
     const customerList = ref<CustomerResp[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -291,6 +291,10 @@ export default defineComponent({
         loadGenerateId();
         collectionFormState.receiptDate = dayjs(new Date());
         disabledStatus.value = false
+        const table = xGrid.value
+        if(table) {
+          table.remove()
+        }
       }
     }
 
@@ -375,26 +379,26 @@ export default defineComponent({
 
     async function handleOk(type: number) {
       if (!collectionFormState.customerId) {
-        createMessage.error('请选择客户');
+        createMessage.warn('请选择客户');
         return;
       }
       if (!collectionFormState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (!collectionFormState.collectionAccountId) {
-        createMessage.error('请选择收款账户');
+        createMessage.warn('请选择收款账户');
         return;
       }
       if (collectionFormState.discountAmount === undefined) {
-        createMessage.error('请输入优惠金额');
+        createMessage.warn('请输入优惠金额');
         return;
       }
       const table = xGrid.value
       if(table) {
         const insertRecords = table.getInsertRecords()
         if(insertRecords.length === 0) {
-          createMessage.error("请添加一行数据")
+          createMessage.warn("请选择客户单据")
           return;
         }
       }
@@ -504,7 +508,7 @@ export default defineComponent({
 
     function chooseReceipt() {
       if (!collectionFormState.customerId) {
-        createMessage.error('请先选择客户');
+        createMessage.warn('请先选择客户');
         return;
       }
       openSaleArrearsModal(true, {
diff --git a/web/src/views/financial/collection/components/SaleArrearsModal.vue b/web/src/views/financial/collection/components/SaleArrearsModal.vue
index 179a5511..6a5fec0d 100644
--- a/web/src/views/financial/collection/components/SaleArrearsModal.vue
+++ b/web/src/views/financial/collection/components/SaleArrearsModal.vue
@@ -24,14 +24,14 @@ import ViewSaleShipmentsModal from "@/views/sales/shipments/components/ViewSaleS
 export default defineComponent({
   name: 'SaleArrearsModal',
   components: {ViewSaleShipmentsModal, ViewSaleRefundModal, BasicModal, BasicTable, TableAction},
-  emits: ['selectedRows'],
+  emits: ['handleReceiptSuccess', 'register'],
   setup(_, context) {
     const [handleSaleShipmentsModal, {openModal: openSaleShipmentsModal}] = useModal();
     const [handleSaleRefundModal, {openModal: openSaleRefundModal}] = useModal();
     const getTitle = ref('选择销售欠款单据');
     const { createMessage } = useMessage();
     const customerId = ref('');
-    const [registerTable, { getSelectRows, reload}] = useTable({
+    const [registerTable, { getSelectRows}] = useTable({
       rowKey: 'id',
       columns: saleArrearsReceiptTableColumns,
       api: getArrearsPageList,
diff --git a/web/src/views/financial/expense/addEditExpense.data.ts b/web/src/views/financial/expense/addEditExpense.data.ts
index 638b9166..03e4bce6 100644
--- a/web/src/views/financial/expense/addEditExpense.data.ts
+++ b/web/src/views/financial/expense/addEditExpense.data.ts
@@ -56,16 +56,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true, // 显示导出按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-    },
     columns: [
         { type: 'checkbox', field:'id', title: 'ID', width: 180},
         {   field: 'incomeExpenseId',
@@ -105,6 +98,14 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         highlight: true,
         range: true
     },
+    editRules: {
+        incomeExpenseId: [
+            { required: true, message: '支出项目不能为空' }
+        ],
+        incomeExpenseAmount: [
+            { required: true, message: '支出金额不能为空' }
+        ]
+    },
     editConfig: {
         trigger: 'click',
         mode: 'row',
diff --git a/web/src/views/financial/expense/components/AddEditExpenseModal.vue b/web/src/views/financial/expense/components/AddEditExpenseModal.vue
index de75a202..e4c300a0 100644
--- a/web/src/views/financial/expense/components/AddEditExpenseModal.vue
+++ b/web/src/views/financial/expense/components/AddEditExpenseModal.vue
@@ -159,7 +159,7 @@ import {
   Tabs,
   Tooltip,
   TreeSelect,
-  Upload,
+  Upload, Divider,
 } from "ant-design-vue";
 import {
   expenseFormState,
@@ -186,7 +186,7 @@ import {AddOrUpdateExpenseReq} from "@/api/financial/model/expenseModel";
 import OperatorModal from "@/views/basic/operator/components/OperatorModal.vue";
 import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -196,7 +196,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 dayjs.extend(weekday);
 dayjs.extend(localeData);
 dayjs.locale('zh-cn');
@@ -235,6 +235,7 @@ export default defineComponent({
     'vxe-button': VxeButton,
     'plus-outlined': PlusOutlined,
     'upload-outlined': UploadOutlined,
+    'a-divider': Divider,
   },
   setup(_, context) {
     const [operatorModal, {openModal}] = useModal();
@@ -262,7 +263,6 @@ export default defineComponent({
     const accountList = ref<AccountResp[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -281,6 +281,7 @@ export default defineComponent({
         title.value = '新增-支出单'
         loadGenerateId();
         expenseFormState.receiptDate = dayjs(new Date());
+        addRowData()
       }
     }
 
@@ -365,26 +366,38 @@ export default defineComponent({
 
     async function handleOk(type: number) {
       if (!expenseFormState.relatedPersonId) {
-        createMessage.error('请选择往来单位');
+        createMessage.warn('请选择往来单位');
         return;
       }
       if (!expenseFormState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (!expenseFormState.expenseAccountId) {
-        createMessage.error('请选择支出账户');
+        createMessage.warn('请选择支出账户');
         return;
       }
       if (!expenseFormState.expenseAmount) {
-        createMessage.error('请输入支出金额');
+        createMessage.warn('请输入支出金额');
         return;
       }
       const table = xGrid.value
       if(table) {
         const insertRecords = table.getInsertRecords()
         if(insertRecords.length === 0) {
-          createMessage.error("请添加一行数据")
+          createMessage.warn("请添加一行数据")
+          return;
+        }
+
+        const isIncomeExpenseIdEmpty = insertRecords.some(item => !item.incomeExpenseId)
+        if(isIncomeExpenseIdEmpty) {
+          createMessage.warn("请选择支出项目")
+          return;
+        }
+
+        const isIncomeExpenseAmount = insertRecords.some(item => !item.incomeExpenseAmount)
+        if(isIncomeExpenseAmount) {
+          createMessage.warn("请输入支出金额")
           return;
         }
       }
diff --git a/web/src/views/financial/income/addEditIncome.data.ts b/web/src/views/financial/income/addEditIncome.data.ts
index 6e63765b..afaca6f3 100644
--- a/web/src/views/financial/income/addEditIncome.data.ts
+++ b/web/src/views/financial/income/addEditIncome.data.ts
@@ -56,16 +56,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true, // 显示导出按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-    },
     columns: [
         { type: 'checkbox', field:'id', title: 'ID', width: 180},
         {   field: 'incomeExpenseId',
@@ -99,6 +92,14 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
+    editRules: {
+        incomeExpenseId: [
+            { required: true, message: '收入项目不能为空' }
+        ],
+        incomeExpenseAmount: [
+            { required: true, message: '收入金额不能为空' }
+        ]
+    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
diff --git a/web/src/views/financial/income/components/AddEditIncomeModal.vue b/web/src/views/financial/income/components/AddEditIncomeModal.vue
index d1c20c95..e9b55e59 100644
--- a/web/src/views/financial/income/components/AddEditIncomeModal.vue
+++ b/web/src/views/financial/income/components/AddEditIncomeModal.vue
@@ -159,7 +159,7 @@ import {
   Tabs,
   Tooltip,
   TreeSelect,
-  Upload,
+  Upload, Divider,
 } from "ant-design-vue";
 import {
   incomeFormState,
@@ -182,12 +182,12 @@ import {getRelatedPerson} from "@/api/report/report";
 import {getIncomeExpenseList} from "@/api/basic/incomeExpense";
 import {AccountResp} from "@/api/financial/model/accountModel";
 import XEUtils from "xe-utils";
-import {AddOrUpdateIncomeReq, IncomeData} from "@/api/financial/model/incomeModel";
+import {AddOrUpdateIncomeReq} from "@/api/financial/model/incomeModel";
 import OperatorModal from "@/views/basic/operator/components/OperatorModal.vue";
 import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import incomeExpense from "@/views/basic/income-expense/index.vue";
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -197,7 +197,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 dayjs.extend(weekday);
 dayjs.extend(localeData);
 dayjs.locale('zh-cn');
@@ -241,6 +241,7 @@ export default defineComponent({
     'vxe-button': VxeButton,
     'plus-outlined': PlusOutlined,
     'upload-outlined': UploadOutlined,
+    'a-divider': Divider,
   },
   setup(_, context) {
     const [operatorModal, {openModal}] = useModal();
@@ -268,7 +269,6 @@ export default defineComponent({
     const accountList = ref<AccountResp[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -287,6 +287,7 @@ export default defineComponent({
         title.value = '新增-收入单'
         loadGenerateId();
         incomeFormState.receiptDate = dayjs(new Date());
+        addRowData()
       }
     }
 
@@ -371,26 +372,38 @@ export default defineComponent({
 
     async function handleOk(type: number) {
       if (!incomeFormState.relatedPersonId) {
-        createMessage.error('请选择往来单位');
+        createMessage.warn('请选择往来单位');
         return;
       }
       if (!incomeFormState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (!incomeFormState.incomeAccountId) {
-        createMessage.error('请选择收入账户');
+        createMessage.warn('请选择收入账户');
         return;
       }
       if (!incomeFormState.incomeAmount) {
-        createMessage.error('请输入收入金额');
+        createMessage.warn('请输入收入金额');
         return;
       }
       const table = xGrid.value
       if(table) {
         const insertRecords = table.getInsertRecords()
         if(insertRecords.length === 0) {
-          createMessage.error("请添加一行数据")
+          createMessage.warn("请添加一行数据")
+          return;
+        }
+
+        const isIncomeExpenseIdEmpty = insertRecords.some(item => !item.incomeExpenseId)
+        if(isIncomeExpenseIdEmpty) {
+          createMessage.warn("请选择收入项目")
+          return;
+        }
+
+        const isIncomeExpenseAmount = insertRecords.some(item => !item.incomeExpenseAmount)
+        if(isIncomeExpenseAmount) {
+          createMessage.warn("请输入收入金额")
           return;
         }
       }
diff --git a/web/src/views/financial/payment/addEditPayment.data.ts b/web/src/views/financial/payment/addEditPayment.data.ts
index 748af8d4..8a45776e 100644
--- a/web/src/views/financial/payment/addEditPayment.data.ts
+++ b/web/src/views/financial/payment/addEditPayment.data.ts
@@ -60,15 +60,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true,
         zoom: true,
         custom: true
     },
-    proxyConfig: {
-        sort: false,
-        filter: false,
-        form: true,
-    },
     columns: [
         { type: 'checkbox', field:'id', title: 'ID', width: 180},
         {   field: 'purchaseReceiptNumber',
diff --git a/web/src/views/financial/payment/components/AddEditPaymentModal.vue b/web/src/views/financial/payment/components/AddEditPaymentModal.vue
index 224ab0b3..259adc95 100644
--- a/web/src/views/financial/payment/components/AddEditPaymentModal.vue
+++ b/web/src/views/financial/payment/components/AddEditPaymentModal.vue
@@ -164,7 +164,7 @@ import {
   Tabs,
   Tooltip,
   TreeSelect,
-  Upload,
+  Upload, Divider,
 } from "ant-design-vue";
 import {
   paymentFormState,
@@ -193,7 +193,7 @@ import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import {AccountResp} from "@/api/financial/model/accountModel";
 import {SupplierResp} from "@/api/basic/model/supplierModel";
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -203,7 +203,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 dayjs.extend(weekday);
 dayjs.extend(localeData);
 dayjs.locale('zh-cn');
@@ -243,6 +243,7 @@ export default defineComponent({
     'vxe-button': VxeButton,
     'plus-outlined': PlusOutlined,
     'upload-outlined': UploadOutlined,
+    'a-divider': Divider,
   },
   setup(_, context) {
     const [operatorModal, {openModal}] = useModal();
@@ -271,7 +272,6 @@ export default defineComponent({
     const supplierList = ref<SupplierResp[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -291,6 +291,10 @@ export default defineComponent({
         loadGenerateId();
         paymentFormState.receiptDate = dayjs(new Date());
         disabledStatus.value = false
+        const table = xGrid.value
+        if(table) {
+          table.remove()
+        }
       }
     }
 
@@ -375,26 +379,26 @@ export default defineComponent({
 
     async function handleOk(type: number) {
       if (!paymentFormState.supplierId) {
-        createMessage.error('请选择供应商');
+        createMessage.warn('请选择供应商');
         return;
       }
       if (!paymentFormState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (!paymentFormState.paymentAccountId) {
-        createMessage.error('请选择付款账户');
+        createMessage.warn('请选择付款账户');
         return;
       }
       if (paymentFormState.discountAmount === undefined) {
-        createMessage.error('请输入优惠金额');
+        createMessage.warn('请输入优惠金额');
         return;
       }
       const table = xGrid.value
       if(table) {
         const insertRecords = table.getInsertRecords()
         if(insertRecords.length === 0) {
-          createMessage.error("请添加一行数据")
+          createMessage.warn("请选择供应商单据")
           return;
         }
       }
@@ -504,7 +508,7 @@ export default defineComponent({
 
     function chooseReceipt() {
       if (!paymentFormState.supplierId) {
-        createMessage.error('请先选择供应商');
+        createMessage.warn('请先选择供应商');
         return;
       }
       openPurchaseArrearsModal(true, {
diff --git a/web/src/views/financial/payment/components/PurchaseArrearsModal.vue b/web/src/views/financial/payment/components/PurchaseArrearsModal.vue
index 22b3e1bd..7acfa7aa 100644
--- a/web/src/views/financial/payment/components/PurchaseArrearsModal.vue
+++ b/web/src/views/financial/payment/components/PurchaseArrearsModal.vue
@@ -24,14 +24,14 @@ import ViewPurchaseStorageModal from "@/views/purchase/storage/components/ViewSt
 export default defineComponent({
   name: 'PurchaseArrearsModal',
   components: {ViewPurchaseStorageModal, ViewPurchaseRefundModal, BasicModal, BasicTable, TableAction},
-  emits: ['selectedRows'],
+  emits: ['handleReceiptSuccess', 'register'],
   setup(_, context) {
     const [handlePurchaseStorageModal, {openModal: openPurchaseStorageModal}] = useModal();
     const [handlePurchaseRefundModal, {openModal: openPurchaseRefundModal}] = useModal();
     const getTitle = ref('选择采购欠款单据');
     const { createMessage } = useMessage();
     const supplierId = ref('');
-    const [registerTable, { getSelectRows, reload}] = useTable({
+    const [registerTable, { getSelectRows}] = useTable({
       rowKey: 'id',
       columns: purchaseArrearsReceiptTableColumns,
       api: getArrearsPageList,
diff --git a/web/src/views/financial/transfer/addEditTransfer.data.ts b/web/src/views/financial/transfer/addEditTransfer.data.ts
index 2f0db660..7971efdd 100644
--- a/web/src/views/financial/transfer/addEditTransfer.data.ts
+++ b/web/src/views/financial/transfer/addEditTransfer.data.ts
@@ -55,16 +55,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true, // 显示导出按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-    },
     columns: [
         { type: 'checkbox', field:'id', title: 'ID', width: 180},
         {   field: 'accountId',
@@ -104,6 +97,14 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         highlight: true,
         range: true
     },
+    editRules: {
+        accountId: [
+            { required: true, message: '转账账户不能为空' }
+        ],
+        transferAmount: [
+            { required: true, message: '转账金额不能为空' }
+        ]
+    },
     editConfig: {
         trigger: 'click',
         mode: 'row',
diff --git a/web/src/views/financial/transfer/components/AddEditTransferModal.vue b/web/src/views/financial/transfer/components/AddEditTransferModal.vue
index dc996c48..e3e315a2 100644
--- a/web/src/views/financial/transfer/components/AddEditTransferModal.vue
+++ b/web/src/views/financial/transfer/components/AddEditTransferModal.vue
@@ -148,7 +148,7 @@ import {
   Tabs,
   Tooltip,
   TreeSelect,
-  Upload,
+  Upload, Divider,
 } from "ant-design-vue";
 import {
   transferFormState,
@@ -173,7 +173,7 @@ import {AddOrUpdateTransferReq} from "@/api/financial/model/transferModel";
 import OperatorModal from "@/views/basic/operator/components/OperatorModal.vue";
 import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -183,7 +183,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 dayjs.extend(weekday);
 dayjs.extend(localeData);
 dayjs.locale('zh-cn');
@@ -222,6 +222,7 @@ export default defineComponent({
     'vxe-button': VxeButton,
     'plus-outlined': PlusOutlined,
     'upload-outlined': UploadOutlined,
+    'a-divider': Divider,
   },
   setup(_, context) {
     const [operatorModal, {openModal}] = useModal();
@@ -247,7 +248,6 @@ export default defineComponent({
     const accountList = ref<AccountResp[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -264,6 +264,7 @@ export default defineComponent({
         title.value = '新增-转账单'
         loadGenerateId();
         transferFormState.receiptDate = dayjs(new Date());
+        addRowData();
       }
     }
 
@@ -335,22 +336,32 @@ export default defineComponent({
 
     async function handleOk(type: number) {
       if (!transferFormState.receiptDate) {
-        createMessage.error('请选择单据日期');
+        createMessage.warn('请选择单据日期');
         return;
       }
       if (!transferFormState.paymentAccountId) {
-        createMessage.error('请选择付款账户');
+        createMessage.warn('请选择付款账户');
         return;
       }
       if (!transferFormState.paymentAmount) {
-        createMessage.error('请输入实付金额');
+        createMessage.warn('请输入实付金额');
         return;
       }
       const table = xGrid.value
       if(table) {
         const insertRecords = table.getInsertRecords()
         if(insertRecords.length === 0) {
-          createMessage.error("请添加一行数据")
+          createMessage.warn("请添加一行数据")
+          return;
+        }
+        const isAccount = insertRecords.some(item => !item.accountId)
+        if(isAccount) {
+          createMessage.warn("请选择转账账户")
+          return;
+        }
+        const isAmount = insertRecords.some(item => !item.transferAmount)
+        if(isAmount) {
+          createMessage.warn("请输入转账金额")
           return;
         }
       }
diff --git a/web/src/views/product/info/components/BatchEditModal.vue b/web/src/views/product/info/components/BatchEditModal.vue
index ca4b39a1..c8aad630 100644
--- a/web/src/views/product/info/components/BatchEditModal.vue
+++ b/web/src/views/product/info/components/BatchEditModal.vue
@@ -64,11 +64,11 @@
 <script lang="ts">
 import { ref, reactive } from 'vue';
 import {
-  Button,
+  Button, Col,
   Form,
   FormItem,
   InputNumber,
-  Modal, Popconfirm,
+  Modal, Row,
   Select,
   SelectOption,
   Spin,
@@ -78,10 +78,10 @@ import {
 import {getCategoryList} from "/@/api/product/productCategory"
 import {UpdateBatchProductInfoReq} from "/@/api/product/model/productModel"
 import {updateBatchProductInfo} from "/@/api/product/product"
-import {useMessage} from "@/hooks/web/useMessage";
 
 export default {
   name: 'BatchEditModal',
+  emits: ['success'],
   components: {
     'a-modal': Modal,
     'a-button': Button,
@@ -93,22 +93,22 @@ export default {
     'a-select': Select,
     'a-select-option': SelectOption,
     'a-tree-select': TreeSelect,
-    'a-popconfirm': Popconfirm,
+    'a-row': Row,
+    'a-col': Col,
   },
   setup(_, context) {
     const title = ref('批量编辑商品信息');
     const openBatchEditModal = ref(false);
 
-    const color = ref(null);
-    const weight = ref(null);
-    const expiryNum = ref(null);
-    const categoryId = ref(null);
-    const enableSerialNumber = ref(null);
-    const enableBatchNumber = ref(null);
-    const remark = ref(null);
+    const color = ref('');
+    const weight = ref(0);
+    const expiryNum = ref(0);
+    const categoryId = ref(0);
+    const enableSerialNumber = ref('');
+    const enableBatchNumber = ref('');
+    const remark = ref('');
     const categoryTree = reactive([]);
     const productIds = ref([])
-    const {createMessage} = useMessage();
 
     const confirmLoading = ref(false);
     const formRef = ref();
diff --git a/web/src/views/product/info/components/BatchSetPriceModal.vue b/web/src/views/product/info/components/BatchSetPriceModal.vue
index ea8c5dcb..171d6927 100644
--- a/web/src/views/product/info/components/BatchSetPriceModal.vue
+++ b/web/src/views/product/info/components/BatchSetPriceModal.vue
@@ -25,6 +25,7 @@ import {Rule} from 'ant-design-vue/es/form';
 
 export default {
   name: 'BatchSetPriceModal',
+  emits: ['ok'],
   components: {
     'a-modal': Modal,
     'a-button': Button,
@@ -37,7 +38,7 @@ export default {
     const title = ref('批量设置');
     const openPriceModal = ref(false);
     const isReadOnly = ref(false);
-    const batchPrice = ref('');
+    const batchPrice = ref(0);
     const batchType = ref('');
     const model = reactive({});
     const labelCol = {
@@ -71,7 +72,7 @@ export default {
       }
     };
 
-    const edit = (record) => {
+    const edit = () => {
       openPriceModal.value = true
     };
 
@@ -82,12 +83,12 @@ export default {
     const handleOk = () => {
       const price = batchPrice.value
       context.emit('ok', price, batchType.value);
-      batchPrice.value = null;
+      batchPrice.value = 0;
       close();
     };
 
     const handleCancel = () => {
-      batchPrice.value = null;
+      batchPrice.value = 0;
       close();
     };
 
diff --git a/web/src/views/product/info/components/BatchSetStockModal.vue b/web/src/views/product/info/components/BatchSetStockModal.vue
index 1bcaad4b..2ee2ef03 100644
--- a/web/src/views/product/info/components/BatchSetStockModal.vue
+++ b/web/src/views/product/info/components/BatchSetStockModal.vue
@@ -18,11 +18,12 @@
 </template>
 
 <script lang="ts">
-import { ref, reactive, UnwrapRef } from 'vue';
+import { ref, reactive} from 'vue';
 import {Button, Form, FormItem, InputNumber, Modal, Spin} from "ant-design-vue";
 
 export default {
   name: 'BatchSetStockModal',
+  emits: ['ok'],
   components: {
     'a-modal': Modal,
     'a-button': Button,
@@ -35,7 +36,7 @@ export default {
     const title = ref('批量设置');
     const openStockModal = ref(false);
     const isReadOnly = ref(false);
-    const batchNumber = ref('');
+    const batchNumber = ref(0);
     const batchType = ref('');
     const model = reactive({});
     const labelCol = {
@@ -72,12 +73,12 @@ export default {
     const handleOk = () => {
       const stockNumber = batchNumber.value
       context.emit('ok', stockNumber, batchType.value);
-      batchNumber.value = null;
+      batchNumber.value = 0;
       close();
     };
 
     const handleCancel = () => {
-      batchNumber.value = null;
+      batchNumber.value = 0;
       close();
     };
 
diff --git a/web/src/views/product/info/components/ProductInfoModal.vue b/web/src/views/product/info/components/ProductInfoModal.vue
index 5eef9496..48c34ad8 100644
--- a/web/src/views/product/info/components/ProductInfoModal.vue
+++ b/web/src/views/product/info/components/ProductInfoModal.vue
@@ -363,6 +363,8 @@ import {
   Tooltip,
   TreeSelect,
   Upload,
+  Tag,
+  Divider,
   UploadChangeParam,
 } from "ant-design-vue";
 import {cloneDeep} from 'lodash-es';
@@ -370,7 +372,7 @@ import {getUnitList} from "/@/api/product/productUnit";
 import {getCategoryList} from "/@/api/product/productCategory";
 import {ProductUnitQueryReq} from "/@/api/product/model/productUnitModel";
 import {DefaultOptionType} from "ant-design-vue/es/vc-tree-select/TreeSelect";
-import {getProductCode, getProductInfoDetail, addOrUpdateProduct} from "@/api/product/product";
+import {getProductInfoDetail, addOrUpdateProduct} from "@/api/product/product";
 import {getAttributeById, getAttributeList} from "@/api/product/productAttribute";
 import {useMessage} from "@/hooks/web/useMessage";
 import BatchSetPriceModal from "@/views/product/info/components/BatchSetPriceModal.vue";
@@ -386,7 +388,7 @@ import {ProductAttributeListReq} from "@/api/product/model/productAttributeModel
 import {ProductAttributeModel, ProductStockModel, Unit} from "@/views/product/info/model/productInfoModel";
 import {meTable, stock, productInfo, formState} from "@/views/product/info/info.data";
 
-const VNodes = {
+const VNodes = defineComponent({
   props: {
     vnodes: {
       type: Object,
@@ -396,7 +398,7 @@ const VNodes = {
   render() {
     return this.vnodes;
   },
-};
+});
 
 export default defineComponent({
   name: 'ProductInfoModal',
@@ -423,6 +425,8 @@ export default defineComponent({
     'v-nodes': VNodes,
     'a-textarea': Textarea,
     'plus-outlined': PlusOutlined,
+    'a-divider': Divider,
+    'a-tag': Tag,
     BatchSetPriceModal,
     BatchSetStockModal,
     UnitModal,
@@ -454,8 +458,8 @@ export default defineComponent({
     const skuTwo = reactive([]);
     const skuThree = reactive([]);
 
-    const priceModalForm = ref<BatchSetPriceModal>();
-    const stockModalForm = ref<BatchSetStockModal>();
+    const priceModalForm = ref<any>();
+    const stockModalForm = ref<any>();
     const [registerModal, {openModal}] = useModal();
 
     const model = ref({});
@@ -477,7 +481,6 @@ export default defineComponent({
     }
 
     function handleCancel() {
-      close();
       if (formState.productId) {
         clearData()
       }
@@ -1029,11 +1032,11 @@ export default defineComponent({
           file.type === "image/bmp";
       const isLt2M = file.size / 1024 / 1024 < 2;
       if (!isPNG) {
-        createMessage.error(`${file.name}，该文件不是图片类型`);
+        createMessage.warn(`${file.name}，该文件不是图片类型`);
         return isPNG || Upload.LIST_IGNORE
       }
       if (!isLt2M) {
-        createMessage.error(`${file.name}，该文件超过2MB大小限制`);
+        createMessage.warn(`${file.name}，该文件超过2MB大小限制`);
         return isLt2M || Upload.LIST_IGNORE
       }
     }
@@ -1116,20 +1119,20 @@ export default defineComponent({
 
     async function handleOk() {
       if (!formState.productName) {
-        createMessage.error('请输入商品名称');
+        createMessage.warn('请输入商品名称');
         return;
       }
       if (unitChecked.value) {
         if (!formState.productUnitId) {
-          createMessage.error('请选择商品单位');
+          createMessage.warn('请选择商品单位');
           return;
         }
       } else if (!formState.productUnit) {
-        createMessage.error('请输入商品单位');
+        createMessage.warn('请输入商品单位');
         return;
       }
       if (meTable.dataSource.length === 0) {
-        createMessage.error('请插入一行数据，录入商品条码价格信息');
+        createMessage.warn('请插入一行数据，录入商品条码价格信息');
         return;
       }
       // 检查库存信息是否为空
diff --git a/web/src/views/product/info/components/SelectProductModal.vue b/web/src/views/product/info/components/SelectProductModal.vue
index 5c926e5a..5c22d4ec 100644
--- a/web/src/views/product/info/components/SelectProductModal.vue
+++ b/web/src/views/product/info/components/SelectProductModal.vue
@@ -14,7 +14,7 @@ import {BasicModal, useModalInner} from "@/components/Modal";
 export default defineComponent({
   name: 'productModal',
   components: {BasicModal, BasicTable, TableAction},
-  emits: ['selectedRows'],
+  emits: ['register', 'handleCheckSuccess'],
   setup(_, context) {
     const getTitle = ref('选择商品');
     const { createMessage } = useMessage();
diff --git a/web/src/views/purchase/model/addEditModel.ts b/web/src/views/purchase/model/addEditModel.ts
index 7bde7d16..0bf30bd7 100644
--- a/web/src/views/purchase/model/addEditModel.ts
+++ b/web/src/views/purchase/model/addEditModel.ts
@@ -127,29 +127,16 @@ const orderGridOptions = reactive<VxeGridProps<RowVO>>({
             buttons: 'toolbar_buttons'
         },
         refresh: true, // 显示刷新按钮
-        export: true, // 显示导出按钮
         print: true, // 显示打印按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-        props: {
-            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
-            result: 'result', // 配置响应结果列表字段
-            total: 'page.total' // 配置响应结果总页数字段
-        },
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {   field: 'barCode',
             width:160,
             title: '条码',
             slots: { edit: 'barCode_edit' },
-            sortable: true,
             titlePrefix: { content: '输入条码商品信息自动带出！' },
             editRender: { name: 'input', attrs: { placeholder: '请输入条码并回车' } }
         },
@@ -222,11 +209,6 @@ const orderGridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
-    exportConfig: {
-        remote: true,
-        types: ['xlsx'],
-        modes: ['current', 'selected', 'all'],
-    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
@@ -296,35 +278,23 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             buttons: 'toolbar_buttons'
         },
         refresh: true, // 显示刷新按钮
-        export: true, // 显示导出按钮
         print: true, // 显示打印按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-        props: {
-            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
-            result: 'result', // 配置响应结果列表字段
-            total: 'page.total' // 配置响应结果总页数字段
-        },
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {
             field: 'warehouseId',
             title: '仓库',
             width: 130,
-            editRender: { name: '$select', options: [], props: { placeholder: '请选择仓库' } }
+            slots: { edit: 'warehouse_edit', default: 'warehouse_default'},
+            editRender: { name: 'input', attrs: { placeholder: '请选择仓库' } }
         },
         {   field: 'barCode',
             width:160,
             title: '条码',
             slots: { edit: 'barCode_edit' },
-            sortable: true,
             titlePrefix: { content: '输入条码商品信息自动带出！' },
             editRender: { name: 'input', attrs: { placeholder: '请输入条码并回车' } }
         },
@@ -397,11 +367,6 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
-    exportConfig: {
-        remote: true,
-        types: ['xlsx'],
-        modes: ['current', 'selected', 'all'],
-    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
diff --git a/web/src/views/purchase/order/components/AddEditModal.vue b/web/src/views/purchase/order/components/AddEditModal.vue
index 4b977de1..54490dac 100644
--- a/web/src/views/purchase/order/components/AddEditModal.vue
+++ b/web/src/views/purchase/order/components/AddEditModal.vue
@@ -49,7 +49,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="单据编号" data-step="2"
                          data-title="单据编号"
                          data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号">
-              <a-input placeholder="请输入单据编号" v-model:value="purchaseOrderFormState.receiptNumber" :readOnly="true"/>
+              <a-input placeholder="请输入单据编号" v-model:value="purchaseOrderFormState.receiptNumber" readOnly/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -317,7 +317,6 @@ export default defineComponent({
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -336,6 +335,7 @@ export default defineComponent({
         title.value = '新增-采购订单'
         loadGenerateId();
         purchaseOrderFormState.receiptDate = dayjs(new Date());
+        addRowData();
       }
     }
 
diff --git a/web/src/views/purchase/refund/components/AddEditModal.vue b/web/src/views/purchase/refund/components/AddEditModal.vue
index 5fc06b0a..932a8217 100644
--- a/web/src/views/purchase/refund/components/AddEditModal.vue
+++ b/web/src/views/purchase/refund/components/AddEditModal.vue
@@ -56,7 +56,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联单据" data-step="3"
                          data-title="关联单据"
                          data-intro="">
-              <a-input-search readonly="true" placeholder="请选择关联单据" v-model:value="purchaseRefundFormState.otherReceipt" @search="onSearch"/>
+              <a-input-search :readOnly="true" placeholder="请选择关联单据" v-model:value="purchaseRefundFormState.otherReceipt" @search="onSearch"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -74,6 +74,12 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
+                <template #warehouse_default="{ row }">
+                  <span>{{ formatWarehouseId(row.warehouseId) }}</span>
+                </template>
+                <template #warehouse_edit="{ row }">
+                  <vxe-select v-model="row.warehouseId" placeholder="输选择仓库" @change="selectBarCode" :options="warehouseLabelList" clearable filterable></vxe-select>
+                </template>
                 <template #barCode_edit="{ row }">
                   <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
@@ -354,6 +360,7 @@ export default defineComponent({
     const [linkReceiptModal, {openModal: openLinkReceiptModal}] = useModal();
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
+    const warehouseLabelList =  ref<any[]>([]);
     function handleCancelModal() {
       clearData();
       open.value = false;
@@ -374,6 +381,10 @@ export default defineComponent({
         title.value = '新增-采购退货'
         loadGenerateId();
         purchaseRefundFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -387,6 +398,7 @@ export default defineComponent({
             warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
           }
           warehouseList.value = res.data
+          warehouseLabelList.value.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
         }
         const defaultWarehouse = res.data.find(item => item.isDefault === 1)
         if(defaultWarehouse) {
@@ -397,16 +409,6 @@ export default defineComponent({
       })
     }
 
-    function loadProductSku() {
-      getProductStockSku().then(res => {
-        productList.value = res.data
-        productLabelList.value.push(...res.data.map(item => ({value: item.productBarcode, label: item.productBarcode})))
-        productLabelList.value = productLabelList.value.filter((item, index, arr) => {
-          return arr.findIndex(item1 => item1.value === item.value) === index
-        })
-      })
-    }
-
     function loadAccountList() {
       // 每次赋值前先清空
       accountList.value = []
@@ -664,6 +666,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
       // 库存校验
       const tableData = table.getTableData().tableData
@@ -855,7 +862,7 @@ export default defineComponent({
       const defaultWarehouse = warehouseList.value.find(item => item.isDefault === 1)
       const warehouseId = defaultWarehouse ? defaultWarehouse.id : warehouseList.value[0].id
       if(table) {
-        table.insert({warehouseId: warehouseId})
+        table.insert({warehouseId: warehouseId, productNumber: 0})
       }
     }
 
@@ -1072,6 +1079,13 @@ export default defineComponent({
       }
     }
 
+    const formatWarehouseId = (value: string) => {
+      const item = warehouseList.value.find(item => item.id === value)
+      if(item) {
+        return item.warehouseName
+      }
+    }
+
     return {
       h,
       formRef,
@@ -1142,9 +1156,11 @@ export default defineComponent({
       handleReceiptSuccess,
       productList,
       productLabelList,
+      warehouseLabelList,
       selectBarCode,
       handleAccountModalSuccess,
-      handleSupplierModalSuccess
+      handleSupplierModalSuccess,
+      formatWarehouseId,
     };
   },
 });
diff --git a/web/src/views/purchase/storage/components/AddEditModal.vue b/web/src/views/purchase/storage/components/AddEditModal.vue
index b7056243..5ccefc54 100644
--- a/web/src/views/purchase/storage/components/AddEditModal.vue
+++ b/web/src/views/purchase/storage/components/AddEditModal.vue
@@ -59,7 +59,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联订单" data-step="3"
                          data-title="关联订单"
                          data-intro="">
-              <a-input-search readonly="true" placeholder="请选择关联订单"
+              <a-input-search :readonly="true" placeholder="请选择关联订单"
                               v-model:value="purchaseStorageFormState.otherReceipt" @search="onSearch"/>
             </a-form-item>
           </a-col>
@@ -81,6 +81,12 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
+                <template #warehouse_default="{ row }">
+                  <span>{{ formatWarehouseId(row.warehouseId) }}</span>
+                </template>
+                <template #warehouse_edit="{ row }">
+                  <vxe-select v-model="row.warehouseId" placeholder="输选择仓库" @change="selectBarCode" :options="warehouseLabelList" clearable filterable></vxe-select>
+                </template>
                 <template #barCode_edit="{ row }">
                   <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode"
                               :options="productLabelList" clearable filterable></vxe-select>
@@ -370,6 +376,7 @@ export default defineComponent({
     const [linkReceiptModal, {openModal: openLinkReceiptModal}] = useModal();
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
+    const warehouseLabelList =  ref<any[]>([]);
 
     function handleCancelModal() {
       clearData();
@@ -391,6 +398,10 @@ export default defineComponent({
         title.value = '新增-采购入库'
         loadGenerateId();
         purchaseStorageFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -404,6 +415,7 @@ export default defineComponent({
             warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
           }
           warehouseList.value = res.data
+          warehouseLabelList.value.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
         }
         const defaultWarehouse = res.data.find(item => item.isDefault === 1)
         if (defaultWarehouse) {
@@ -670,6 +682,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
 
       const files = [];
@@ -851,7 +868,7 @@ export default defineComponent({
       const defaultWarehouse = warehouseList.value.find(item => item.isDefault === 1)
       const warehouseId = defaultWarehouse ? defaultWarehouse.id : warehouseList.value[0].id
       if (table) {
-        table.insert({warehouseId: warehouseId})
+        table.insert({warehouseId: warehouseId, productNumber: 0})
       }
     }
 
@@ -1068,6 +1085,13 @@ export default defineComponent({
       }
     }
 
+    const formatWarehouseId = (value: string) => {
+      const item = warehouseList.value.find(item => item.id === value)
+      if(item) {
+        return item.warehouseName
+      }
+    }
+
     return {
       h,
       formRef,
@@ -1140,7 +1164,9 @@ export default defineComponent({
       productLabelList,
       selectBarCode,
       handleSupplierModalSuccess,
-      handleAccountModalSuccess
+      handleAccountModalSuccess,
+      formatWarehouseId,
+      warehouseLabelList
     };
   },
 });
diff --git a/web/src/views/receipt/LinkReceiptModal.vue b/web/src/views/receipt/LinkReceiptModal.vue
index 88e13f1a..08b9317d 100644
--- a/web/src/views/receipt/LinkReceiptModal.vue
+++ b/web/src/views/receipt/LinkReceiptModal.vue
@@ -28,7 +28,7 @@ import {ReceiptColumn, searchSchema} from "@/views/receipt/receipt.data"
 export default defineComponent({
   name: 'LinkReceiptModal',
   components: {Tag, BasicModal, BasicTable, TableAction, ReceiptDetailModal},
-  emits: ['selectedRows'],
+  emits: ['handleReceiptSuccess', 'register'],
   setup(_, context) {
     const getTitle = ref('操作');
     const [receiptDetailModal, {openModal: openReceiptDetailModal}] = useModal();
diff --git a/web/src/views/receipt/ReceiptDetailModal.vue b/web/src/views/receipt/ReceiptDetailModal.vue
index d781fe78..cc62b866 100644
--- a/web/src/views/receipt/ReceiptDetailModal.vue
+++ b/web/src/views/receipt/ReceiptDetailModal.vue
@@ -15,7 +15,7 @@ import {getReceiptDetail} from "@/api/receipt/receipt";
 export default defineComponent({
   name: 'ReceiptDetailModal',
   components: {BasicModal, BasicTable, TableAction},
-  emits: ['selectedRows'],
+  emits: ['handleReceiptSuccess', 'register'],
   setup(_, context) {
     const getTitle = ref('选择单据明细');
     const { createMessage } = useMessage();
diff --git a/web/src/views/retail/refund/components/AddEditModal.vue b/web/src/views/retail/refund/components/AddEditModal.vue
index 411df1ef..019d77a0 100644
--- a/web/src/views/retail/refund/components/AddEditModal.vue
+++ b/web/src/views/retail/refund/components/AddEditModal.vue
@@ -59,7 +59,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联单据" data-step="3"
                          data-title="关联单据"
                          data-intro="">
-              <a-input-search readonly="true" placeholder="请选择关联单据" v-model:value="formState.otherReceipt" @search="onSearch"/>
+              <a-input-search readonly placeholder="请选择关联单据" v-model:value="formState.otherReceipt" @search="onSearch"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -229,7 +229,7 @@ import {useModal} from "@/components/Modal";
 import {generateId, uploadOss} from "@/api/basic/common";
 import FinancialAccountModal from "@/views/basic/settlement-account/components/FinancialAccountModal.vue";
 import {WarehouseResp} from "@/api/basic/model/warehouseModel";
-import {VXETable, VxeGrid, VxeInput, VxeButton} from 'vxe-table'
+import {VXETable, VxeGrid, VxeInput, VxeButton, VxeSelect} from 'vxe-table'
 import {useMessage} from "@/hooks/web/useMessage";
 import { addOrUpdateRefund, getRefundDetail} from "@/api/retail/refund"
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue"
@@ -288,6 +288,7 @@ export default defineComponent({
     'vxe-grid': VxeGrid,
     'vxe-input': VxeInput,
     'vxe-button': VxeButton,
+    'vxe-select': VxeSelect,
     'a-divider': Divider,
   },
   setup(_, context) {
diff --git a/web/src/views/retail/shipments/model/addEditModel.ts b/web/src/views/retail/shipments/model/addEditModel.ts
index 3bfd6c8d..42801e82 100644
--- a/web/src/views/retail/shipments/model/addEditModel.ts
+++ b/web/src/views/retail/shipments/model/addEditModel.ts
@@ -92,17 +92,6 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-        props: {
-            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
-            result: 'result', // 配置响应结果列表字段
-            total: 'page.total' // 配置响应结果总页数字段
-        },
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {
@@ -185,11 +174,6 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
-    exportConfig: {
-        remote: true,
-        types: ['xlsx'],
-        modes: ['current', 'selected', 'all'],
-    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
diff --git a/web/src/views/sales/model/addEditModel.ts b/web/src/views/sales/model/addEditModel.ts
index 9a3a6f31..150b9ab9 100644
--- a/web/src/views/sales/model/addEditModel.ts
+++ b/web/src/views/sales/model/addEditModel.ts
@@ -130,29 +130,16 @@ const orderGridOptions = reactive<VxeGridProps<RowVO>>({
             buttons: 'toolbar_buttons'
         },
         refresh: true, // 显示刷新按钮
-        export: true, // 显示导出按钮
         print: true, // 显示打印按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-        props: {
-            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
-            result: 'result', // 配置响应结果列表字段
-            total: 'page.total' // 配置响应结果总页数字段
-        },
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {   field: 'barCode',
             width:160,
             title: '条码',
             slots: { edit: 'barCode_edit' },
-            sortable: true,
             titlePrefix: { content: '输入条码商品信息自动带出！' },
             editRender: { name: 'input', attrs: { placeholder: '请输入条码并回车' } }
         },
@@ -225,11 +212,6 @@ const orderGridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
-    exportConfig: {
-        remote: true,
-        types: ['xlsx'],
-        modes: ['current', 'selected', 'all'],
-    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
@@ -299,35 +281,23 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             buttons: 'toolbar_buttons'
         },
         refresh: true, // 显示刷新按钮
-        export: true, // 显示导出按钮
         print: true, // 显示打印按钮
         zoom: true, // 显示全屏按钮
         custom: true // 显示自定义列按钮
     },
-    proxyConfig: {
-        seq: true, // 启用动态序号代理，每一页的序号会根据当前页数变化
-        sort: false, // 启用排序代理，当点击排序时会自动触发 query 行为
-        filter: false, // 启用筛选代理，当点击筛选时会自动触发 query 行为
-        form: true, // 启用表单代理，当点击表单提交按钮时会自动触发 reload 行为
-        props: {
-            // 对应响应结果 Promise<{ result: [], page: { total: 100 } }>
-            result: 'result', // 配置响应结果列表字段
-            total: 'page.total' // 配置响应结果总页数字段
-        },
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {
             field: 'warehouseId',
             title: '仓库',
             width: 130,
-            editRender: { name: '$select', options: [], props: { placeholder: '请选择仓库' } }
+            slots: { edit: 'warehouse_edit', default: 'warehouse_default' },
+            editRender: { name: 'input', attrs: { placeholder: '请选择仓库' } }
         },
         {   field: 'barCode',
             width:160,
             title: '条码',
             slots: { edit: 'barCode_edit' },
-            sortable: true,
             titlePrefix: { content: '输入条码商品信息自动带出！' },
             editRender: { name: 'input', attrs: { placeholder: '请输入条码并回车' } }
         },
@@ -400,11 +370,6 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             })
         ]
     },
-    exportConfig: {
-        remote: true,
-        types: ['xlsx'],
-        modes: ['current', 'selected', 'all'],
-    },
     checkboxConfig: {
         labelField: 'id',
         reserve: true,
diff --git a/web/src/views/sales/order/components/AddEditModal.vue b/web/src/views/sales/order/components/AddEditModal.vue
index 3bec151d..2245e76d 100644
--- a/web/src/views/sales/order/components/AddEditModal.vue
+++ b/web/src/views/sales/order/components/AddEditModal.vue
@@ -332,7 +332,6 @@ export default defineComponent({
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -352,6 +351,7 @@ export default defineComponent({
         title.value = '新增-销售订单'
         loadGenerateId();
         formState.receiptDate = dayjs(new Date());
+        addRowData()
       }
     }
 
diff --git a/web/src/views/sales/refund/components/AddEditModal.vue b/web/src/views/sales/refund/components/AddEditModal.vue
index cb18052c..dd85bba8 100644
--- a/web/src/views/sales/refund/components/AddEditModal.vue
+++ b/web/src/views/sales/refund/components/AddEditModal.vue
@@ -59,7 +59,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联单据" data-step="3"
                          data-title="关联单据"
                          data-intro="">
-              <a-input-search readonly="true" placeholder="请选择关联出库单据" v-model:value="saleRefundFormState.otherReceipt" @search="onSearch"/>
+              <a-input-search :readonly="true" placeholder="请选择关联出库单据" v-model:value="saleRefundFormState.otherReceipt" @search="onSearch"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -75,9 +75,14 @@
                   <a-button @click="productModal" style="margin-right: 10px">选择添加退货商品</a-button>
                   <a-button @click="" style="margin-right: 10px">历史单据</a-button>
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
-
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
+                <template #warehouse_default="{ row }">
+                  <span>{{ formatWarehouseId(row.warehouseId) }}</span>
+                </template>
+                <template #warehouse_edit="{ row }">
+                  <vxe-select v-model="row.warehouseId" placeholder="输选择仓库" @change="selectBarCode" :options="warehouseLabelList" clearable filterable></vxe-select>
+                </template>
                 <template #barCode_edit="{ row }">
                   <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
@@ -369,8 +374,8 @@ export default defineComponent({
     const [linkReceiptModal, {openModal: openLinkReceiptModal}] = useModal();
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
+    const warehouseLabelList =  ref<any[]>([]);
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -390,6 +395,10 @@ export default defineComponent({
         title.value = '新增-销售退货单'
         loadGenerateId();
         saleRefundFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -403,6 +412,7 @@ export default defineComponent({
             warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
           }
           warehouseList.value = res.data
+          warehouseLabelList.value.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
         }
         const defaultWarehouse = res.data.find(item => item.isDefault === 1)
         if(defaultWarehouse) {
@@ -676,6 +686,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
 
       const files = [];
@@ -1066,6 +1081,13 @@ export default defineComponent({
       }
     }
 
+    const formatWarehouseId = (value: string) => {
+      const item = warehouseList.value.find(item => item.id === value)
+      if(item) {
+        return item.warehouseName
+      }
+    }
+
     return {
       h,
       AccountBookTwoTone,
@@ -1138,7 +1160,9 @@ export default defineComponent({
       productLabelList,
       selectBarCode,
       handleCustomerModalSuccess,
-      handleAccountModalSuccess
+      handleAccountModalSuccess,
+      formatWarehouseId,
+      warehouseLabelList,
     };
   },
 });
diff --git a/web/src/views/sales/shipments/components/AddEditModal.vue b/web/src/views/sales/shipments/components/AddEditModal.vue
index c6a153d4..65096b70 100644
--- a/web/src/views/sales/shipments/components/AddEditModal.vue
+++ b/web/src/views/sales/shipments/components/AddEditModal.vue
@@ -59,7 +59,7 @@
             <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="关联订单" data-step="3"
                          data-title="关联订单"
                          data-intro="">
-              <a-input-search readonly="true" placeholder="请选择关联订单" v-model:value="saleShipmentsFormState.otherReceipt" @search="onSearch"/>
+              <a-input-search :readonly="true" placeholder="请选择关联订单" v-model:value="saleShipmentsFormState.otherReceipt" @search="onSearch"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -77,6 +77,12 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
+                <template #warehouse_default="{ row }">
+                  <span>{{ formatWarehouseId(row.warehouseId) }}</span>
+                </template>
+                <template #warehouse_edit="{ row }">
+                  <vxe-select v-model="row.warehouseId" placeholder="输选择仓库" @change="selectBarCode" :options="warehouseLabelList" clearable filterable></vxe-select>
+                </template>
                 <template #barCode_edit="{ row }">
                   <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
@@ -370,8 +376,8 @@ export default defineComponent({
     const [linkReceiptModal, {openModal: openLinkReceiptModal}] = useModal();
     const productList = ref<ProductStockSkuResp[]>([]);
     const productLabelList = ref<any[]>([]);
+    const warehouseLabelList =  ref<any[]>([]);
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -391,6 +397,10 @@ export default defineComponent({
         title.value = '新增-销售出库单'
         loadGenerateId();
         saleShipmentsFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -404,6 +414,7 @@ export default defineComponent({
             warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
           }
           warehouseList.value = res.data
+          warehouseLabelList.value.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
         }
         const defaultWarehouse = res.data.find(item => item.isDefault === 1)
         if(defaultWarehouse) {
@@ -681,6 +692,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
       // 库存校验
       const tableData = table.getTableData().tableData
@@ -1079,6 +1095,13 @@ export default defineComponent({
       }
     }
 
+    const formatWarehouseId = (value: string) => {
+      const item = warehouseList.value.find(item => item.id === value)
+      if(item) {
+        return item.warehouseName
+      }
+    }
+
     return {
       h,
       AccountBookTwoTone,
@@ -1151,7 +1174,9 @@ export default defineComponent({
       productLabelList,
       selectBarCode,
       handleCustomerModalSuccess,
-      handleAccountModalSuccess
+      handleAccountModalSuccess,
+      formatWarehouseId,
+      warehouseLabelList,
     };
   },
 });
diff --git a/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts b/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
index 8a40b10c..8deed037 100644
--- a/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
+++ b/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
@@ -71,15 +71,9 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true,
         zoom: true,
         custom: true
     },
-    proxyConfig: {
-        sort: false,
-        filter: false,
-        form: true,
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {   field: 'type',
diff --git a/web/src/views/warehouse/addEditStorageShipments.data.ts b/web/src/views/warehouse/addEditStorageShipments.data.ts
index 819fb806..7ee9eefa 100644
--- a/web/src/views/warehouse/addEditStorageShipments.data.ts
+++ b/web/src/views/warehouse/addEditStorageShipments.data.ts
@@ -76,18 +76,13 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         zoom: true,
         custom: true
     },
-    proxyConfig: {
-        sort: false,
-        filter: false,
-        form: true,
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {   field: 'warehouseId',
             width:120,
             title: '仓库',
-            slots: { edit: 'warehouseId_edit',default: 'warehouseId_default' },
-            editRender: {}
+            slots: { edit: 'warehouse_edit',default: 'warehouse_default' },
+            editRender: {name: 'input', attrs: { placeholder: '请选择仓库' }}
         },
         {   field: 'barCode',
             width:160,
diff --git a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
index 382fe32d..0ed4dbe2 100644
--- a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
+++ b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
@@ -46,19 +46,19 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
-                <template #warehouseId_default="{ row }">
+                <template #warehouse_default="{ row }">
                   <span>{{ formatWarehouseId(row.warehouseId) }}</span>
                 </template>
-                <template #warehouseId_edit="{ row }">
-                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId">
+                <template #warehouse_edit="{ row }">
+                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId" @change="selectBarCode" clearable filterable>
                     <vxe-option v-for="item in warehouseList" :key="item.id" :value="item.id" :label="item.warehouseName"></vxe-option>
                   </vxe-select>
                 </template>
-                <template #otherWarehouseId_default="{ row }">
+                <template #otherWarehouse_default="{ row }">
                   <span>{{ formatWarehouseId(row.otherWarehouseId) }}</span>
                 </template>
-                <template #otherWarehouseId_edit="{ row }">
-                  <vxe-select placeholder="请选择调入仓库" v-model="row.otherWarehouseId">
+                <template #otherWarehouse_edit="{ row }">
+                  <vxe-select placeholder="请选择调入仓库" v-model="row.otherWarehouseId" clearable filterable>
                     <vxe-option v-for="item in warehouseList" :key="item.id" :value="item.id" :label="item.warehouseName"></vxe-option>
                   </vxe-select>
                 </template>
@@ -228,7 +228,6 @@ export default defineComponent({
     const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -245,6 +244,10 @@ export default defineComponent({
         title.value = '新增-调拨出库'
         loadGenerateId();
         allotShipmentsFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -376,6 +379,11 @@ export default defineComponent({
           createMessage.warn("调入方仓库不能为空")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择调出方仓库")
+          return;
+        }
       }
 
       const tableData = table.getTableData().tableData
diff --git a/web/src/views/warehouse/allot/components/addEditAllotShipments.data.ts b/web/src/views/warehouse/allot/components/addEditAllotShipments.data.ts
index 642a7a30..c04e9644 100644
--- a/web/src/views/warehouse/allot/components/addEditAllotShipments.data.ts
+++ b/web/src/views/warehouse/allot/components/addEditAllotShipments.data.ts
@@ -63,22 +63,16 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         slots: {
             buttons: 'toolbar_buttons'
         },
-        export: true,
         zoom: true,
         custom: true
     },
-    proxyConfig: {
-        sort: false,
-        filter: false,
-        form: true,
-    },
     columns: [
         { type: 'checkbox', field:'productId', title: 'ID', width: 80},
         {   field: 'warehouseId',
             width:150,
             title: '仓库',
-            slots: { edit: 'warehouseId_edit',default: 'warehouseId_default' },
-            editRender: {}
+            slots: { edit: 'warehouse_edit',default: 'warehouse_default' },
+            editRender: { name: 'input', attrs: { placeholder: '请选择仓库' } }
         },
         {   field: 'barCode',
             width:160,
@@ -97,7 +91,7 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         {   field: 'otherWarehouseId',
             width:150,
             title: '调入仓库',
-            slots: { edit: 'otherWarehouseId_edit',default: 'otherWarehouseId_default' },
+            slots: { edit: 'otherWarehouse_edit',default: 'otherWarehouse_default' },
             editRender: {}
         },
         { field: 'productUnit', title: '单位',  width: 70},
diff --git a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
index f4ba9654..f4064f4a 100644
--- a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
+++ b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
@@ -225,7 +225,6 @@ export default defineComponent({
     const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
diff --git a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
index be7560f5..7c520543 100644
--- a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
+++ b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
@@ -224,7 +224,6 @@ export default defineComponent({
     const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
diff --git a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
index 6364c1a8..72ea158d 100644
--- a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
+++ b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
@@ -66,11 +66,11 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
-                <template #warehouseId_default="{ row }">
+                <template #warehouse_default="{ row }">
                   <span>{{ formatWarehouseId(row.warehouseId) }}</span>
                 </template>
-                <template #warehouseId_edit="{ row }">
-                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId">
+                <template #warehouse_edit="{ row }">
+                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId" @change="selectBarCode" clearable filterable>
                     <vxe-option v-for="item in warehouseList" :key="item.id" :value="item.id" :label="item.warehouseName"></vxe-option>
                   </vxe-select>
                 </template>
@@ -253,7 +253,6 @@ export default defineComponent({
     const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -271,6 +270,10 @@ export default defineComponent({
         title.value = '新增-其他出库'
         loadGenerateId();
         otherShipmentFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -411,6 +414,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
       // 库存校验
       const tableData = table.getTableData().tableData
diff --git a/web/src/views/warehouse/shipments/index.vue b/web/src/views/warehouse/shipments/index.vue
index 9b392f34..0f9d2b01 100644
--- a/web/src/views/warehouse/shipments/index.vue
+++ b/web/src/views/warehouse/shipments/index.vue
@@ -89,9 +89,9 @@ export default defineComponent({
       formConfig: {
         labelWidth: 110,
         schemas: searchFormSchema,
+        autoSubmitOnEnter: true
       },
       bordered: true,
-      tableSetting: { fullScreen: true },
       useSearchForm: true,
       clickToRowSelect: false,
       showTableSetting: true,
diff --git a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
index f72a95f6..9bf3e593 100644
--- a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
+++ b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
@@ -66,11 +66,11 @@
                   <a-button @click="addRowData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
-                <template #warehouseId_default="{ row }">
+                <template #warehouse_default="{ row }">
                   <span>{{ formatWarehouseId(row.warehouseId) }}</span>
                 </template>
-                <template #warehouseId_edit="{ row }">
-                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId">
+                <template #warehouse_edit="{ row }">
+                  <vxe-select placeholder="请选择仓库" v-model="row.warehouseId" @change="selectBarCode" clearable filterable>
                     <vxe-option v-for="item in warehouseList" :key="item.id" :value="item.id" :label="item.warehouseName"></vxe-option>
                   </vxe-select>
                 </template>
@@ -253,7 +253,6 @@ export default defineComponent({
     const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
-      close();
       clearData();
       open.value = false;
       context.emit('cancel');
@@ -271,6 +270,10 @@ export default defineComponent({
         title.value = '新增-其他入库'
         loadGenerateId();
         otherStorageFormState.receiptDate = dayjs(new Date());
+        const table = xGrid.value
+        if (table) {
+          table.insert({productNumber: 0})
+        }
       }
     }
 
@@ -318,8 +321,12 @@ export default defineComponent({
         if (columns) {
           const barCodeColumn = selectRow.row.barCode
           const warehouseColumn = selectRow.row.warehouseId
+
+          console.info(warehouseColumn)
+
           if(barCodeColumn && warehouseColumn) {
             const product = productList.value.find(item => {
+              console.info(item.warehouseId)
               return item.productBarcode === barCodeColumn && item.warehouseId === warehouseColumn;
             });
             if (product) {
@@ -411,6 +418,11 @@ export default defineComponent({
           createMessage.warn("请录入条码或者选择产品")
           return;
         }
+        const isWarehouseEmpty = insertRecords.some(item => !item.warehouseId)
+        if(isWarehouseEmpty) {
+          createMessage.warn("请选择仓库")
+          return;
+        }
       }
 
       const files :any = [];