From 8b154e4e32bdc351e18acae01fd75a718c12469d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 18 四月 2026 10:49:32 +0800
Subject: [PATCH] fix: 打印生产流程卡提示
---
src/views/salesManagement/salesLedger/index.vue | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 282b41d..f09b997 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -461,9 +461,7 @@
:key="item.id"
:label="item.customerName"
:value="item.id">
- {{
- item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
- }}
+ {{ item.customerName + (item.taxpayerIdentificationNumber ? "鈥斺��" + item.taxpayerIdentificationNumber : "") }}
</el-option>
</el-select>
</el-form-item>
@@ -585,7 +583,7 @@
</el-table-column>
<el-table-column label="瑙勬牸鍨嬪彿"
prop="specificationModel"
- min-width="160">
+ min-width="200">
<template #default="scope">
<el-select v-if="scope.row.__editing"
v-model="scope.row.productModelId"
@@ -607,10 +605,11 @@
min-width="160">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.thickness"
:min="0"
- :step="0.000000000000001"
- :precision="15"
+ :step="1"
+ :precision="2"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable />
@@ -622,6 +621,7 @@
min-width="160">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.width"
:min="0"
:step="1"
@@ -639,6 +639,7 @@
min-width="160">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.height"
:min="0"
:step="1"
@@ -653,13 +654,14 @@
</el-table-column>
<el-table-column label="缁撶畻鍗曠墖闈㈢Н(銕�)"
prop="settlePieceArea"
- min-width="160">
+ min-width="200">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.settlePieceArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="1"
+ :precision="10"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
@@ -672,10 +674,11 @@
min-width="150">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.quantity"
- :step="0.1"
+ :step="1"
:min="0"
- :precision="2"
+ :precision="0"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
@@ -686,13 +689,14 @@
</el-table-column>
<el-table-column label="闈㈢Н(m虏)"
prop="actualTotalArea"
- min-width="160">
+ min-width="200">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
+ controls-position="right"
v-model="scope.row.actualTotalArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="1"
+ :precision="10"
style="width: 100%"
placeholder="鑷姩璁＄畻" />
<span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
@@ -700,7 +704,7 @@
</el-table-column>
<el-table-column label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
- min-width="140">
+ min-width="160">
<template #default="scope">
<el-input-number v-if="scope.row.__editing"
:step="0.01"
@@ -792,7 +796,7 @@
</el-table-column>
<el-table-column label="妤煎眰缂栧彿"
prop="floorCode"
- min-width="140"
+ min-width="250"
show-overflow-tooltip>
<template #default="scope">
<el-input v-if="scope.row.__editing"
@@ -1525,9 +1529,10 @@
<FormDialog v-model="importUpload.open"
:title="importUpload.title"
:width="'600px'"
- @close="importUpload.open = false"
+ :loading="importUpload.isUploading"
+ @close="onClose"
@confirm="submitImportFile"
- @cancel="importUpload.open = false">
+ @cancel="onClose">
<el-upload ref="importUploadRef"
:limit="1"
accept=".xlsx,.xls"
@@ -1538,6 +1543,7 @@
:on-error="importUpload.onError"
:on-progress="importUpload.onProgress"
:on-change="importUpload.onChange"
+ :on-exceed="importUpload.onExceed"
:auto-upload="false"
drag>
<i class="el-icon-upload"></i>
@@ -2576,6 +2582,13 @@
onChange: (file, fileList) => {
console.log("鏂囦欢鐘舵�佹敼鍙�", file, fileList);
},
+ onExceed: (files, fileList) => {
+ if (importUploadRef.value) {
+ importUploadRef.value.clearFiles();
+ const file = files[0];
+ importUploadRef.value.handleStart(file);
+ }
+ },
onProgress: (event, file, fileList) => {
console.log("涓婁紶涓�...", event.percent);
},
@@ -3459,6 +3472,12 @@
const downloadTemplate = () => {
proxy.download("/sales/ledger/exportTemplate", {}, "閿�鍞彴璐﹀鍏ユā鏉�.xlsx");
};
+ const onClose = () => {
+ importUpload.open = false;
+ if (importUploadRef.value) {
+ importUploadRef.value.clearFiles();
+ }
+ };
// 鎻愪氦瀵煎叆鏂囦欢
const submitImportFile = () => {
@@ -3625,7 +3644,28 @@
} else {
const res = await getProcessCard(selectedId);
const processCardData = res?.data ?? {};
- printFinishedProcessCard(processCardData);
+ const routeNodes = processCardData?.routeNodes;
+ const isProcessRouteEmpty =
+ !Array.isArray(routeNodes) || routeNodes.length === 0;
+ if (isProcessRouteEmpty) {
+ proxy.$modal.closeLoading();
+ try {
+ await ElMessageBox.confirm(
+ "褰撳墠璁㈠崟鏈粦瀹氬伐鑹鸿矾绾夸篃娌℃湁璁剧疆榛樿鐨勫伐鑹鸿矾绾匡紝鏄惁浠嶈鎵撳嵃锛�",
+ "鎻愮ず",
+ {
+ confirmButtonText: "鎵撳嵃",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ } catch {
+ return;
+ }
+ printFinishedProcessCard(processCardData);
+ } else {
+ printFinishedProcessCard(processCardData);
+ }
}
} catch (error) {
console.error(
@@ -4052,7 +4092,7 @@
const isTrue = true;
selectedRows.value.forEach(row => {
if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
- proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍚堝苟鍙戣揣");
+ proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍙戣揣");
isTrue = false;
return;
}
--
Gitblit v1.9.3