From 07f9f8657d057a38792c3822acc9b08d83478967 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 07 五月 2026 14:23:10 +0800
Subject: [PATCH] 合并代码
---
src/views/salesManagement/returnOrder/components/formDia.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/salesManagement/returnOrder/components/formDia.vue b/src/views/salesManagement/returnOrder/components/formDia.vue
index 9f1bb9a..7a35ea9 100644
--- a/src/views/salesManagement/returnOrder/components/formDia.vue
+++ b/src/views/salesManagement/returnOrder/components/formDia.vue
@@ -168,10 +168,10 @@
<script setup>
import { reactive, ref, toRefs, getCurrentInstance } from "vue";
import { returnManagementAdd, returnManagementUpdate, returnManagementGetByShippingId, getSalesLedger, returnManagementGetById } from "@/api/salesManagement/returnOrder.js";
-import { getAllCustomerList } from "@/api/customerService/index.js";
import useUserStore from "@/store/modules/user.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
import { listProject } from "@/api/oaSystem/projectManagement.js";
+import {listCustomer} from "@/api/basicData/customer.js";
const { proxy } = getCurrentInstance();
const emit = defineEmits(['close'])
@@ -354,15 +354,14 @@
};
const initCustomers = async () => {
- const res = await getAllCustomerList({});
- if (res?.records) {
- customerNameOptions.value = res.records.map(item => ({
- label: item.customerName,
- value: item.customerName, // Keep value as name if needed for other logic, but request says customerId
- id: item.id,
- code: item.customerCode
- }));
- }
+ listCustomer({current: -1,size:-1, type: 0}).then((res) => {
+ customerNameOptions.value = res.data.records.map(item => ({
+ label: item.customerName,
+ value: item.customerName, // Keep value as name if needed for other logic, but request says customerId
+ id: item.id,
+ code: item.customerCode
+ }));
+ });
};
const initUsers = async () => {
@@ -406,7 +405,7 @@
}).then(res => {
if(res.code === 200){
outboundOptions.value = res.data.map(item => ({
- label: item.salesContractNo, // Or whatever the outbound number field is
+ label: item.shippingNo, // Or whatever the outbound number field is
value: item.id,
}))
}
--
Gitblit v1.9.3