From c6b67b0f3103729c5a14cc4777009f7ad729c7aa Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 一月 2026 16:20:00 +0800
Subject: [PATCH] 浪潮 1.生产管控添加新增功能以及bug修改
---
src/views/salesManagement/receiptPayment/index.vue | 84 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 3521017..fe285ba 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -38,6 +38,12 @@
@change="handleQuery"
/>
</el-form-item>
+ <br/>
+ <el-form-item label="寮�绁ㄦ棩鏈�">
+ <el-date-picker style="width: 240px" v-model="searchForm.commonDate" value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD" type="daterange" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" clearable
+ @change="changeDateRange" @clear="clearRange" />
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
</el-form-item>
@@ -49,7 +55,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 +71,7 @@
:summary-method="summarizeMainTable"
:expand-row-keys="expandedRowKeys"
@expand-change="expandChange"
-
+ stripe
height="calc(100vh - 21.5em)"
>
<el-table-column align="center" type="selection" width="55" />
@@ -76,6 +82,7 @@
border
show-summary
:summary-method="summarizeChildrenTable"
+ stripe
>
<el-table-column
align="center"
@@ -83,7 +90,7 @@
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-number :step="0.01" :min="0" style="width: 100%"
@@ -97,24 +104,17 @@
</el-table-column>
<el-table-column label="鍥炴鏂瑰紡" prop="receiptPaymentType">
<template #default="scope">
- <el-select
+ <el-input
v-model="scope.row.receiptPaymentType"
- placeholder="璇烽�夋嫨"
+ placeholder="璇疯緭鍏�"
clearable
:disabled="!scope.row.editType"
- >
- <el-option
- v-for="item in receipt_payment_type"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </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
@@ -148,6 +148,12 @@
</template>
</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"
@@ -303,18 +309,11 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍥炴褰㈠紡锛�" prop="receiptPaymentType">
- <el-select
+ <el-input
v-model="form.receiptPaymentType"
- placeholder="璇烽�夋嫨"
+ placeholder="璇疯緭鍏�"
clearable
- >
- <el-option
- v-for="item in receipt_payment_type"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -421,10 +420,24 @@
});
const { form, rules } = toRefs(data);
const { form: searchForm, resetForm } = useFormData(data.searchForm);
-const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
const formattedNumber = (row, column, cellValue) => {
return parseFloat(cellValue).toFixed(2);
+};
+
+const changeDateRange = (date) => {
+ if (date) {
+ searchForm.invoiceDateStart = date[0];
+ searchForm.invoiceDateEnd = date[1];
+ getList();
+ }
+};
+
+const clearRange = () => {
+ searchForm.commonDate = [];
+ searchForm.invoiceDateStart = undefined;
+ searchForm.invoiceDateEnd = undefined;
+ getList();
};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -438,13 +451,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;
@@ -506,10 +526,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) => {
@@ -577,6 +595,8 @@
};
receiptPaymentSaveOrUpdate(updateData).then((res) => {
row.editType = !row.editType;
+ getList();
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
});
};
--
Gitblit v1.9.3