From eee1310bc134b2bb7c8a406750cb64e9fe226ac2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 29 九月 2026 11:25:29 +0800
Subject: [PATCH] chore: 薪火智能配置文件
---
src/views/salesManagement/salesLedger/index.vue | 180 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 137 insertions(+), 43 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index fbb0da6..203b688 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -108,6 +108,8 @@
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit" />
+ <el-table-column label="浠舵暟"
+ prop="packagingSpec" />
<el-table-column label="浜у搧鐘舵��"
width="100px"
align="center">
@@ -130,6 +132,21 @@
<el-tag :type="getShippingStatusType(scope.row)"
size="small">
{{ getShippingStatusText(scope.row) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍙戣揣绫诲瀷"
+ width="100"
+ align="center">
+ <template #default="scope">
+ <el-tag v-if="getShippingTypeText(scope.row)"
+ :type="getShippingTypeTag(scope.row)"
+ size="small">
+ {{ getShippingTypeText(scope.row) }}
+ </el-tag>
+ <el-tag v-else
+ type="info"
+ size="small">-
</el-tag>
</template>
</el-table-column>
@@ -253,11 +270,17 @@
type="primary"
@click="openForm('view', scope.row)">璇︽儏
</el-button>
- <el-button link
- type="primary"
- @click="openForm('edit', scope.row)"
- :disabled="!scope.row.isEdit || scope.row.hasProductionRecord || !canEditLedger(scope.row)">缂栬緫
- </el-button>
+ <el-tooltip :content="editDisabledReason(scope.row)"
+ :disabled="!editDisabledReason(scope.row)"
+ placement="top">
+ <span>
+ <el-button link
+ type="primary"
+ @click="openForm('edit', scope.row)"
+ :disabled="isLedgerEditDisabled(scope.row)">缂栬緫
+ </el-button>
+ </span>
+ </el-tooltip>
<el-button link
type="primary"
@click="openFileDialog(scope.row)">闄勪欢
@@ -462,6 +485,8 @@
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit" />
+ <el-table-column label="浠舵暟"
+ prop="packagingSpec" />
<el-table-column label="鏁伴噺"
prop="quantity" />
<el-table-column label="绋庣巼(%)"
@@ -656,6 +681,15 @@
:label="dict.label"
:value="dict.value" />
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="浠舵暟锛�"
+ prop="packagingSpec">
+ <el-input v-model="productForm.packagingSpec"
+ clearable />
</el-form-item>
</el-col>
</el-row>
@@ -941,6 +975,8 @@
value="璐ц溅" />
<el-option label="蹇��"
value="蹇��" />
+ <el-option label="鑷��"
+ value="鑷��" />
</el-select>
</el-form-item>
</el-col>
@@ -950,10 +986,16 @@
disabled />
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="宸查�夋嫨鍙戣揣鏁伴噺锛�">
+ <el-input :model-value="selectedDeliveryQuantity"
+ disabled />
+ </el-form-item>
+ </el-col>
</el-row>
- <el-row :gutter="30">
- <el-col :span="24"
- v-if="deliveryForm.type === '璐ц溅'">
+ <el-row :gutter="30"
+ v-if="deliveryForm.type === '璐ц溅'">
+ <el-col :span="24">
<el-form-item label="鍙戣揣杞︾墝鍙凤細"
prop="shippingCarNumber">
<el-input v-model="deliveryForm.shippingCarNumber"
@@ -961,8 +1003,10 @@
clearable />
</el-form-item>
</el-col>
- <el-col :span="24"
- v-else>
+ </el-row>
+ <el-row :gutter="30"
+ v-else-if="deliveryForm.type === '蹇��'">
+ <el-col :span="24">
<el-form-item label="蹇�掑叕鍙革細"
prop="expressCompany">
<el-input v-model="deliveryForm.expressCompany"
@@ -1088,6 +1132,7 @@
tableAmountFormatter,
formatDecimal,
buildAmountSummaryFormat,
+ roundAmount,
} from "@/utils/numberFormat";
import ImageUpload from "@/components/AttachmentUpload/image/index.vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
@@ -1169,6 +1214,7 @@
productModelId: "",
specificationModel: "",
unit: "",
+ packagingSpec: "",
quantity: "",
taxInclusiveUnitPrice: "",
taxRate: "",
@@ -1250,7 +1296,7 @@
rawList.forEach(item => {
total += Number(getDeliveryBatchQuantity(item) || 0);
});
- currentStock.value = total;
+ currentStock.value = roundAmount(total);
} catch (e) {
console.error(e);
currentStock.value = 0;
@@ -1259,35 +1305,45 @@
const getCurrentDeliveryRowQuantity = () => {
return Number(currentDeliveryRow.value?.noQuantity || 0);
};
+ const selectedDeliveryQuantity = computed(() => {
+ return roundAmount(
+ (deliveryForm.value.batchNoList || []).reduce(
+ (sum, item) => sum + Number(item?.deliveryQuantity || 0),
+ 0
+ )
+ );
+ });
const getDeliveryBatchDeliveryMax = row => {
const productQuantity = getCurrentDeliveryRowQuantity();
const batchQuantity = Number(getDeliveryBatchQuantity(row) || 0);
- const otherBatchTotal = (deliveryForm.value.batchNoList || []).reduce(
- (sum, item) => {
- if (item?.id === row?.id) return sum;
- return sum + Number(item?.deliveryQuantity || 0);
- },
- 0
+ const otherBatchTotal = roundAmount(
+ (deliveryForm.value.batchNoList || []).reduce(
+ (sum, item) => {
+ if (item?.id === row?.id) return sum;
+ return sum + Number(item?.deliveryQuantity || 0);
+ },
+ 0
+ )
);
- const remainingProductQuantity = Math.max(
- 0,
- productQuantity - otherBatchTotal
+ const remainingProductQuantity = roundAmount(
+ Math.max(0, productQuantity - otherBatchTotal)
);
return Math.max(0, Math.min(batchQuantity, remainingProductQuantity));
};
const handleDeliveryBatchQuantityChange = row => {
const productQuantity = getCurrentDeliveryRowQuantity();
const batchQuantity = Number(getDeliveryBatchQuantity(row) || 0);
- const otherBatchTotal = (deliveryForm.value.batchNoList || []).reduce(
- (sum, item) => {
- if (item?.id === row?.id) return sum;
- return sum + Number(item?.deliveryQuantity || 0);
- },
- 0
+ const otherBatchTotal = roundAmount(
+ (deliveryForm.value.batchNoList || []).reduce(
+ (sum, item) => {
+ if (item?.id === row?.id) return sum;
+ return sum + Number(item?.deliveryQuantity || 0);
+ },
+ 0
+ )
);
- const remainingProductQuantity = Math.max(
- 0,
- productQuantity - otherBatchTotal
+ const remainingProductQuantity = roundAmount(
+ Math.max(0, productQuantity - otherBatchTotal)
);
const currentValue = Number(row?.deliveryQuantity || 0);
@@ -1341,7 +1397,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- type: "璐ц溅", // 璐ц溅, 蹇��
+ type: "璐ц溅", // 璐ц溅, 蹇��, 鑷��
},
deliveryRules: {
shippingCarNumber: [
@@ -1507,6 +1563,18 @@
};
const canEditLedger = row => isCurrentUserMaintainer(row);
const canDeleteLedger = row => isCurrentUserMaintainer(row);
+ /**
+ * 闇�瑕佺敓浜х殑璁㈠崟锛氱敓浜ц鍒掑凡涓嬪彂锛堝惈閮ㄥ垎涓嬪彂锛夊悗涓嶅彲缂栬緫锛�
+ * 璧板簱瀛樼殑璁㈠崟锛氬凡鍙戣揣鍚庝笉鍙紪杈戯紝鍚﹀垯鍙互缂栬緫銆�
+ */
+ const editDisabledReason = row => {
+ if (!row) return "";
+ if (!canEditLedger(row)) return "褰撳墠绯荤粺鐧诲綍浜轰笉鏄淮鎶や汉锛屼笉鑳界紪杈戞暟鎹�";
+ if (row.hasProductionRecord) return "鐢熶骇璁″垝宸蹭笅鍙戯紝涓嶈兘缂栬緫";
+ if (!row.isEdit) return "璁㈠崟宸插彂璐э紝涓嶈兘缂栬緫";
+ return "";
+ };
+ const isLedgerEditDisabled = row => !!editDisabledReason(row);
const sensitiveAmountFormatter = (row, column, cellValue) => {
if (!isCurrentUserMaintainer(row)) {
return "*****";
@@ -1683,9 +1751,12 @@
};
// 鎵撳紑寮规
const openForm = async (type, row) => {
- if (type === "edit" && row && !canEditLedger(row)) {
- proxy.$modal.msgWarning("褰撳墠绯荤粺鐧诲綍浜轰笉鏄淮鎶や汉锛屼笉鑳界紪杈戞暟鎹�");
- return;
+ if (type === "edit" && row) {
+ const disabledReason = editDisabledReason(row);
+ if (disabledReason) {
+ proxy.$modal.msgWarning(disabledReason);
+ return;
+ }
}
operationType.value = type;
form.value = {};
@@ -2426,16 +2497,33 @@
};
/**
+ * 鑾峰彇鍙戣揣绫诲瀷鏂囨湰锛堣揣杞�/蹇��/鑷�侊級
+ * 瀛愯〃琛屾湭杩斿洖鍙戣揣绫诲瀷瀛楁锛屼緷鎹簰鏂ョ殑鍙戣揣淇℃伅鎺ㄦ柇锛�
+ * 鏈夎溅鐗屼负璐ц溅锛屾湁蹇�掑叕鍙�/鍗曞彿涓哄揩閫掞紝宸插彂璐т絾涓よ�呯殕鏃犱负鑷��
+ */
+ const getShippingTypeText = row => {
+ if (!row) return "";
+ if (row.shippingCarNumber) return "璐ц溅";
+ if (row.expressCompany || row.expressNumber) return "蹇��";
+ if (row.shippingDate) return "鑷��";
+ return "";
+ };
+
+ const getShippingTypeTag = row => {
+ const type = getShippingTypeText(row);
+ const typeTagMap = {
+ 璐ц溅: "warning",
+ 蹇��: "primary",
+ 鑷��: "success",
+ };
+ return typeTagMap[type] || "info";
+ };
+
+ /**
* 鍒ゆ柇鏄惁鍙互鍙戣揣
- * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐у拰瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣
* @param row 琛屾暟鎹�
*/
const canShip = row => {
- // 浜у搧鐘舵�佸繀椤绘槸鍏呰冻锛坅pproveStatus === 1锛�
- if (row.approveStatus !== 1) {
- return false;
- }
-
// 鑾峰彇鍙戣揣鐘舵��
const shippingStatus = row.shippingStatus;
@@ -2490,7 +2578,7 @@
// 妫�鏌ユ槸鍚﹀彲浠ュ彂璐�
if (!canShip(row)) {
proxy.$modal.msgWarning(
- "鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐ф垨瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣"
+ "鍙湁鍦ㄥ彂璐х姸鎬佹槸寰呭彂璐с�佸鏍告嫆缁濇垨閮ㄥ垎鍙戣揣鐨勬椂鍊欐墠鍙互鍙戣揣"
);
return;
}
@@ -2521,9 +2609,11 @@
proxy.$modal.msgWarning("璇疯嚦灏戝~鍐欎竴涓壒鍙风殑鍙戣揣鏁伴噺");
return;
}
- const totalDeliveryQuantity = selectedBatchRows.reduce(
- (sum, item) => sum + Number(item.deliveryQuantity || 0),
- 0
+ const totalDeliveryQuantity = roundAmount(
+ selectedBatchRows.reduce(
+ (sum, item) => sum + Number(item.deliveryQuantity || 0),
+ 0
+ )
);
const currentRowNoQuantity = Number(
currentDeliveryRow.value?.noQuantity || 0
@@ -2605,8 +2695,12 @@
if (val === "璐ц溅") {
deliveryForm.value.expressCompany = "";
deliveryForm.value.expressNumber = "";
+ } else if (val === "蹇��") {
+ deliveryForm.value.shippingCarNumber = "";
} else {
deliveryForm.value.shippingCarNumber = "";
+ deliveryForm.value.expressCompany = "";
+ deliveryForm.value.expressNumber = "";
}
};
--
Gitblit v1.9.3