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/index.vue | 362 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 310 insertions(+), 52 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 761139e..6cd65b1 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -3,32 +3,8 @@
<div class="search_form">
<el-form :model="searchForm"
:inline="true">
- <el-form-item label="瀹㈡埛鍚嶇О:">
- <el-input v-model="searchForm.customerName"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 160px;"
- @change="handleQuery" />
- </el-form-item>
- <el-form-item label="鍚堝悓鍙�:">
- <el-input v-model="searchForm.salesContractNo"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 160px;"
- @change="handleQuery" />
- </el-form-item>
<el-form-item label="浜у搧鍚嶇О:">
<el-input v-model="searchForm.productCategory"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 160px;"
- @change="handleQuery" />
- </el-form-item>
- <el-form-item label="瑙勬牸:">
- <el-input v-model="searchForm.specificationModel"
placeholder="璇疯緭鍏�"
clearable
prefix-icon="Search"
@@ -93,22 +69,96 @@
<new-product-order v-if="isShowNewModal"
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 {
productOrderListPage,
listProcessRoute,
bindingRoute,
- listProcessBom, delProductOrder,
+ 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"));
@@ -125,24 +175,14 @@
width: '120px',
},
{
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
- },
- {
label: "浜у搧鍚嶇О",
prop: "productCategory",
width: '120px',
},
{
- label: "瑙勬牸",
+ label: "鍥剧焊缂栧彿",
prop: "specificationModel",
- width: '120px',
+ width: '160px',
},
{
label: "宸ヨ壓璺嚎缂栧彿",
@@ -156,6 +196,10 @@
{
label: "瀹屾垚鏁伴噺",
prop: "completeQuantity",
+ },
+ {
+ label: "搴撳瓨鏁伴噺",
+ prop: "inventoryQuantity",
},
{
dataType: "slot",
@@ -187,8 +231,31 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 200,
+ width: 360,
operation: [
+ {
+ name: "寮�濮�",
+ type: "success",
+ showHide: row => row.status === '寰呯敓浜�',
+ clickFun: row => {
+ handleStartOrPause(row);
+ },
+ },
+ {
+ name: "鏆傚仠",
+ type: "danger",
+ showHide: row => row.status === '鐢熶骇涓�',
+ clickFun: row => {
+ handleStartOrPause(row);
+ },
+ },
+ {
+ name: "棰嗘枡",
+ type: "success",
+ clickFun: row => {
+ showPickingDialog(row);
+ },
+ },
{
name: "宸ヨ壓璺嚎",
type: "text",
@@ -205,10 +272,17 @@
},
},
{
- name: "浜у搧缁撴瀯",
+ name: "鐗╂枡娓呭崟",
type: "text",
clickFun: row => {
showProductStructure(row);
+ },
+ },
+ {
+ name: "鏌ョ湅鎶曞叆",
+ type: "text",
+ clickFun: row => {
+ showInputDialog(row);
},
},
],
@@ -223,13 +297,47 @@
});
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: {
- customerName: "",
- salesContractNo: "",
projectName: "",
productCategory: "",
- specificationModel: "",
},
});
const { searchForm } = toRefs(data);
@@ -257,6 +365,8 @@
if (row.isFh) return '';
const diff = row.deliveryDaysDiff;
+ if (diff === undefined || diff === null || diff === '' || diff < 0) return '';
+
if (diff === 15) {
return 'yellow';
} else if (diff === 10) {
@@ -363,17 +473,19 @@
const orderId = row.id;
try {
const res = await getOrderProcessRouteMain(orderId);
- const data = res.data || {};
- if (!data || !data.id) {
+ const dataList = res.data || [];
+ if (!dataList || dataList.length === 0 || !dataList[0].id) {
proxy.$modal.msgWarning("鏈壘鍒板叧鑱旂殑宸ヨ壓璺嚎");
return;
}
+ const data = dataList[0];
router.push({
path: "/productionManagement/processRouteItem",
query: {
id: data.id,
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
+ drawingNumber: data.drawingNumber || "",
model: data.model || "",
bomNo: data.bomNo || "",
description: data.description || "",
@@ -387,12 +499,38 @@
}
};
- const showProductStructure = row => {
+ const handleStartOrPause = async (row) => {
+ const operation = row.status === '寰呯敓浜�' ? 1 : 2;
+ const operationText = operation === 1 ? "寮�濮�" : "鏆傚仠";
+ try {
+ await startOrPause({ id: row.id, operation });
+ proxy.$modal.msgSuccess(`${operationText}鎴愬姛`);
+ getList();
+ } catch (e) {
+ console.error(`${operationText}澶辫触锛歚, e);
+ proxy.$modal.msgError(`${operationText}澶辫触`);
+ }
+ };
+
+ const showProductStructure = async row => {
+ let bomNo = row.bomNo || "";
+ if (!bomNo && row.id) {
+ try {
+ const res = await getOrderProcessRouteMain(row.id);
+ const dataList = res.data || [];
+ if (dataList && dataList.length > 0 && dataList[0].bomNo) {
+ bomNo = dataList[0].bomNo;
+ }
+ } catch (e) {
+ console.error("鑾峰彇BOM缂栧彿澶辫触锛�", e);
+ }
+ }
router.push({
path: "/productionManagement/productStructureDetail",
query: {
id: row.id,
- bomNo: row.bomNo || "",
+ bomNo: bomNo,
+ drawingNumber: row.drawingNumber || "",
productName: row.productCategory || "",
productModelName: row.specificationModel || "",
orderId: row.id,
@@ -445,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();
});
@@ -455,19 +704,28 @@
align-items: start;
}
-::v-deep .yellow {
+:deep(.yellow) {
background-color: #FAF0DE;
}
-::v-deep .pink {
+:deep(.pink) {
background-color: #FAE1DE;
}
-::v-deep .red {
- background-color: #f80202;
+:deep(.red) {
+ background-color: #FFCCCC;
}
-::v-deep .purple{
+:deep(.purple){
background-color: #F4DEFA;
}
+
+.picking-footer-info {
+ display: flex;
+ justify-content: space-between;
+ padding: 10px;
+ font-size: 14px;
+ color: #606266;
+}
+
</style>
--
Gitblit v1.9.3