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/productionOrder/New.vue | 33 ++++
src/views/productionManagement/productionReporting/index.vue | 22 ---
src/views/productionManagement/workOrder/index.vue | 2
src/api/productionManagement/productStructureRecord.js | 20 +++
src/views/productionManagement/productionOrder/index.vue | 252 +++++++++++++++++++++++++++++++++++++++++
src/components/PIMTable/PIMTable.vue | 2
6 files changed, 301 insertions(+), 30 deletions(-)
diff --git a/src/api/productionManagement/productStructureRecord.js b/src/api/productionManagement/productStructureRecord.js
new file mode 100644
index 0000000..65ec4ee
--- /dev/null
+++ b/src/api/productionManagement/productStructureRecord.js
@@ -0,0 +1,20 @@
+// 鐢熶骇璁㈠崟棰嗘枡璁板綍鎺ュ彛
+import request from "@/utils/request";
+
+// 鏍规嵁璁㈠崟ID鏌ヨ鐗╂枡娓呭崟锛堥鏂欐暟鎹級
+export function listPage(query) {
+ return request({
+ url: "/productStructureRecord/listPage",
+ method: "get",
+ params: query,
+ });
+}
+
+// 棰嗘枡鎻愪氦
+export function pick(data) {
+ return request({
+ url: "/productStructureRecord/pick",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index a418280..04abd09 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -137,7 +137,7 @@
v-if="o.showHide ? o.showHide(scope.row) : true"
:disabled="o.disabled ? o.disabled(scope.row) : false"
:plain="o.plain"
- type="primary"
+ :type="o.type && ['primary', 'success', 'warning', 'danger', 'info'].includes(o.type) ? o.type : 'primary'"
:style="{
color:
o.name === '鍒犻櫎' || o.name === 'delete'
diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 51e5404..500145d 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -225,7 +225,14 @@
<el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="120" />
<el-table-column label="鍗曚綅浜у嚭闇�瑕佹暟閲�" min-width="140">
<template #default="{ row }">
- <el-input-number v-model="row.unitQuantity" :min="0" :precision="2" size="small" style="width: 100%" />
+ <el-input-number
+ v-model="row.unitQuantity"
+ :min="0"
+ :precision="2"
+ size="small"
+ style="width: 100%"
+ @change="(val) => handleUnitQuantityChange(val, row)"
+ />
</template>
</el-table-column>
<el-table-column label="闇�姹傛暟閲�" min-width="120">
@@ -477,16 +484,32 @@
});
};
+// 鐩戝惉鐗╂枡娓呭崟鍙樺寲锛屽綋鍗曚綅浜у嚭闇�瑕佹暟閲忓彉鍖栨椂閲嶆柊璁＄畻闇�姹傛暟閲�
+watch(() => productStructureRecords.value, (newRecords, oldRecords) => {
+ if (oldRecords && oldRecords.length > 0) {
+ oldRecords.forEach((oldItem, index) => {
+ const newItem = newRecords[index];
+ if (oldItem && newItem && newItem.unitQuantity !== oldItem.unitQuantity) {
+ newItem.demandedQuantity = (newItem.unitQuantity || 1) * (formState.value.quantity || 1);
+ }
+ });
+ }
+}, { deep: true });
+
// 鐩戝惉闇�姹傛暟閲忓彉鍖栵紝閲嶆柊璁＄畻鐗╂枡闇�姹傛暟閲�
watch(() => formState.value.quantity, (newQty) => {
if (productStructureRecords.value.length > 0 && newQty) {
- productStructureRecords.value = productStructureRecords.value.map(item => ({
- ...item,
- demandedQuantity: (item.unitQuantity || 1) * newQty
- }));
+ productStructureRecords.value.forEach(item => {
+ item.demandedQuantity = (item.unitQuantity || 1) * newQty;
+ });
}
});
+// 鍗曚綅浜у嚭闇�瑕佹暟閲忓彉鍖栧鐞�
+const handleUnitQuantityChange = (val, row) => {
+ row.demandedQuantity = (val || 1) * (formState.value.quantity || 1);
+};
+
// 宸ュ簭閫夋嫨鍙樺寲澶勭悊
const handleProcessChange = (processId, row) => {
const selectedProcess = processRouteItemsOptions.value.find(item => item.processId === processId);
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 8ba6699..6cd65b1 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -71,12 +71,82 @@
v-model:visible="isShowNewModal"
type="qualified"
@completed="handleQuery" />
+
+ <!-- 鏌ョ湅鎶曞叆寮规 -->
+ <el-dialog v-model="inputDialogVisible"
+ title="鎶曞叆"
+ width="1000px">
+ <PIMTable
+ rowKey="id"
+ :column="inputTableColumn"
+ :tableData="inputTableData"
+ :page="inputPage"
+ :tableLoading="inputTableLoading"
+ @pagination="handleInputPagination"
+ />
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="inputDialogVisible = false">鍏抽棴</el-button>
+ </div>
+ </template>
+ </el-dialog>
+
+ <!-- 棰嗘枡寮规 -->
+ <el-dialog v-model="pickingDialogVisible"
+ title="宸ュ崟棰嗘枡"
+ width="1200px"
+ :close-on-click-modal="false">
+
+ <el-table
+ :data="pickingTableData"
+ border
+ size="small"
+ @selection-change="handlePickingSelectionChange"
+ :header-cell-style="{ background: '#f5f7fa' }"
+ show-summary
+ :summary-method="summarizePickingTable"
+ >
+ <el-table-column type="selection" width="50" align="center" />
+ <el-table-column label="浜у搧鍚嶇О" prop="productName" min-width="120" />
+ <el-table-column label="鍥剧焊缂栧彿" prop="model" min-width="100" />
+ <el-table-column label="鍗曚綅鐢ㄩ噺" prop="unitQuantity" min-width="100" align="center" />
+ <el-table-column label="鍗曚綅" prop="unit" min-width="100" align="center" />
+ <el-table-column label="闇�姹傛暟閲�" prop="demandedQuantity" min-width="100" align="center" />
+ <el-table-column label="宸查鏂欐暟閲�" prop="completedQuantity" min-width="100" align="center" />
+ <el-table-column label="鏈鏂欐暟閲�" prop="unpickedQuantity" min-width="100" align="center" />
+ <el-table-column label="棰嗘枡鏁伴噺" min-width="180" align="center" prop="quantity">
+ <template #default="{ row }">
+ <el-input-number
+ v-model="row.quantity"
+ :min="0"
+ :max="row.unpickedQuantity"
+ :precision="0"
+ size="small"
+ style="width: 160px"
+ @change="(val) => handlePickingQuantityChange(val, row)"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ <div class="picking-footer-info">
+ <span>宸查�� {{ pickingSelectedRows.length }} 鏉�</span>
+ <span>{{ pickingTableData.length }} 鏉¤褰�</span>
+ </div>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="success" @click="handlePickingNext">纭</el-button>
+ <el-button @click="pickingDialogVisible = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+
</div>
</template>
<script setup>
- import { onMounted, ref } from "vue";
+ import { onMounted, ref, computed } from "vue";
import { ElMessageBox } from "element-plus";
+ import { Setting } from '@element-plus/icons-vue';
import dayjs from "dayjs";
import { useRouter } from "vue-router";
import {
@@ -86,6 +156,9 @@
listProcessBom, delProductOrder, startOrPause,
} from "@/api/productionManagement/productionOrder.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";
+
import {fileDel} from "@/api/financialManagement/revenueManagement.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
@@ -158,11 +231,11 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 240,
+ width: 360,
operation: [
{
name: "寮�濮�",
- type: "text",
+ type: "success",
showHide: row => row.status === '寰呯敓浜�',
clickFun: row => {
handleStartOrPause(row);
@@ -170,10 +243,17 @@
},
{
name: "鏆傚仠",
- type: "text",
+ type: "danger",
showHide: row => row.status === '鐢熶骇涓�',
clickFun: row => {
handleStartOrPause(row);
+ },
+ },
+ {
+ name: "棰嗘枡",
+ type: "success",
+ clickFun: row => {
+ showPickingDialog(row);
},
},
{
@@ -198,6 +278,13 @@
showProductStructure(row);
},
},
+ {
+ name: "鏌ョ湅鎶曞叆",
+ type: "text",
+ clickFun: row => {
+ showInputDialog(row);
+ },
+ },
],
},
]);
@@ -209,6 +296,43 @@
total: 0,
});
const selectedRows = ref([]);
+
+ // 鏌ョ湅鎶曞叆鐩稿叧
+ const inputDialogVisible = ref(false);
+ const inputTableData = ref([]);
+ const inputTableLoading = ref(false);
+ const inputCurrentRow = ref(null);
+ const inputPage = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
+ });
+ const inputTableColumn = ref([
+ {
+ label: '鎶曞叆浜у搧鍚嶇О',
+ prop: 'productName',
+ },
+ {
+ label: '鍥剧焊缂栧彿',
+ prop: 'model'
+ },
+ {
+ label: '鎶曞叆鏁伴噺',
+ prop: 'quantity',
+ },
+ {
+ label: '鍗曚綅',
+ prop: 'unit',
+ },
+ ]);
+
+ // 棰嗘枡鐩稿叧
+ const pickingDialogVisible = ref(false);
+ const pickingTableData = ref([]);
+ const pickingSelectedRows = ref([]);
+ const pickingForm = reactive({
+ orderId: null,
+ });
const data = reactive({
searchForm: {
@@ -459,6 +583,117 @@
const handleConfirmRoute = () => {};
+ // 鏄剧ず鏌ョ湅鎶曞叆寮规
+ const showInputDialog = (row) => {
+ inputCurrentRow.value = row;
+ inputDialogVisible.value = true;
+ inputPage.current = 1;
+ inputPage.total = 0;
+ fetchInputData();
+ };
+
+ // 鏌ョ湅鎶曞叆鍒嗛〉
+ const handleInputPagination = (obj) => {
+ inputPage.current = obj.page;
+ inputPage.size = obj.limit;
+ fetchInputData();
+ };
+
+ // 鑾峰彇鎶曞叆鏁版嵁
+ const fetchInputData = () => {
+ inputTableLoading.value = true;
+ const params = { productOrderId: inputCurrentRow.value.id, ...inputPage };
+ productionProductInputListPage(params)
+ .then(res => {
+ inputTableLoading.value = false;
+ inputTableData.value = res.data.records;
+ inputPage.total = res.data.total;
+ })
+ .catch(err => {
+ inputTableLoading.value = false;
+ console.error("鑾峰彇鎶曞叆鏁版嵁澶辫触锛�", err);
+ });
+ };
+
+ // 鏄剧ず棰嗘枡寮规
+ const showPickingDialog = async (row) => {
+ pickingForm.orderId = row.id;
+ pickingDialogVisible.value = true;
+ pickingTableData.value = [];
+
+ // 鑾峰彇鐗╂枡娓呭崟鏁版嵁
+ try {
+ const res = await listProductStructureRecord({ productOrderId: row.id });
+ const materials = res.data?.records || [];
+ pickingTableData.value = materials.map(item => ({
+ ...item,
+ quantity: 0,
+ unpickedQuantity: (item.demandedQuantity || 0) - (item.pickedQuantity || 0),
+ }));
+ } catch (e) {
+ console.error("鑾峰彇鐗╂枡娓呭崟澶辫触锛�", e);
+ proxy.$modal.msgError("鑾峰彇鐗╂枡娓呭崟澶辫触");
+ }
+ };
+
+ // 棰嗘枡琛ㄦ牸閫夋嫨鍙樺寲
+ const handlePickingSelectionChange = (selection) => {
+ pickingSelectedRows.value = selection;
+ };
+
+ // 棰嗘枡鏁伴噺鍙樺寲澶勭悊
+ const handlePickingQuantityChange = (val, row) => {
+ if (val > row.unpickedQuantity) {
+ proxy.$modal.msgWarning("棰嗘枡鏁伴噺涓嶈兘瓒呰繃鏈鏂欐暟閲�");
+ row.quantity = row.unpickedQuantity;
+ }
+ };
+
+ // 纭棰嗘枡
+ const handlePickingNext = async () => {
+ if (pickingSelectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨瑕侀鏂欑殑鐗╂枡");
+ return;
+ }
+ // 鏍￠獙棰嗘枡鏁伴噺
+ for (const row of pickingSelectedRows.value) {
+ if (row.quantity > row.unpickedQuantity) {
+ proxy.$modal.msgWarning(`${row.productName} 鐨勯鏂欐暟閲忎笉鑳借秴杩囨湭棰嗘枡鏁伴噺`);
+ return;
+ }
+ if (row.quantity <= 0) {
+ proxy.$modal.msgWarning(`${row.productName} 鐨勯鏂欐暟閲忓繀椤诲ぇ浜�0`);
+ return;
+ }
+ }
+
+ // 鎻愪氦棰嗘枡鏁版嵁
+ try {
+ const pickData = pickingSelectedRows.value.map(row => ({
+ productOrderId: row.productOrderId,
+ productStructureRecordId: row.id,
+ productModelId: row.productModelId,
+ quantity: row.quantity,
+ }));
+ await pickMaterial(pickData);
+ proxy.$modal.msgSuccess("棰嗘枡鎴愬姛");
+ pickingDialogVisible.value = false;
+ } catch (e) {
+ console.error("棰嗘枡澶辫触锛�", e);
+ proxy.$modal.msgError("棰嗘枡澶辫触");
+ }
+ };
+
+ // 棰嗘枡琛ㄦ牸鍚堣鏂规硶
+ const summarizePickingTable = (param) => {
+ return proxy.summarizeTable(param, [
+ "quantity",
+ "unpickedQuantity",
+ "inventoryQuantity",
+ "demandedQuantity",
+ ]);
+ };
+
onMounted(() => {
getList();
});
@@ -484,4 +719,13 @@
:deep(.purple){
background-color: #F4DEFA;
}
+
+.picking-footer-info {
+ display: flex;
+ justify-content: space-between;
+ padding: 10px;
+ font-size: 14px;
+ color: #606266;
+}
+
</style>
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f596301..9de948e 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -121,9 +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" />
</div>
</template>
@@ -138,7 +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";
+
const data = reactive({
searchForm: {
@@ -196,7 +193,7 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
- width: 120,
+ width: 180,
},
{
dataType: "action",
@@ -204,13 +201,6 @@
align: "center",
fixed: "right",
operation: [
- {
- name: "鏌ョ湅鎶曞叆",
- type: "text",
- clickFun: row => {
- showInput(row);
- },
- },
{
name: "鍒犻櫎",
type: "danger",
@@ -378,14 +368,6 @@
const rowInfo = type === "add" ? selectedRows.value[0] : row;
formDia.value?.openDialog(type, rowInfo);
});
- };
-
- // 鎵撳紑鎶曞叆妯℃�佹
- const isShowInput = ref(false);
- const isShowingId = ref(0);
- const showInput = row => {
- isShowInput.value = true;
- isShowingId.value = row.id;
};
// 瀵煎嚭
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index dd96f0f..f8b0594 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -228,6 +228,7 @@
downProductWorkOrder,
} from "@/api/productionManagement/workOrder.js";
import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
+
import QRCode from "qrcode";
import { getCurrentInstance, reactive, toRefs } from "vue";
import FilesDia from "./components/filesDia.vue";
@@ -649,6 +650,7 @@
justify-content: flex-start;
}
}
+
</style>
<style lang="scss">
--
Gitblit v1.9.3