From 89b4ccc1bf351417bbe0acbc8246a681514bd173 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 27 三月 2026 15:16:24 +0800
Subject: [PATCH] 军泰伟业 1.生产订单添加领料功能 2.将报工台账单的查看投入迁移到生产订单
---
src/views/productionManagement/productionReporting/index.vue | 151 ++++++++++----------------------------------------
1 files changed, 31 insertions(+), 120 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index b34b14e..9de948e 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -19,21 +19,6 @@
style="width: 200px;"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="宸ュ崟鐘舵��:">
- <el-select v-model="searchForm.workOrderStatus"
- placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
- style="width: 140px"
- clearable>
- <el-option label="寰呯‘璁�"
- :value="1"></el-option>
- <el-option label="寰呯敓浜�"
- :value="2"></el-option>
- <el-option label="鐢熶骇涓�"
- :value="3"></el-option>
- <el-option label="宸茬敓浜�"
- :value="4"></el-option>
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
@@ -115,7 +100,7 @@
</template>
</el-table-column>
<el-table-column label="鎿嶄綔"
- width="60">
+ >
<template #default="scope">
<el-button link
type="primary"
@@ -136,12 +121,6 @@
</div>
<form-dia ref="formDia"
@close="handleQuery"></form-dia>
- <input-modal v-if="isShowInput"
- v-model:visible="isShowInput"
- :production-product-main-id="isShowingId" />
- <output-modal v-if="isShowOutput"
- v-model:visible="isShowOutput"
- :production-product-main-id="isShowingId" />
</div>
</template>
@@ -156,8 +135,7 @@
} from "@/api/productionManagement/productionReporting.js";
import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
- import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
- import OutputModal from "@/views/productionManagement/productionReporting/Output.vue";
+
const data = reactive({
searchForm: {
@@ -187,94 +165,42 @@
width: 120,
},
{
- label: "鎶ュ伐鐘舵��",
- prop: "status",
- dataType: "tag",
- formatData: params => {
- if (params == 3) {
- return "宸叉姤宸�";
- } else if (params == 1) {
- return "寰呯敓浜�";
- } else {
- return "鐢熶骇涓�";
- }
- },
- formatType: params => {
- if (params == 3) {
- return "success";
- } else if (params == 1) {
- return "primary";
- } else {
- return "warning";
- }
- },
- },
- {
- label: "宸ュ崟鐘舵��",
- prop: "workOrderStatus",
- dataType: "tag",
- formatData: params => {
- switch (params) {
- case "1":
- return "寰呯‘璁�";
- case "2":
- return "寰呯敓浜�";
- case "3":
- return "鐢熶骇涓�";
- case "4":
- return "宸茬敓浜�";
- default:
- return "";
- }
- },
- formatType: params => {
- switch (params) {
- case "1":
- return "primary";
- case "2":
- return "info";
- case "3":
- return "warning";
- case "4":
- return "success";
- default:
- return "";
- }
- },
- },
- {
- label: "鐢熶骇鏃堕棿",
- prop: "createTime",
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
width: 120,
- formatData: params => {
- const date = new Date(params);
- return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(
- 2,
- "0"
- )}-${String(date.getDate()).padStart(2, "0")}`;
- },
+ },
+ {
+ label: "浜у搧鍥剧焊缂栧彿",
+ prop: "productModelName",
+ width: 160,
+ },
+ {
+ label: "浜у嚭鏁伴噺",
+ prop: "quantity",
+ width: 120,
+ },
+ {
+ label: "鎶ュ簾鏁伴噺",
+ prop: "scrapQty",
+ width: 120,
+ },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ width: 120,
+ },
+
+ {
+ label: "鍒涘缓鏃堕棿",
+ prop: "createTime",
+ width: 180,
},
{
dataType: "action",
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 230,
operation: [
- {
- name: "鏌ョ湅鎶曞叆",
- type: "text",
- clickFun: row => {
- showInput(row);
- },
- },
- {
- name: "鏌ョ湅浜у嚭",
- type: "text",
- clickFun: row => {
- showOutput(row);
- },
- },
{
name: "鍒犻櫎",
type: "danger",
@@ -444,21 +370,6 @@
});
};
- // 鎵撳紑鎶曞叆妯℃�佹
- const isShowInput = ref(false);
- const isShowingId = ref(0);
- const showInput = row => {
- isShowInput.value = true;
- isShowingId.value = row.id;
- };
-
- // 鎵撳紑浜у嚭妯℃�佹
- const isShowOutput = ref(false);
- const showOutput = row => {
- isShowOutput.value = true;
- isShowingId.value = row.id;
- };
-
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
@@ -467,7 +378,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/salesLedger/work/export", {}, "鐢熶骇鎶ュ伐.xlsx");
+ proxy.download("/productionProductMain/export", {}, "鐢熶骇鎶ュ伐.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3