From ccef2b613fe21a6be5f2096f88a2de5eb301adde Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:01:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/invoiceRegistration/index.vue | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index e66f435..0104fd1 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -74,7 +74,11 @@
width="60"
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column
+ label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ width="150"
+ />
<el-table-column label="鍗曚綅" prop="unit" width="70" />
<el-table-column label="鏁伴噺" prop="quantity" width="70" />
<el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
@@ -121,36 +125,48 @@
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
show-overflow-tooltip
+ width="200"
/>
<el-table-column
label="瀹㈡埛鍚堝悓鍙�"
prop="customerContractNo"
+ width="200"
show-overflow-tooltip
/>
<el-table-column
label="瀹㈡埛鍚嶇О"
prop="customerName"
show-overflow-tooltip
+ width="240"
/>
<el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip />
<el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
+ width="200"
/>
<el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
show-overflow-tooltip
:formatter="formattedNumber"
+ width="120"
+
/>
<el-table-column
label="宸插紑绁ㄩ噾棰�(鍏�)"
prop="invoiceTotal"
show-overflow-tooltip
:formatter="formattedNumber"
+ width="120"
/>
- <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" show-overflow-tooltip>
+ <el-table-column
+ label="鏈紑绁ㄩ噾棰�(鍏�)"
+ prop="noInvoiceAmountTotal"
+ show-overflow-tooltip
+ width="120"
+ >
<template #default="{ row, column }">
<el-text type="danger">
{{ formattedNumber(row, column, row.noInvoiceAmountTotal) }}
@@ -274,7 +290,11 @@
width="60"
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column
+ label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ width="150"
+ />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" width="70" />
<el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
@@ -294,15 +314,12 @@
:formatter="formattedNumber"
width="150"
/>
- <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum">
+ <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="150">
<template #default="scope">
- <el-input
- type="number"
- :step="0.1"
- min="0"
+ <el-input-number :step="0.1" :min="0" style="width: 100%"
v-model="scope.row.currentInvoiceNum"
@blur="invoiceNumBlur(scope.row)"
- ></el-input>
+ ></el-input-number>
</template>
</el-table-column>
<el-table-column
@@ -311,16 +328,13 @@
width="150"
>
<template #default="scope">
- <el-input
- type="number"
- :step="0.01"
- min="0"
+ <el-input-number :step="0.01" :min="0" style="width: 100%"
v-model="scope.row.currentInvoiceAmount"
@blur="invoiceAmountBlur(scope.row)"
- ></el-input>
+ ></el-input-number>
</template>
</el-table-column>
- <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum">
+ <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" width="100">
<template #default="scope">
<el-input
type="number"
@@ -347,13 +361,17 @@
></el-input>
</template>
</el-table-column>
- <el-table-column label="鐧昏浜�" prop="register">
- <template #default="{ row }">
- <el-input v-model="row.register" placeholder="璇疯緭鍏ョ櫥璁颁汉" />
- </template>
+ <el-table-column label="鐧昏浜�" prop="register" width="100">
+ <!-- <template #default="{ row }">
+ <el-input
+ v-model="row.register"
+ placeholder="璇疯緭鍏ョ櫥璁颁汉"
+ disabled
+ />
+ </template> -->
</el-table-column>
- <el-table-column label="鐧昏鏃ユ湡" prop="registerDate">
- <template #default="{ row }">
+ <el-table-column label="鐧昏鏃ユ湡" prop="registerDate" width="150">
+ <!-- <template #default="{ row }">
<el-date-picker
style="width: 100%"
v-model="row.registerDate"
@@ -362,8 +380,9 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ disabled
/>
- </template>
+ </template> -->
</el-table-column>
</el-table>
</el-form>
@@ -449,7 +468,7 @@
};
const formattedInputNumber = (value) => {
- return parseFloat(value).toFixed(2);
+ return value ? parseFloat(value).toFixed(2) : 0;
};
// 鏌ヨ鍒楄〃
@@ -488,7 +507,7 @@
productList({ salesLedgerId: row.id, type: 1 }).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);
});
@@ -503,8 +522,8 @@
const summarizeMainTable = (param) => {
return proxy.summarizeTable(param, [
"contractAmount",
- "noInvoiceAmountTotal",
"invoiceTotal",
+ "noInvoiceAmountTotal",
]);
};
// 瀛愯〃鍚堣鏂规硶
--
Gitblit v1.9.3