From a686251b73f616532d6a9518faad49c7693a6e1c Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期二, 01 七月 2025 14:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/invoiceLedger/index.vue | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index fe2ca15..194b86c 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -26,6 +26,21 @@
@clear="clearRange"
/>
</el-form-item>
+ <el-form-item label="褰曞叆鏃ユ湡">
+ <el-date-picker
+ style="width: 100%"
+ v-model="searchForm.createTimeStart"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓嶆樉绀烘湁鍙戠エ琛�">
+ <el-checkbox v-model="searchForm.status" @change="handleQuery" />
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
<el-button @click="resetForm"> 閲嶇疆 </el-button>
@@ -50,19 +65,28 @@
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
show-overflow-tooltip
+ width="180"
/>
<el-table-column
label="瀹㈡埛鍚堝悓鍙�"
prop="customerContractNo"
show-overflow-tooltip
+ width="180"
/>
<el-table-column
label="瀹㈡埛鍚嶇О"
prop="customerName"
show-overflow-tooltip
+ width="240"
/>
+ <el-table-column label="椤圭洰" prop="projectName" width="150" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+ <el-table-column
+ label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ width="300"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍙戠エ鍙�"
prop="invoiceNo"
@@ -73,34 +97,52 @@
prop="invoiceTotal"
show-overflow-tooltip
:formatter="formattedNumber"
+ width="120"
/>
- <el-table-column label="绋庣巼" prop="taxRate" show-overflow-tooltip />
+ <el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
<el-table-column
- label="寮�绁ㄤ汉"
+ label="褰曞叆浜�"
prop="invoicePerson"
show-overflow-tooltip
+ />
+ <el-table-column
+ label="褰曞叆鏃ユ湡"
+ prop="createTime"
+ show-overflow-tooltip
+ :formatter="formatDate"
+ width="180"
/>
<el-table-column
label="寮�绁ㄦ棩鏈�"
prop="invoiceDate"
show-overflow-tooltip
+ width="120"
/>
<el-table-column
label="鍙戠エ"
prop="invoiceFileName"
+ width="120"
+ align="center"
show-overflow-tooltip
>
<template #default="scope">
- <span v-if="scope.row.invoiceFileName">{{
- scope.row.invoiceFileName
- }}</span>
+ <el-button
+ v-if="scope.row.invoiceFileName"
+ text
+ bg
+ type="primary"
+ @click="handleFile(scope.row.commonFiles)"
+ >
+ 鏌ョ湅闄勪欢
+ </el-button>
<el-button
v-else
link
type="primary"
@click="handleDownload(scope.row)"
- >涓婁紶</el-button
>
+ 涓婁紶
+ </el-button>
</template>
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
@@ -312,12 +354,14 @@
const data = reactive({
searchForm: {
searchText: "",
+ status: false,
invoiceDate: [
dayjs().startOf("month").format("YYYY-MM-DD"),
dayjs().endOf("month").format("YYYY-MM-DD"),
],
invoiceDateStart: dayjs().startOf("month").format("YYYY-MM-DD"),
invoiceDateEnd: dayjs().endOf("month").format("YYYY-MM-DD"),
+ createTimeStart: "", // 褰曞叆鏃ユ湡
},
form: {
salesLedgerId: "",
@@ -329,6 +373,7 @@
invoiceDate: "",
customerName: "",
fileList: [],
+ createTime: "", // 褰曞叆鏃ユ湡
},
rules: {
salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -355,6 +400,9 @@
const uploadModal = ref(false);
const formattedNumber = (row, column, cellValue) => {
return parseFloat(cellValue).toFixed(2);
+};
+const formatDate = (row, column, cellValue) => {
+ return dayjs(cellValue).format("YYYY-MM-DD HH:mm:ss");
};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -544,6 +592,12 @@
}
};
+const handleFile = (commonFiles) => {
+ commonFiles.forEach((e) => {
+ proxy.$download.name(e.url);
+ });
+};
+
const clearRange = () => {
searchForm.invoiceDate = [];
searchForm.invoiceDateStart = undefined;
--
Gitblit v1.9.3