From 474c2a6516139ccbafecd5fc3d139ee9104ecfd5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 31 三月 2026 17:28:21 +0800
Subject: [PATCH] 军泰伟业app 1.销售台账、采购台账选择产品逻辑修改 2.新增生产订单时将产品那边的图纸带过来 3.生产订单增加退料功能
---
src/views/productionManagement/productionOrder/index.vue | 711 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 632 insertions(+), 79 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index d181d51..7984915 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"
@@ -63,6 +39,19 @@
:status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
/>
</template>
+ <template #productWorkOrders="{ row }">
+ <div class="work-order-circles">
+ <div
+ v-for="(workOrder, index) in row.productWorkOrders"
+ :key="index"
+ class="work-order-circle"
+ :class="getWorkOrderColorClass(workOrder.color)"
+ :title="workOrder.processName || workOrder.workOrderNo"
+ >
+ {{ workOrder.processName ? workOrder.processName.substring(0, 2) : index + 1 }}
+ </div>
+ </div>
+ </template>
</PIMTable>
</div>
<el-dialog v-model="bindRouteDialogVisible"
@@ -76,39 +65,172 @@
: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>
<new-product-order v-if="isShowNewModal"
v-model:visible="isShowNewModal"
+ type="qualified"
@completed="handleQuery" />
+
+ <!-- 鏌ョ湅鎶曞叆寮规 -->
+ <el-dialog v-model="inputDialogVisible"
+ title="鎶曞叆涓庨��鏂�"
+ width="1200px"
+ :close-on-click-modal="false">
+ <el-table
+ :data="inputTableData"
+ border
+ size="small"
+ @selection-change="handleInputSelectionChange"
+ :header-cell-style="{ background: '#f5f7fa' }"
+ show-summary
+ :summary-method="summarizeInputTable"
+ >
+ <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="quantity" min-width="100" align="center" />
+ <el-table-column label="宸查��鏂欐暟閲�" prop="returnQuantity" min-width="100" align="center" />
+ <el-table-column label="鍗曚綅" prop="unit" min-width="80" align="center" />
+ <el-table-column label="鏈閫�鏂欐暟閲�" min-width="180" align="center" prop="currentReturnQuantity">
+ <template #default="{ row }">
+ <el-input-number
+ v-model="row.currentReturnQuantity"
+ :min="0"
+ :max="row.quantity - (row.returnQuantity || 0)"
+ :precision="0"
+ size="small"
+ style="width: 160px"
+ @change="(val) => handleInputReturnQuantityChange(val, row)"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ <div class="picking-footer-info">
+ <span>宸查�� {{ inputSelectedRows.length }} 鏉�</span>
+ <span>{{ inputTableData.length }} 鏉¤褰�</span>
+ </div>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="warning" @click="handleReturnSubmit">纭閫�鏂�</el-button>
+ <el-button @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>
+
+ <!-- 鏌ョ湅鍥剧焊寮圭獥 -->
+ <el-dialog
+ v-model="drawingDialogVisible"
+ title="鏌ョ湅鍥剧焊"
+ width="800px"
+ :close-on-click-modal="false"
+ >
+ <div class="drawing-container">
+ <div v-if="currentDrawingFiles.length === 0" class="empty-drawing">
+ <el-empty description="鏆傛棤鍥剧焊" />
+ </div>
+ <div v-else class="drawing-list">
+ <div v-for="(file, index) in currentDrawingFiles" :key="index" class="drawing-item">
+ <el-image
+ v-if="isImage(file.name)"
+ :src="getFileUrl(file)"
+ :preview-src-list="imagePreviewList"
+ fit="cover"
+ style="width: 150px; height: 150px; border-radius: 4px; cursor: pointer;"
+ />
+ <div v-else class="file-item" @click="downloadFile(file)">
+ <el-icon :size="50"><Document /></el-icon>
+ <span class="file-name">{{ file.name }}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="drawingDialogVisible = 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, Document } from '@element-plus/icons-vue';
import dayjs from "dayjs";
import { useRouter } from "vue-router";
import {
- productOrderListPage,
- listProcessRoute,
- bindingRoute,
- listProcessBom, delProductOrder,
- } 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, returnMaterial } 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"));
@@ -118,21 +240,71 @@
const router = useRouter();
const isShowNewModal = ref(false);
+ // 鏌ョ湅鍥剧焊鐩稿叧
+ const drawingDialogVisible = ref(false);
+ const currentDrawingFiles = ref([]);
+
+ // 鍒ゆ柇鏄惁涓哄浘鐗�
+ const isImage = (fileName) => {
+ if (!fileName) return false;
+ const ext = fileName.toLowerCase().split('.').pop();
+ return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(ext);
+ };
+
+ // 鑾峰彇鏂囦欢URL
+ const getFileUrl = (file) => {
+ if (file.url) {
+ if (file.url.startsWith('http')) {
+ return file.url;
+ }
+ return import.meta.env.VITE_APP_BASE_API + file.url;
+ }
+ return '';
+ };
+
+ // 鍥剧墖棰勮鍒楄〃
+ const imagePreviewList = computed(() => {
+ return currentDrawingFiles.value
+ .filter(file => isImage(file.name))
+ .map(file => getFileUrl(file));
+ });
+
+ // 涓嬭浇鏂囦欢
+ const downloadFile = (file) => {
+ const url = getFileUrl(file);
+ if (url) {
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = file.name;
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ }
+ };
+
+ // 鏄剧ず鏌ョ湅鍥剧焊寮圭獥
+ const showDrawingDialog = (row) => {
+ currentDrawingFiles.value = row.salesLedgerFiles || [];
+ drawingDialogVisible.value = true;
+ };
+
+ // 鑾峰彇宸ュ崟鍦嗗湀棰滆壊绫诲悕
+ // color: 1-鐏拌壊 2-榛勮壊 3-缁胯壊 4-绾㈣壊
+ const getWorkOrderColorClass = (color) => {
+ const colorMap = {
+ 1: 'gray',
+ 2: 'yellow',
+ 3: 'green',
+ 4: 'red'
+ };
+ return colorMap[color] || 'gray';
+ };
+
const tableColumn = ref([
{
label: "鐢熶骇璁㈠崟鍙�",
prop: "npsNo",
width: '120px',
- },
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: '150px',
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: '200px',
},
{
label: "浜у搧鍚嶇О",
@@ -141,13 +313,8 @@
},
{
label: "鍥剧焊缂栧彿",
- prop: "drawingNumber",
- width: '160px',
- },
- {
- label: "瑙勬牸",
prop: "specificationModel",
- width: '120px',
+ width: '160px',
},
{
label: "宸ヨ壓璺嚎缂栧彿",
@@ -161,6 +328,17 @@
{
label: "瀹屾垚鏁伴噺",
prop: "completeQuantity",
+ },
+ {
+ label: "搴撳瓨鏁伴噺",
+ prop: "inventoryQuantity",
+ },
+ {
+ dataType: "slot",
+ label: "宸ュ簭",
+ prop: "productWorkOrders",
+ slot: "productWorkOrders",
+ width: 200,
},
{
dataType: "slot",
@@ -192,8 +370,31 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 200,
+ width: 420,
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",
@@ -201,19 +402,34 @@
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: "浜у搧缁撴瀯",
+ name: "鐗╂枡娓呭崟",
type: "text",
clickFun: row => {
showProductStructure(row);
+ },
+ },
+ {
+ name: "鎶曞叆/閫�鏂�",
+ type: "text",
+ clickFun: row => {
+ showInputDialog(row);
+ },
+ },
+ {
+ name: "鏌ョ湅鍥剧焊",
+ type: "text",
+ showHide: row => row.salesLedgerFiles && row.salesLedgerFiles.length > 0,
+ clickFun: row => {
+ showDrawingDialog(row);
},
},
],
@@ -228,13 +444,32 @@
});
const selectedRows = ref([]);
+ // 鏌ョ湅鎶曞叆鐩稿叧
+ const inputDialogVisible = ref(false);
+ const inputTableData = ref([]);
+ const inputTableLoading = ref(false);
+ const inputCurrentRow = ref(null);
+ const inputSelectedRows = ref([]);
+ const inputPage = reactive({
+ current: 1,
+ size: 100,
+ total: 0,
+ });
+
+ // 棰嗘枡鐩稿叧
+ 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);
@@ -262,6 +497,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) {
@@ -288,15 +525,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("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触");
@@ -368,11 +600,12 @@
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: {
@@ -393,12 +626,37 @@
}
};
- 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 || "",
@@ -452,6 +710,173 @@
const handleConfirmRoute = () => {};
+ // 鏄剧ず鏌ョ湅鎶曞叆寮规
+ const showInputDialog = async (row) => {
+ inputCurrentRow.value = row;
+ inputDialogVisible.value = true;
+ inputPage.current = 1;
+ inputPage.total = 0;
+ inputSelectedRows.value = [];
+ 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.map(item => ({
+ ...item,
+ currentReturnQuantity: 0,
+ }));
+ 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.completedQuantity || 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",
+ ]);
+ };
+
+ // 鎶曞叆琛ㄦ牸閫夋嫨鍙樺寲
+ const handleInputSelectionChange = (selection) => {
+ inputSelectedRows.value = selection;
+ };
+
+ // 鎶曞叆閫�鏂欐暟閲忓彉鍖栧鐞�
+ const handleInputReturnQuantityChange = (val, row) => {
+ const maxReturn = row.quantity - (row.returnQuantity || 0);
+ if (val > maxReturn) {
+ proxy.$modal.msgWarning("鏈閫�鏂欐暟閲忎笉鑳借秴杩囧墿浣欏彲閫�鏁伴噺");
+ row.currentReturnQuantity = maxReturn;
+ }
+ };
+
+ // 纭閫�鏂�
+ const handleReturnSubmit = async () => {
+ if (inputSelectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨瑕侀��鏂欑殑鐗╂枡");
+ return;
+ }
+ // 鏍￠獙閫�鏂欐暟閲�
+ const invalidRows = inputSelectedRows.value.filter(row => !row.currentReturnQuantity || row.currentReturnQuantity <= 0);
+ if (invalidRows.length > 0) {
+ proxy.$modal.msgWarning("璇峰～鍐欐湰娆￠��鏂欐暟閲�");
+ return;
+ }
+
+ const returnData = inputSelectedRows.value.map(row => ({
+ ...row,
+ returnQuantity: row.currentReturnQuantity,
+ }));
+
+ try {
+ await returnMaterial(returnData);
+ proxy.$modal.msgSuccess("閫�鏂欐垚鍔�");
+ inputDialogVisible.value = false;
+ getList();
+ } catch (e) {
+ console.error("閫�鏂欏け璐ワ細", e);
+ proxy.$modal.msgError("閫�鏂欏け璐�");
+ }
+ };
+
+ // 鎶曞叆琛ㄦ牸鍚堣鏂规硶
+ const summarizeInputTable = (param) => {
+ return proxy.summarizeTable(param, [
+ "quantity",
+ "returnQuantity",
+ "currentReturnQuantity",
+ ]);
+ };
+
onMounted(() => {
getList();
});
@@ -462,19 +887,147 @@
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;
+}
+
+.drawing-container {
+ min-height: 200px;
+}
+
+.empty-drawing {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ min-height: 200px;
+}
+
+.drawing-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+ padding: 10px;
+}
+
+.drawing-item {
+ border: 1px solid #dcdfe6;
+ border-radius: 4px;
+ overflow: hidden;
+ transition: all 0.3s;
+
+ &:hover {
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
+}
+
+.file-item {
+ width: 150px;
+ height: 150px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ background: #f5f7fa;
+ cursor: pointer;
+ padding: 10px;
+
+ .file-name {
+ font-size: 12px;
+ color: #606266;
+ margin-top: 10px;
+ text-align: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ max-width: 130px;
+ }
+
+ &:hover {
+ background: #e4e7ed;
+ }
+}
+
+// 宸ュ崟鍦嗗湀鏍峰紡
+.work-order-circles {
+ display: flex;
+ gap: 8px;
+ flex-wrap: wrap;
+ align-items: center;
+}
+
+.work-order-circle {
+ width: 32px;
+ height: 32px;
+ border-radius: 6px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 12px;
+ font-weight: 500;
+ color: #fff;
+ cursor: pointer;
+ transition: all 0.2s ease;
+
+ // 鐏拌壊 - 寰呭紑濮�
+ &.gray {
+ background-color: #909399;
+
+ &:hover {
+ background-color: #a6a9ad;
+ }
+ }
+
+ // 榛勮壊 - 杩涜涓�
+ &.yellow {
+ background-color: #e6a23c;
+
+ &:hover {
+ background-color: #ebb563;
+ }
+ }
+
+ // 缁胯壊 - 宸插畬鎴�
+ &.green {
+ background-color: #67c23a;
+
+ &:hover {
+ background-color: #85ce61;
+ }
+ }
+
+ // 绾㈣壊 - 寮傚父/鏆傚仠
+ &.red {
+ background-color: #f56c6c;
+
+ &:hover {
+ background-color: #f78989;
+ }
+ }
+
+ &:hover {
+ transform: translateY(-2px);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+ }
+}
+
</style>
--
Gitblit v1.9.3