From ffe58e0cf73fa61d8b05de09645c5d8d89007ce5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 16 六月 2026 15:20:52 +0800
Subject: [PATCH] 君歌 1.部署修改
---
src/views/productionManagement/productionOrder/index.vue | 209 ++++++++++++++++++++++++++-------------------------
1 files changed, 107 insertions(+), 102 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 9c7682b..e77d2bf 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -192,7 +192,8 @@
</div>
</div>
</el-dialog>
- <MaterialLedgerDialog v-model="materialDialogVisible"
+ <!-- 棰嗘枡/琛ユ枡/棰嗘枡璇︽儏鍔熻兘宸查殣钘� -->
+ <!-- <MaterialLedgerDialog v-model="materialDialogVisible"
:order-row="currentMaterialOrder"
@saved="getList" />
<MaterialDetailDialog v-model="materialDetailDialogVisible"
@@ -200,16 +201,16 @@
@confirmed="getList" />
<MaterialSupplementDialog v-model="materialSupplementDialogVisible"
:order-row="currentMaterialSupplementOrder"
- @saved="getList" />
+ @saved="getList" /> -->
<new-product-order v-if="isShowNewModal"
v-model:visible="isShowNewModal"
@completed="handleQuery" />
- <!-- 鎵撳嵃棰嗘枡鍗曠粍浠� -->
- <div class="print-requisition-wrapper">
+ <!-- 鎵撳嵃棰嗘枡鍗曞姛鑳藉凡闅愯棌 -->
+ <!-- <div class="print-requisition-wrapper">
<PrintMaterialRequisition ref="printRef"
:order-row="printOrderRow"
:material-list="printMaterialList" />
- </div>
+ </div> -->
</div>
</template>
@@ -237,16 +238,18 @@
} from "@/api/productionManagement/productionOrder.js";
import { productWorkOrderPage } from "@/api/productionManagement/workOrder.js";
import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
- import MaterialLedgerDialog from "@/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue";
- import MaterialDetailDialog from "@/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue";
- import MaterialSupplementDialog from "@/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue";
- import PrintMaterialRequisition from "@/views/productionManagement/productionOrder/components/PrintMaterialRequisition.vue";
+ // 棰嗘枡/琛ユ枡/棰嗘枡璇︽儏/鎵撳嵃棰嗘枡鍗曞姛鑳藉凡闅愯棌
+ // import MaterialLedgerDialog from "@/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue";
+ // import MaterialDetailDialog from "@/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue";
+ // import MaterialSupplementDialog from "@/views/productionManagement/productionOrder/components/MaterialSupplementDialog.vue";
+ // import PrintMaterialRequisition from "@/views/productionManagement/productionOrder/components/PrintMaterialRequisition.vue";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import { listPage } from "@/api/productionManagement/processRoute.js";
- import {
- listMaterialPickingDetail,
- listMaterialPickingBom,
- } from "@/api/productionManagement/productionOrder.js";
+ // 棰嗘枡鍔熻兘宸查殣钘�
+ // import {
+ // listMaterialPickingDetail,
+ // listMaterialPickingBom,
+ // } from "@/api/productionManagement/productionOrder.js";
const NewProductOrder = defineAsyncComponent(() =>
import("@/views/productionManagement/productionOrder/New.vue")
);
@@ -398,41 +401,42 @@
showSourceData(row);
},
},
- {
- name: "棰嗘枡",
- type: "text",
- color: "#5EC7AB",
- showHide: row => !row.endOrder && !row.returned,
- clickFun: row => {
- openMaterialDialog(row);
- },
- },
- {
- name: "琛ユ枡",
- type: "text",
- color: "#5EC7AB",
- showHide: row => !row.endOrder && !row.returned,
- clickFun: row => {
- openMaterialSupplementDialog(row);
- },
- },
- {
- name: "棰嗘枡璇︽儏",
- type: "text",
- color: "#5EC7AB",
- clickFun: row => {
- openMaterialDetailDialog(row);
- },
- },
- {
- name: "鎵撳嵃棰嗘枡鍗�",
- type: "text",
- color: "#5EC7AB",
- showHide: row => !row.endOrder,
- clickFun: row => {
- handlePrint(row);
- },
- },
+ // 棰嗘枡/琛ユ枡/棰嗘枡璇︽儏/鎵撳嵃棰嗘枡鍗曞姛鑳藉凡闅愯棌
+ // {
+ // name: "棰嗘枡",
+ // type: "text",
+ // color: "#5EC7AB",
+ // showHide: row => !row.endOrder && !row.returned,
+ // clickFun: row => {
+ // openMaterialDialog(row);
+ // },
+ // },
+ // {
+ // name: "琛ユ枡",
+ // type: "text",
+ // color: "#5EC7AB",
+ // showHide: row => !row.endOrder && !row.returned,
+ // clickFun: row => {
+ // openMaterialSupplementDialog(row);
+ // },
+ // },
+ // {
+ // name: "棰嗘枡璇︽儏",
+ // type: "text",
+ // color: "#5EC7AB",
+ // clickFun: row => {
+ // openMaterialDetailDialog(row);
+ // },
+ // },
+ // {
+ // name: "鎵撳嵃棰嗘枡鍗�",
+ // type: "text",
+ // color: "#5EC7AB",
+ // showHide: row => !row.endOrder,
+ // clickFun: row => {
+ // handlePrint(row);
+ // },
+ // },
{
name: "鐢熶骇杩芥函",
type: "text",
@@ -487,7 +491,7 @@
if (!Number.isFinite(n)) return 0;
if (n <= 0) return 0;
if (n >= 100) return 100;
- return Math.round(n);
+ return parseFloat(n.toFixed(2));
};
// 30/50/80/100 鍒嗘棰滆壊锛氱孩/姗�/钃�/缁�
@@ -525,48 +529,48 @@
orderId: null,
routeId: null,
});
- const materialDialogVisible = ref(false);
- const currentMaterialOrder = ref(null);
- const materialDetailDialogVisible = ref(false);
- const currentMaterialDetailOrder = ref(null);
- const materialSupplementDialogVisible = ref(false);
- const currentMaterialSupplementOrder = ref(null);
+ // 棰嗘枡/琛ユ枡/棰嗘枡璇︽儏鍔熻兘宸查殣钘�
+ // const materialDialogVisible = ref(false);
+ // const currentMaterialOrder = ref(null);
+ // const materialDetailDialogVisible = ref(false);
+ // const currentMaterialDetailOrder = ref(null);
+ // const materialSupplementDialogVisible = ref(false);
+ // const currentMaterialSupplementOrder = ref(null);
- // 鎵撳嵃鐩稿叧
- const printOrderRow = ref(null);
- const printMaterialList = ref([]);
- const handlePrint = async row => {
- printOrderRow.value = row;
- proxy.$modal.loading("姝ｅ湪鑾峰彇棰嗘枡鏁版嵁...");
- try {
- printMaterialList.value = [];
- const detailRes = await listMaterialPickingDetail(row.id);
- const detailList = Array.isArray(detailRes?.data)
- ? detailRes.data
- : detailRes?.data?.records || [];
-
- if (detailList.length > 0) {
- printMaterialList.value = detailList;
- }
-
- if (printMaterialList.value.length === 0) {
- proxy.$modal.msgWarning("鏆傛棤棰嗘枡鏁版嵁");
- return;
- }
-
- // 绛夊緟 DOM 鏇存柊鍚庢墽琛屾墦鍗�
- proxy.$nextTick(() => {
- setTimeout(() => {
- window.print();
- }, 800);
- });
- } catch (e) {
- console.error("鑾峰彇棰嗘枡鏁版嵁澶辫触锛�", e);
- proxy.$modal.msgError("鑾峰彇棰嗘枡鏁版嵁澶辫触");
- } finally {
- proxy.$modal.closeLoading();
- }
- };
+ // 鎵撳嵃棰嗘枡鍗曞姛鑳藉凡闅愯棌
+ // const printOrderRow = ref(null);
+ // const printMaterialList = ref([]);
+ // const handlePrint = async row => {
+ // printOrderRow.value = row;
+ // proxy.$modal.loading("姝ｅ湪鑾峰彇棰嗘枡鏁版嵁...");
+ // try {
+ // printMaterialList.value = [];
+ // const detailRes = await listMaterialPickingDetail(row.id);
+ // const detailList = Array.isArray(detailRes?.data)
+ // ? detailRes.data
+ // : detailRes?.data?.records || [];
+ //
+ // if (detailList.length > 0) {
+ // printMaterialList.value = detailList;
+ // }
+ //
+ // if (printMaterialList.value.length === 0) {
+ // proxy.$modal.msgWarning("鏆傛棤棰嗘枡鏁版嵁");
+ // return;
+ // }
+ //
+ // proxy.$nextTick(() => {
+ // setTimeout(() => {
+ // window.print();
+ // }, 800);
+ // });
+ // } catch (e) {
+ // console.error("鑾峰彇棰嗘枡鏁版嵁澶辫触锛�", e);
+ // proxy.$modal.msgError("鑾峰彇棰嗘枡鏁版嵁澶辫触");
+ // } finally {
+ // proxy.$modal.closeLoading();
+ // }
+ // };
const openBindRouteDialog = async (row, type) => {
bindForm.orderId = row.id;
@@ -612,20 +616,21 @@
}
};
- const openMaterialDialog = row => {
- currentMaterialOrder.value = row;
- materialDialogVisible.value = true;
- };
+ // 棰嗘枡/琛ユ枡/棰嗘枡璇︽儏鍔熻兘宸查殣钘�
+ // const openMaterialDialog = row => {
+ // currentMaterialOrder.value = row;
+ // materialDialogVisible.value = true;
+ // };
- const openMaterialDetailDialog = async row => {
- currentMaterialDetailOrder.value = row;
- materialDetailDialogVisible.value = true;
- };
+ // const openMaterialDetailDialog = async row => {
+ // currentMaterialDetailOrder.value = row;
+ // materialDetailDialogVisible.value = true;
+ // };
- const openMaterialSupplementDialog = row => {
- currentMaterialSupplementOrder.value = row;
- materialSupplementDialogVisible.value = true;
- };
+ // const openMaterialSupplementDialog = row => {
+ // currentMaterialSupplementOrder.value = row;
+ // materialSupplementDialogVisible.value = true;
+ // };
const handleReset = () => {
searchForm.value = {
--
Gitblit v1.9.3