From 8890d7dc1bdf54ba3e4dc90b6d79f4224f8cbd2a Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 13:38:10 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
src/views/salesManagement/receiptPayment/index.vue | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 80cb7f8..c7d5e6b 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -49,7 +49,7 @@
<div class="actions">
<div></div>
<div>
- <el-button type="primary" icon="Plus" @click="openForm('add')">
+ <el-button type="primary" @click="openForm('add')">
鏂板鍥炴
</el-button>
<el-button icon="Download" @click="handleOut"> 瀵煎嚭 </el-button>
@@ -65,7 +65,8 @@
:summary-method="summarizeMainTable"
:expand-row-keys="expandedRowKeys"
@expand-change="expandChange"
- height="calc(100vh - 18.5em)"
+
+ height="calc(100vh - 21.5em)"
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column type="expand">
@@ -82,13 +83,16 @@
type="index"
width="60"
/>
- <el-table-column label="鍥炴鏃ユ湡" prop="receiptPaymentDate" />
+ <el-table-column label="鍥炴鏃ユ湡" prop="receiptPaymentDate" width="130"/>
<el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount">
<template #default="scope">
- <el-input
- v-model="scope.row.receiptPaymentAmount"
- :disabled="!scope.row.editType"
- ></el-input>
+ <el-input-number :step="0.01" :min="0" style="width: 100%"
+ v-model="scope.row.receiptPaymentAmount"
+ :disabled="!scope.row.editType"
+ :precision="2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
</template>
</el-table-column>
<el-table-column label="鍥炴鏂瑰紡" prop="receiptPaymentType">
@@ -108,9 +112,9 @@
</el-select>
</template>
</el-table-column>
- <el-table-column label="鐧昏浜�" prop="registrant" />
- <el-table-column label="鐧昏鏃ユ湡" prop="createTime" />
- <el-table-column label="鎿嶄綔" width="150">
+ <el-table-column label="鐧昏浜�" prop="registrant" width="90"/>
+ <el-table-column label="鐧昏鏃ユ湡" prop="createTime" width="130"/>
+ <el-table-column label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button
link
@@ -118,6 +122,7 @@
size="small"
@click="changeEditType(scope.row)"
v-if="!scope.row.editType"
+ :disabled="scope.row.registrant !== userStore.nickName"
>缂栬緫</el-button
>
<el-button
@@ -126,6 +131,7 @@
size="small"
@click="saveReceiptPayment(scope.row)"
v-if="scope.row.editType"
+ :disabled="scope.row.registrant !== userStore.nickName"
>淇濆瓨</el-button
>
<el-button
@@ -133,6 +139,7 @@
type="primary"
size="small"
@click="delReceiptRecord(scope.row)"
+ :disabled="scope.row.registrant !== userStore.nickName"
>鍒犻櫎</el-button
>
</template>
@@ -142,14 +149,23 @@
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
+ label="寮�绁ㄦ棩鏈�"
+ prop="invoiceDate"
+ show-overflow-tooltip
+ width="240"
+ />
+ <el-table-column
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
show-overflow-tooltip
+ width="240"
/>
<el-table-column
label="瀹㈡埛鍚堝悓鍙�"
prop="customerContractNo"
show-overflow-tooltip
+ width="240"
+
/>
<el-table-column
label="瀹㈡埛鍚嶇О"
@@ -161,22 +177,26 @@
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
+ width="340"
/>
<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
@@ -184,11 +204,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">
@@ -275,12 +297,10 @@
</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%"
+ :precision="2"
v-model="form.receiptPaymentAmount"
placeholder="璇疯緭鍏�"
- :step="0.01"
clearable
/>
</el-form-item>
@@ -424,13 +444,20 @@
getList();
};
const getList = () => {
- expandedRowKeys.value = [];
tableLoading.value = true;
bindInvoiceNoRegPage({ ...searchForm, ...page })
.then((res) => {
tableLoading.value = false;
tableData.value = res.data.records;
total.value = res.data.total;
+ if (expandedRowKeys.value.length > 0) {
+ const arr = []
+ const index = tableData.value.findIndex(item => item.id === expandedRowKeys.value[0]);
+ if (index > -1) {
+ arr.push(tableData.value[index]);
+ expandChange(tableData.value[index], arr)
+ }
+ }
})
.catch(() => {
tableLoading.value = false;
@@ -492,10 +519,8 @@
proxy.$modal.msgError("璇烽�夋嫨涓�鏉℃暟鎹�");
return;
}
- //
- console.log("(selectedRows.value", selectedRows.value);
- if (selectedRows.value[0].noReceiptAmount === 0) {
- proxy.$modal.msgError("寰呭洖娆鹃噾棰濅负0鍏�");
+ if (selectedRows.value[0].noReceiptAmount == 0) {
+ proxy.$modal.msgWarning("鏃犻渶鍐嶅洖娆�");
return;
}
invoiceInfo({ id: selectedRows.value[0].id }).then((res) => {
@@ -563,6 +588,8 @@
};
receiptPaymentSaveOrUpdate(updateData).then((res) => {
row.editType = !row.editType;
+ getList();
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
});
};
--
Gitblit v1.9.3