From cce5010adc49e9a1b21ac6141067d68ef37d5e82 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 26 五月 2025 10:40:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev
---
src/views/salesManagement/receiptPayment/index.vue | 130 ++++++++-----------------------------------
1 files changed, 25 insertions(+), 105 deletions(-)
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index ee98464..d894833 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">
@@ -30,33 +29,22 @@
<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/>
<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/>
+ <el-table-column label="寰呭洖娆鹃噾棰�(鍏�)" prop="noReceiptAmount" show-overflow-tooltip/>
</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 +60,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>
@@ -132,20 +120,13 @@
<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,
- receiptPaymentDel
+ bindInvoiceNoRegPage,
+ invoiceInfo
} from "../../../api/salesManagement/receiptPayment.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
-const productData = ref([])
const selectedRows = ref([])
const tableLoading = ref(false)
const page = reactive({
@@ -155,17 +136,16 @@
const total = ref(0)
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
const dialogFormVisible = ref(false)
const data = reactive({
searchForm: {
searchText: '',
},
form: {
- invoiceLedgerId: '',
+ salesContractNo: '',
customerName: '',
invoiceNo: '',
- invoiceAmount: '',
+ invoiceTotal: '',
taxRate: '',
receiptPaymentAmount: '',
receiptPaymentType: '',
@@ -173,10 +153,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,9 +165,6 @@
}
})
const { searchForm, form, rules } = toRefs(data)
-const currentId = ref('')
-// 寮�绁ㄥ彴璐︽暟缁�
-const invoiceLedgerList = ref([])
const { receipt_payment_type } = proxy.useDict("receipt_payment_type")
// 鏌ヨ鍒楄〃
@@ -203,7 +180,7 @@
}
const getList = () => {
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
@@ -239,19 +216,17 @@
return sums;
};
// 鎵撳紑寮规
-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
}
+ invoiceInfo({id: selectedRows.value[0].id}).then(res => {
+ form.value = {...res.data}
+ form.value.invoiceLedgerId = form.value.id
+ form.value.id = ''
+ })
dialogFormVisible.value = true
}
// 鎻愪氦琛ㄥ崟
@@ -270,61 +245,6 @@
const closeDia = () => {
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
- }
- ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
- '瀵煎嚭', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
- ).then(() => {
- receiptPaymentDel(ids).then(res => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- getList()
- })
- }).catch(() => {
- proxy.$modal.msg("宸插彇娑�")
- })
-}
-// 閿�鍞彴璐︾瓫閫�
-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