From e1869c67a48da088650b0a1238ff718e5fc4138c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 29 九月 2026 09:15:21 +0800
Subject: [PATCH] refactor(data): 优化参数维护和报表数据显示格式
---
src/views/salesManagement/salesLedger/index.vue | 70 ++---------------------------------
1 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index c8940e5..132ee03 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -122,16 +122,6 @@
<span>{{ scope.row.pendingApprovalQuantity || 0 }}</span>
</template>
</el-table-column>
- <el-table-column
- label="蹇�掑叕鍙�"
- prop="expressCompany"
- show-overflow-tooltip
- />
- <el-table-column
- label="蹇�掑崟鍙�"
- prop="expressNumber"
- show-overflow-tooltip
- />
<el-table-column label="鍙戣揣杞︾墝" minWidth="100px" align="center">
<template #default="scope">
<div>
@@ -1227,7 +1217,6 @@
@change="handleDeliveryTypeChange"
>
<el-option label="璐ц溅" value="璐ц溅" />
- <el-option label="蹇��" value="蹇��" />
</el-select>
</el-form-item>
</el-col>
@@ -1241,31 +1230,11 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="24" v-if="deliveryForm.type === '璐ц溅'">
+ <el-col :span="24">
<el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
<el-input
v-model="deliveryForm.shippingCarNumber"
placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
- clearable
- />
- </el-form-item>
- </el-col>
- <el-col :span="24" v-else>
- <el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
- <el-input
- v-model="deliveryForm.expressCompany"
- placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30" v-if="deliveryForm.type === '蹇��'">
- <el-col :span="24">
- <el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
- <el-input
- v-model="deliveryForm.expressNumber"
- placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
clearable
/>
</el-form-item>
@@ -1698,18 +1667,10 @@
}
callback();
};
-const validateDeliveryExpressCompany = (_rule, value, callback) => {
- if (deliveryForm.value.type === "蹇��" && !value) {
- return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
- }
- callback();
-};
const deliveryFormData = reactive({
deliveryForm: {
shippingCarNumber: "",
- expressCompany: "",
- expressNumber: "",
- type: "璐ц溅", // 璐ц溅, 蹇��
+ type: "璐ц溅",
shippingDocument: "",
isReconciled: 0,
statementArchivingStatus: "",
@@ -1720,9 +1681,6 @@
deliveryRules: {
shippingCarNumber: [
{ validator: validateDeliveryShippingCarNumber, trigger: "blur" },
- ],
- expressCompany: [
- { validator: validateDeliveryExpressCompany, trigger: "blur" },
],
type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
},
@@ -3170,8 +3128,6 @@
);
deliveryForm.value = {
shippingCarNumber: "",
- expressCompany: "",
- expressNumber: "",
type: "璐ц溅",
batchNo: [],
batchNoList,
@@ -3214,18 +3170,7 @@
salesLedgerId: salesLedgerId,
salesLedgerProductId: currentDeliveryRow.value.id,
type: deliveryForm.value.type,
- shippingCarNumber:
- deliveryForm.value.type === "璐ц溅"
- ? deliveryForm.value.shippingCarNumber
- : "",
- expressCompany:
- deliveryForm.value.type === "蹇��"
- ? deliveryForm.value.expressCompany
- : "",
- expressNumber:
- deliveryForm.value.type === "蹇��"
- ? deliveryForm.value.expressNumber
- : "",
+ shippingCarNumber: deliveryForm.value.shippingCarNumber,
storageBlobDTOs: deliveryFileList.value || [],
batchNo: deliveryForm.value.batchNo,
batchNoDetailList: selectedBatchRows.map((item) => ({
@@ -3266,14 +3211,7 @@
};
// 鍏抽棴鍙戣揣寮规
-const handleDeliveryTypeChange = (val) => {
- if (val === "璐ц溅") {
- deliveryForm.value.expressCompany = "";
- deliveryForm.value.expressNumber = "";
- } else {
- deliveryForm.value.shippingCarNumber = "";
- }
-};
+const handleDeliveryTypeChange = () => {};
const closeDeliveryDia = () => {
proxy.resetForm("deliveryFormRef");
--
Gitblit v1.9.3