From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 15:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/receiptPayment/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index f1e4531..d9048a0 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -65,6 +65,7 @@
:summary-method="summarizeMainTable"
:expand-row-keys="expandedRowKeys"
@expand-change="expandChange"
+
height="calc(100vh - 18.5em)"
>
<el-table-column align="center" type="selection" width="55" />
@@ -145,37 +146,45 @@
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
show-overflow-tooltip
+ width="240"
/>
<el-table-column
label="瀹㈡埛鍚堝悓鍙�"
prop="customerContractNo"
show-overflow-tooltip
+ width="240"
+
/>
<el-table-column
label="瀹㈡埛鍚嶇О"
prop="customerName"
show-overflow-tooltip
+ width="240"
/>
<el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
+ width="200"
/>
<el-table-column
label="浜у搧澶х被"
prop="productCategory"
show-overflow-tooltip
+ width="100"
/>
<el-table-column
label="鍙戠エ鍙�"
prop="invoiceNo"
show-overflow-tooltip
+ width="200"
/>
<el-table-column
label="鍙戠エ閲戦(鍏�)"
prop="invoiceTotal"
show-overflow-tooltip
:formatter="formattedNumber"
+ width="200"
/>
<el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
<el-table-column
@@ -183,11 +192,13 @@
prop="receiptPaymentAmountTotal"
show-overflow-tooltip
:formatter="formattedNumber"
+ width="200"
/>
<el-table-column
label="寰呭洖娆鹃噾棰�(鍏�)"
prop="noReceiptAmount"
show-overflow-tooltip
+ width="200"
>
<template #default="{ row, column }">
<el-text type="danger">
@@ -274,12 +285,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏈鍥炴閲戦锛�" prop="receiptPaymentAmount">
- <el-input
- type="number"
- min="0"
+ <el-input-number :step="0.01" :min="0" style="width: 100%"
v-model="form.receiptPaymentAmount"
placeholder="璇疯緭鍏�"
- :step="0.01"
clearable
/>
</el-form-item>
--
Gitblit v1.9.3