From e006713c0277fa47b6896981375b3542adaec0a2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 30 三月 2026 16:04:31 +0800
Subject: [PATCH] 军泰伟业 1.销售退货中已退货数量未退货数量计算错误
---
src/views/productionManagement/productionOrder/index.vue | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index dd69968..40f3ba1 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -52,17 +52,15 @@
:loading="bindRouteLoading">
<el-option v-for="item in routeOptions"
:key="item.id"
- :label="`${item.processRouteCode || ''}`"
+ :label="item.processRouteName"
:value="item.id" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
+ <el-button type="primary" :loading="bindRouteSaving" @click="handleBindRouteConfirm">纭� 璁�</el-button>
<el-button @click="bindRouteDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary"
- :loading="bindRouteSaving"
- @click="handleBindRouteConfirm">纭� 璁�</el-button>
</span>
</template>
</el-dialog>
@@ -150,11 +148,11 @@
import dayjs from "dayjs";
import { useRouter } from "vue-router";
import {
- productOrderListPage,
- listProcessRoute,
- bindingRoute,
- listProcessBom, delProductOrder, startOrPause,
- } from "@/api/productionManagement/productionOrder.js";
+ productOrderListPage,
+ bindingRoute,
+ listProcessBom, delProductOrder, startOrPause,
+} from "@/api/productionManagement/productionOrder.js";
+import { listPage as getProcessRouteList } from "@/api/productionManagement/processRoute.js";
import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
import { productionProductInputListPage } from "@/api/productionManagement/productionProductInput.js";
import { listPage as listProductStructureRecord, pick as pickMaterial } from "@/api/productionManagement/productStructureRecord.js";
@@ -263,14 +261,14 @@
showRouteItemModal(row);
},
},
- {
- name: "缁戝畾宸ヨ壓璺嚎",
- type: "text",
- showHide: row => !row.processRouteCode,
- clickFun: row => {
- openBindRouteDialog(row);
- },
- },
+ // {
+ // name: "缁戝畾宸ヨ壓璺嚎",
+ // type: "text",
+ // showHide: row => !row.processRouteCode,
+ // clickFun: row => {
+ // openBindRouteDialog(row);
+ // },
+ // },
{
name: "鐗╂枡娓呭崟",
type: "text",
@@ -393,15 +391,10 @@
bindForm.routeId = null;
bindRouteDialogVisible.value = true;
routeOptions.value = [];
- if (!row.productModelId) {
- proxy.$modal.msgWarning("褰撳墠璁㈠崟缂哄皯浜у搧鍨嬪彿锛屾棤娉曟煡璇㈠伐鑹鸿矾绾�");
- bindRouteDialogVisible.value = false;
- return;
- }
bindRouteLoading.value = true;
try {
- const res = await listProcessRoute({ productModelId: row.productModelId });
- routeOptions.value = res.data || [];
+ const res = await getProcessRouteList({ current: -1, size: -1 });
+ routeOptions.value = res.data?.records || [];
} catch (e) {
console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", e);
proxy.$modal.msgError("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触");
--
Gitblit v1.9.3