From ee6f8c315926a871f11a96a69702efcef4d0b49f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 13:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/salesLedger/index.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 7da8eeb..78f84e0 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -9,7 +9,7 @@
placeholder="璇疯緭鍏�"
@change="handleQuery"
clearable
- :prefix-icon="Search"
+ prefix-icon="Search"
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -105,7 +105,7 @@
<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-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
</el-col>
@@ -157,7 +157,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"
@@ -382,6 +382,8 @@
item.children = []
})
total.value = res.total
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -397,7 +399,7 @@
if (expandedRows.length > 0) {
expandedRowKeys.value = []
try {
- productList({salesLedgerId: row.id}).then(res => {
+ productList({salesLedgerId: row.id, type: 1}).then(res => {
const index = tableData.value.findIndex(item => item.id === row.id);
if (index > -1) {
tableData.value[index].children = res.rows;
@@ -470,7 +472,7 @@
})
if (type === 'edit') {
currentId.value = row.id;
- getSalesLedgerWithProducts({id: row.id}).then(res => {
+ getSalesLedgerWithProducts({id: row.id, type: 1}).then(res => {
form.value = {...res}
productData.value = form.value.productData
fileList.value = form.value.salesLedgerFiles
@@ -481,7 +483,7 @@
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
// 鏍℃鏂囦欢澶у皬
- if (file.size > 1024 * 1024) {
+ if (file.size > 1024 * 1024 * 10) {
proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
return false
}
@@ -506,8 +508,6 @@
}
// 绉婚櫎鏂囦欢
function handleRemove (file) {
- console.log('handleRemove', file)
- console.log('operationType.value', operationType.value)
if (operationType.value === 'edit') {
let ids = []
ids.push(file.id)
@@ -531,6 +531,7 @@
tempFileIds = fileList.value.map(item => item.tempId)
}
form.value.tempFileIds = tempFileIds
+ form.value.type = 1
addOrUpdateSalesLedger(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
@@ -572,7 +573,7 @@
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
@@ -606,7 +607,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
closeProductDia()
- getSalesLedgerWithProducts({id: currentId.value}).then(res => {
+ getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => {
productData.value = res.productData
})
})
--
Gitblit v1.9.3