From 14653f7ebb58c63ff700ab5f62c3108f1ff39eea Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 18 四月 2026 13:13:12 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/api/salesManagement/salesLedger.js | 8 ++++++++
src/views/salesManagement/returnOrder/components/formDia.vue | 19 ++++++++++---------
src/views/salesManagement/salesLedger/index.vue | 23 ++++++++++++++++++++++-
3 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/api/salesManagement/salesLedger.js b/src/api/salesManagement/salesLedger.js
index 9f8e153..7fd27af 100644
--- a/src/api/salesManagement/salesLedger.js
+++ b/src/api/salesManagement/salesLedger.js
@@ -212,3 +212,11 @@
data,
});
}
+
+// 宸插彂璐у鎴�
+export function shippedCustomers() {
+ return request({
+ url: "/sales/ledger/shippedCustomers",
+ method: "get",
+ })
+}
\ No newline at end of file
diff --git a/src/views/salesManagement/returnOrder/components/formDia.vue b/src/views/salesManagement/returnOrder/components/formDia.vue
index 9f1bb9a..83a16b7 100644
--- a/src/views/salesManagement/returnOrder/components/formDia.vue
+++ b/src/views/salesManagement/returnOrder/components/formDia.vue
@@ -21,7 +21,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
- <el-select v-model="form.customerId" filterable placeholder="璇烽�夋嫨瀹㈡埛" @change="customerNameChange">
+ <el-select v-model="form.customerId" filterable placeholder="璇烽�夋嫨瀹㈡埛" @change="customerNameChange" clearable >
<el-option
v-for="item in customerNameOptions"
:key="item.value"
@@ -33,7 +33,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="鍏宠仈鍑哄簱鍗曞彿锛�" prop="shippingId">
- <el-select v-model="form.shippingId" filterable placeholder="璇烽�夋嫨鍑哄簱鍗曞彿" @change="outboundNoChange">
+ <el-select v-model="form.shippingId" filterable placeholder="璇烽�夋嫨鍑哄簱鍗曞彿" @change="outboundNoChange" clearable>
<el-option
v-for="item in outboundOptions"
:key="item.value"
@@ -45,7 +45,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="鍒跺崟浜猴細" prop="maker">
- <el-select v-model="form.maker" filterable placeholder="璇烽�夋嫨鍒跺崟浜�">
+ <el-select v-model="form.maker" filterable placeholder="璇烽�夋嫨鍒跺崟浜�" clearable>
<el-option v-for="u in userOptions" :key="u.value" :label="u.label" :value="u.value" />
</el-select>
</el-form-item>
@@ -147,7 +147,8 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" prop="productCategory" label="浜у搧澶х被" />
<el-table-column align="center" prop="specificationModel" label="瑙勬牸鍨嬪彿" />
- <el-table-column align="center" prop="unit" label="鍗曚綅" />
+ <el-table-column align="center" prop="thickness" label="鍘氬害(mm)" />
+ <el-table-column align="center" prop="productModelUnit" label="鍗曚綅" />
<el-table-column align="center" prop="quantity" label="鎬绘暟閲�" />
<el-table-column align="center" prop="unQuantity" label="鏈��璐ф暟閲�" />
<el-table-column align="center" label="宸查��璐ф暟閲�">
@@ -168,10 +169,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 { shippedCustomers } from "@/api/salesManagement/salesLedger";
const { proxy } = getCurrentInstance();
const emit = defineEmits(['close'])
@@ -354,11 +355,11 @@
};
const initCustomers = async () => {
- const res = await getAllCustomerList({});
- if (res?.records) {
- customerNameOptions.value = res.records.map(item => ({
+ const res = await shippedCustomers({});
+ if (res?.data) {
+ customerNameOptions.value = res.data.map(item => ({
label: item.customerName,
- value: item.customerName, // Keep value as name if needed for other logic, but request says customerId
+ value: item.customerName,
id: item.id,
code: item.customerCode
}));
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 208c14c..f09b997 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -3644,7 +3644,28 @@
} else {
const res = await getProcessCard(selectedId);
const processCardData = res?.data ?? {};
- printFinishedProcessCard(processCardData);
+ const routeNodes = processCardData?.routeNodes;
+ const isProcessRouteEmpty =
+ !Array.isArray(routeNodes) || routeNodes.length === 0;
+ if (isProcessRouteEmpty) {
+ proxy.$modal.closeLoading();
+ try {
+ await ElMessageBox.confirm(
+ "褰撳墠璁㈠崟鏈粦瀹氬伐鑹鸿矾绾夸篃娌℃湁璁剧疆榛樿鐨勫伐鑹鸿矾绾匡紝鏄惁浠嶈鎵撳嵃锛�",
+ "鎻愮ず",
+ {
+ confirmButtonText: "鎵撳嵃",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ } catch {
+ return;
+ }
+ printFinishedProcessCard(processCardData);
+ } else {
+ printFinishedProcessCard(processCardData);
+ }
}
} catch (error) {
console.error(
--
Gitblit v1.9.3