From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:00:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/procurementLedger/index.vue | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 5ac4a96..1465d16 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -76,37 +76,50 @@
<el-table-column
label="閲囪喘鍚堝悓鍙�"
prop="purchaseContractNumber"
+ width="200"
show-overflow-tooltip
/>
<el-table-column
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
+ width="200"
show-overflow-tooltip
/>
<el-table-column
label="渚涘簲鍟嗗悕绉�"
+ width="240"
prop="supplierName"
show-overflow-tooltip
/>
<el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
+ width="100"
+ show-overflow-tooltip
+ />
+ <el-table-column
+ label="浠樻鏂瑰紡"
+ width="100"
+ prop="paymentMethod"
show-overflow-tooltip
/>
<el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
+ width="100"
show-overflow-tooltip
:formatter="formattedNumber"
/>
<el-table-column
label="褰曞叆浜�"
prop="recorderName"
+ width="100"
show-overflow-tooltip
/>
<el-table-column
label="褰曞叆鏃ユ湡"
prop="entryDate"
+ width="100"
show-overflow-tooltip
/>
<el-table-column
@@ -231,6 +244,17 @@
format="YYYY-MM-DD"
type="date"
placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="浠樻鏂瑰紡">
+ <el-input
+ v-model="form.paymentMethod"
+ placeholder="璇疯緭鍏�"
clearable
/>
</el-form-item>
@@ -407,10 +431,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input
+ <el-input-number
+ :step="0.1"
+ clearable
+ style="width: 100%"
v-model="productForm.quantity"
placeholder="璇疯緭鍏�"
- clearable
@change="mathNum"
/>
</el-form-item>
@@ -553,6 +579,7 @@
productData: [],
supplierName: "",
supplierId: "",
+ paymentMethod: "",
},
rules: {
purchaseContractNumber: [
@@ -673,7 +700,7 @@
productList({ salesLedgerId: row.id, type: 2 }).then((res) => {
const index = tableData.value.findIndex((item) => item.id === row.id);
if (index > -1) {
- tableData.value[index].children = res;
+ tableData.value[index].children = res.data;
}
expandedRowKeys.value.push(row.id);
});
--
Gitblit v1.9.3