From feb53a39cb88c7f807c287b18d8008bb149b5200 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 13 六月 2025 17:40:08 +0800
Subject: [PATCH] 小数点
---
src/views/salesManagement/receiptPayment/index.vue | 284 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 156 insertions(+), 128 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index ee98464..8057675 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -15,7 +15,6 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板鍥炴</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -24,39 +23,61 @@
:row-key="row => row.id"
show-summary
:summary-method="summarizeMainTable"
+ :expand-row-keys="expandedRowKeys"
+ @expand-change="expandChange"
height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
+ <el-table-column type="expand">
+ <template #default="props">
+ <el-table :data="props.row.children" border
+ show-summary
+ :summary-method="summarizeChildrenTable">
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="鍥炴鏃ユ湡" prop="receiptPaymentDate" />
+ <el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount">
+ <template #default="scope">
+ <el-input v-model="scope.row.receiptPaymentAmount" :disabled="!scope.row.editType"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍥炴鏂瑰紡" prop="receiptPaymentType" >
+ <template #default="scope">
+ <el-select v-model="scope.row.receiptPaymentType" 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">
+ <template #default="scope">
+ <el-button link type="primary" size="small" @click="changeEditType(scope.row)" v-if="!scope.row.editType">缂栬緫</el-button>
+ <el-button link type="primary" size="small" @click="saveReceiptPayment(scope.row)" v-if="scope.row.editType">淇濆瓨</el-button>
+ <el-button link type="primary" size="small" @click="delReceiptRecord(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
<el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" show-overflow-tooltip/>
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
+ <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip/>
<el-table-column label="鍙戠エ鍙�" prop="invoiceNo" show-overflow-tooltip/>
- <el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceAmount" show-overflow-tooltip/>
+ <el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
<el-table-column label="绋庣巼" prop="taxRate" show-overflow-tooltip/>
- <el-table-column label="鏈鍥炴閲戦(鍏�)" prop="receiptPaymentAmount" show-overflow-tooltip/>
- <el-table-column label="鍥炴褰㈠紡" prop="receiptPaymentType" show-overflow-tooltip>
- <template #default="scope">
- {{transferValue(scope.row.receiptPaymentType)}}
- </template>
- </el-table-column>
- <el-table-column label="寰呭洖娆鹃噾棰�(鍏�)" prop="entryDate" show-overflow-tooltip/>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
- </template>
- </el-table-column>
+ <el-table-column label="鍥炴閲戦(鍏�)" prop="receiptPaymentAmountTotal" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="寰呭洖娆鹃噾棰�(鍏�)" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
</el-table>
<pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
:limit="page.size" @pagination="paginationChange" />
</div>
- <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍙戠エ鍙烽〉闈�' : '淇敼鍙戠エ鍙烽〉闈�'" width="70%" @close="closeDia">
+ <el-dialog v-model="dialogFormVisible" title="鏂板鍙戠エ鍙烽〉闈�" width="70%" @close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="invoiceLedgerId">
- <el-select v-model="form.invoiceLedgerId" placeholder="璇烽�夋嫨" clearable @change="ledgerChange">
- <el-option v-for="item in invoiceLedgerList" :key="item.id" :label="item.salesContractNo + '(' + item.invoiceDate + ')' " :value="item.id"/>
- </el-select>
+ <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
+ <el-input v-model="form.salesContractNo" placeholder="鑷姩濉厖" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -72,8 +93,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
- <el-input type="number" v-model="form.invoiceAmount" placeholder="鑷姩濉厖" :step="0.01" disabled/>
+ <el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceTotal">
+ <el-input type="number" v-model="form.invoiceTotal" placeholder="鑷姩濉厖" :step="0.01" disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -85,7 +106,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏈鍥炴閲戦锛�" prop="receiptPaymentAmount">
- <el-input type="number" v-model="form.receiptPaymentAmount" placeholder="璇疯緭鍏�" :step="0.01" clearable/>
+ <el-input type="number" min="0" v-model="form.receiptPaymentAmount" placeholder="璇疯緭鍏�" :step="0.01" clearable/>
</el-form-item>
</el-col>
</el-row>
@@ -99,7 +120,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐧昏浜猴細" prop="registrant">
- <el-input v-model="form.registrant" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.registrant" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -132,40 +153,38 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
-import {ElMessageBox } from "element-plus";
-import {
- invoiceLedgerListNoPage,
- invoiceLedgerDetail
-} from "../../../api/salesManagement/invoiceLedger.js";
import {
receiptPaymentSaveOrUpdate,
- receiptPaymentListPage,
- receiptPaymentInfo,
+ bindInvoiceNoRegPage,
+ invoiceInfo,
+ receiptPaymentHistoryListNoPage,
receiptPaymentDel
} from "../../../api/salesManagement/receiptPayment.js";
+import useUserStore from '@/store/modules/user'
+import { ElMessage,ElMessageBox } from 'element-plus'
+const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
-const productData = ref([])
const selectedRows = ref([])
const tableLoading = ref(false)
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
})
const total = ref(0)
+const expandedRowKeys = ref([])
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
const dialogFormVisible = ref(false)
const data = reactive({
searchForm: {
searchText: '',
},
form: {
- invoiceLedgerId: '',
+ salesContractNo: '',
customerName: '',
invoiceNo: '',
- invoiceAmount: '',
+ invoiceTotal: '',
taxRate: '',
receiptPaymentAmount: '',
receiptPaymentType: '',
@@ -173,10 +192,10 @@
receiptPaymentDate: ''
},
rules: {
- invoiceLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ salesContractNo: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
invoiceNo: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- invoiceAmount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ invoiceTotal: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
receiptPaymentAmount: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
receiptPaymentType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -185,25 +204,26 @@
}
})
const { searchForm, form, rules } = toRefs(data)
-const currentId = ref('')
-// 寮�绁ㄥ彴璐︽暟缁�
-const invoiceLedgerList = ref([])
const { receipt_payment_type } = proxy.useDict("receipt_payment_type")
+const formattedNumber = (row, column, cellValue) => {
+ return parseFloat(cellValue).toFixed(2);
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
+ expandedRowKeys.value = []
tableLoading.value = true
- receiptPaymentListPage({...searchForm.value, ...page}).then(res => {
+ bindInvoiceNoRegPage({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
tableData.value = res.data.records
total.value = res.data.total
@@ -211,47 +231,66 @@
tableLoading.value = false
})
}
+// 灞曞紑琛�
+const expandChange = (row, expandedRows) => {
+ if (expandedRows.length > 0) {
+ expandedRowKeys.value = []
+ try {
+ receiptPaymentHistoryListNoPage({invoiceLedgerId: row.id,
+ type: 1 }).then(res => {
+ const index = tableData.value.findIndex(item => item.id === row.id);
+ if (index > -1) {
+ if(res?.length > 0) {
+ res.forEach(item => {
+ item.editType = false
+ })
+ }
+ tableData.value[index].children = res;
+ }
+ expandedRowKeys.value.push(row.id)
+ })
+ } catch (error) {
+ console.log(error)
+ }
+ } else {
+ expandedRowKeys.value = []
+ }
+}
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
- selectedRows.value = selection
+ console.log('selection', selection)
+ selectedRows.value = selection.filter(item => item.customerContractNo !== null);
}
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = (param) => {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- }
- const prop = column.property;
- if (['invoiceAmount','receiptPaymentAmount'].includes(prop)) {
- const values = data.map(item => Number(item[prop]));
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
- } else {
- sums[index] = '';
- }
- } else {
- sums[index] = '';
- }
- })
- return sums;
+ return proxy.summarizeTable(param, ['invoiceTotal', 'receiptPaymentAmountTotal', 'noReceiptAmount'], {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ });
};
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+ return proxy.summarizeTable(param, ['receiptPaymentAmount']);
+}
// 鎵撳紑寮规
-const openForm = (type, row) => {
- operationType.value = type
+const openForm = () => {
form.value = {}
- productData.value = []
- invoiceLedgerListNoPage({}).then(res => {
- invoiceLedgerList.value = res.data
- })
- if (type === 'edit') {
- currentId.value = row.id;
- receiptPaymentInfo({id: row.id}).then(res => {
- form.value = {...res.data}
- })
+ if(selectedRows.value.length !== 1) {
+ proxy.$modal.msgError("璇烽�夋嫨涓�鏉℃暟鎹�")
+ return
}
+ //
+ console.log('(selectedRows.value',selectedRows.value)
+ if(selectedRows.value[0].noReceiptAmount === 0){
+ proxy.$modal.msgError("寰呭洖娆鹃噾棰濅负0鍏�")
+ return
+ }
+ invoiceInfo({id: selectedRows.value[0].id}).then(res => {
+ form.value = {...res.data}
+ form.value.invoiceLedgerId = form.value.id
+ form.value.id = ''
+ form.value.registrant = userStore.nickName
+ })
dialogFormVisible.value = true
}
// 鎻愪氦琛ㄥ崟
@@ -271,61 +310,50 @@
proxy.resetForm("formRef")
dialogFormVisible.value = false
}
-// 鍒犻櫎
-const handleDelete = () => {
- let ids = []
- if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map(item => item.id);
- } else {
- proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
- return
+
+// 鍒犻櫎鍥炴璁板綍
+const delReceiptRecord = (row) => {
+ console.log('row',row)
+ ElMessageBox.confirm("纭鍒犻櫎璇ヨ褰曞悧锛�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ try {
+ let ids = []
+ ids.push(row.id)
+ await receiptPaymentDel(ids);
+ ElMessage.success("鍒犻櫎鎴愬姛");
+ getList();
+ } catch (error) {
+ console.error("鍒犻櫎澶辫触:", error);
+ ElMessage.error("鍒犻櫎澶辫触");
+ }
+ })
+ .catch(() => {
+ ElMessage.info("宸插彇娑堝垹闄�");
+ });
+
+}
+
+// 缂栬緫淇敼鐘舵��
+const changeEditType = (row) => {
+ row.editType = !row.editType
+}
+
+// 淇濆瓨鍥炴璁板綍
+const saveReceiptPayment = (row) => {
+ let updateData = {
+ id:row.id,
+ receiptPaymentType: row.receiptPaymentType,
+ receiptPaymentAmount: row.receiptPaymentAmount
}
- ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
- '瀵煎嚭', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- ).then(() => {
- receiptPaymentDel(ids).then(res => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- getList()
- })
- }).catch(() => {
- proxy.$modal.msg("宸插彇娑�")
+ receiptPaymentSaveOrUpdate(updateData).then(res => {
+ row.editType = !row.editType
})
}
-// 閿�鍞彴璐︾瓫閫�
-const ledgerChange = (val) => {
- console.log('val', val)
- if(val){
- invoiceLedgerDetail({id: val}).then(res => {
- form.value.customerName = res.data.customerName,
- form.value.invoiceNo= res.data.invoiceNo,
- form.value.invoiceAmount= res.data.invoiceAmount,
- form.value.taxRate= res.data.taxRate,
- form.value.salesLedgerId= res.data.salesLedgerId,
- form.value.customerId= res.data.customerId,
- form.value.salesContractNo = res.data.salesContractNo
- })
- }else {
- form.value.customerName = '',
- form.value.invoiceNo= '',
- form.value.invoiceAmount= '',
- form.value.taxRate= '',
- form.value.salesLedgerId= '',
- form.value.customerId= '',
- form.value.salesContractNo= ''
- }
-}
-// 鏀舵绫诲埆杞崲
-const transferValue = (val) => {
- const findIndex = receipt_payment_type.value.findIndex(item => item.value === val);
- if (findIndex > -1) {
- return receipt_payment_type.value[findIndex].label
- }
-}
+
getList()
</script>
--
Gitblit v1.9.3