From e7d8b280e4d9b0c0394f40ab56cbc37be57cb19b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 五月 2025 15:56:40 +0800
Subject: [PATCH] 来票登记-联调
---
src/views/procurementManagement/procurementLedger/index.vue | 160 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 63 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index f54ce5e..89144a3 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -2,14 +2,14 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">瀹㈡埛鍚嶇О锛�</span>
+ <span class="search_title">閲囪喘鍚堝悓鍙凤細</span>
<el-input
- v-model="searchForm.customerName"
+ v-model="searchForm.purchaseContractNumber"
style="width: 240px"
placeholder="璇疯緭鍏�"
@change="handleQuery"
clearable
- :prefix-icon="Search"
+ prefix-icon="Search"
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -47,13 +47,13 @@
</template>
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
<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="salesman" show-overflow-tooltip/>
+ <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
+ <el-table-column label="涓氬姟鍛�" prop="businessPerson" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
- <el-table-column label="褰曞叆浜�" prop="entryPerson" show-overflow-tooltip/>
+ <el-table-column label="褰曞叆浜�" prop="recorderName" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
@@ -64,56 +64,60 @@
<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="operationType === 'add' ? '鏂板閲囪喘鍙拌处椤甸潰' : '缂栬緫閲囪喘鍙拌处椤甸潰'" 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="salesContractNo">
- <el-input v-model="form.salesContractNo" placeholder="鑷姩鐢熸垚" clearable disabled/>
+ <el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseContractNumber">
+ <el-input v-model="form.purchaseContractNumber" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="涓氬姟鍛橈細" prop="salesman">
- <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+ <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesLedgerId">
+ <el-select v-model="form.salesLedgerId" placeholder="璇烽�夋嫨" clearable>
+ <el-option v-for="item in salesContractList" :key="item.id" :label="item.salesContractNo" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚堝悓鍙凤細" prop="customerContractNo">
- <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
+ <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerId">
- <el-select v-model="form.customerId" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
- {{item.customerName + '鈥斺��' + item.taxpayerIdentificationNumber}}
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="褰曞叆浜猴細" prop="entryPerson">
- <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+ <el-form-item label="涓氬姟鍛橈細" prop="businessPersonId">
+ <el-select v-model="form.businessPersonId" placeholder="璇烽�夋嫨" clearable @change="setPhone">
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢佃瘽锛�" prop="phoneNumber">
+ <el-input v-model="form.phoneNumber" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="褰曞叆浜猴細" prop="recorderId">
+ <el-select v-model="form.recorderId" placeholder="璇烽�夋嫨" clearable disabled>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="褰曞叆鏃ユ湡锛�" prop="entryDate">
<el-date-picker
+ disabled
style="width: 100%"
v-model="form.entryDate"
value-format="YYYY-MM-DD"
@@ -157,7 +161,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="闄勪欢鏉愭枡路锛�" prop="remark">
+ <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
<el-upload
v-model:file-list="fileList"
:action="upload.url"
@@ -277,19 +281,22 @@
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import {
- ledgerList,
- productList,
- customerList,
- addOrUpdateSalesLedger,
- getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct, delLedgerFile
+ getSalesLedgerWithProducts, addOrUpdateSalesLedgerProduct, delProduct, delLedgerFile
} from "@/api/salesManagement/salesLedger.js";
+import {
+ addOrEditPurchase,
+ delPurchase,
+ getSalesNo,
+ purchaseList,
+ productList, getPurchaseById
+} from "@/api/procurementManagement/procurementLedger.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
const selectedRows = ref([])
const productSelectedRows = ref([])
const userList = ref([])
-const customerOption = ref([])
+const salesContractList = ref([])
const tableLoading = ref(false)
const page = reactive({
current: 1,
@@ -297,32 +304,35 @@
})
const total = ref(0)
const fileList = ref([])
+import useUserStore from "@/store/modules/user"
+
+const userStore = useUserStore()
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref('')
const dialogFormVisible = ref(false)
const data = reactive({
searchForm: {
- customerName: '',
+ purchaseContractNumber: '',
},
form: {
- salesContractNo: '',
- salesman: '',
- customerContractNo: '',
- customerId: '',
+ purchaseContractNumber: '',
+ salesLedgerId: '',
projectName: '',
- entryPerson: '',
+ recorderId: '',
entryDate: '',
- maintenanceTime: '',
- productData: []
+ productData: [],
+ businessPersonId: '',
+ phoneNumber: '',
+ supplierName: '',
},
rules: {
- salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- customerContractNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ purchaseContractNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ businessPersonId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ phoneNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -362,6 +372,7 @@
headers: { Authorization: "Bearer " + getToken() },
})
+
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -375,13 +386,16 @@
}
const getList = () => {
tableLoading.value = true
- ledgerList({...searchForm.value, ...page}).then(res => {
+ purchaseList({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
tableData.value = res.rows
tableData.value.map(item => {
item.children = []
})
total.value = res.total
+ expandedRowKeys.value = []
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -397,7 +411,7 @@
if (expandedRows.length > 0) {
expandedRowKeys.value = []
try {
- productList({salesLedgerId: row.id}).then(res => {
+ productList({salesLedgerId: row.id, type: 2}).then(res => {
const index = tableData.value.findIndex(item => item.id === row.id);
if (index > -1) {
tableData.value[index].children = res.rows;
@@ -462,21 +476,32 @@
operationType.value = type
form.value = {}
productData.value = []
+ fileList.value = []
userListNoPage().then(res => {
userList.value = res.data
})
- customerList().then(res => {
- customerOption.value = res
+ getSalesNo().then(res => {
+ salesContractList.value = res
})
+ form.value.recorderId = userStore.id
+ form.value.entryDate = getCurrentDate();
if (type === 'edit') {
currentId.value = row.id;
- getSalesLedgerWithProducts({id: row.id}).then(res => {
+ getPurchaseById({id: row.id, type: 2}).then(res => {
form.value = {...res}
productData.value = form.value.productData
- fileList.value = form.value.salesLedgerFiles
+ if(form.value.salesLedgerFiles) {
+ fileList.value = form.value.salesLedgerFiles
+ } else {
+ fileList.value = []
+ }
})
}
dialogFormVisible.value = true
+}
+// 璧嬪�肩數璇�
+const setPhone = (id) => {
+ form.value.phoneNumber = userList.value.find(u => u.userId === id)?.phonenumber || '';
}
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
@@ -506,11 +531,10 @@
}
// 绉婚櫎鏂囦欢
function handleRemove (file) {
- console.log('handleRemove', file)
- console.log('operationType.value', operationType.value)
+ console.log('handleRemove', file.id)
if (operationType.value === 'edit') {
let ids = []
- ids.push(file.value.id)
+ ids.push(file.id)
delLedgerFile(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
})
@@ -531,7 +555,8 @@
tempFileIds = fileList.value.map(item => item.tempId)
}
form.value.tempFileIds = tempFileIds
- addOrUpdateSalesLedger(form.value).then(res => {
+ form.value.type = 2
+ addOrEditPurchase(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
getList()
@@ -569,10 +594,11 @@
}
const submitProductEdit = () => {
productForm.value.salesLedgerId = currentId.value
+ productForm.value.type = 2
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getPurchaseById({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
@@ -606,7 +632,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 2}).then(res => {
productData.value = res.productData
})
})
@@ -631,7 +657,7 @@
type: 'warning',
}
).then(() => {
- proxy.download("/sales/ledger/export", {}, '閿�鍞彴璐�.xlsx')
+ proxy.download("/purchase/ledger/export", {}, '閲囪喘鍙拌处.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -653,7 +679,7 @@
type: 'warning',
}
).then(() => {
- delLedger(ids).then(res => {
+ delPurchase(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
getList()
})
@@ -661,6 +687,14 @@
proxy.$modal.msg("宸插彇娑�")
})
}
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+ const day = String(today.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+}
getList()
</script>
--
Gitblit v1.9.3