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 | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index aa10594..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,16 +157,18 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="闄勪欢鏉愭枡路锛�" prop="remark">
+ <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark">
<el-upload
- :file-list="fileList"
- action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+ v-model:file-list="fileList"
+ :action="upload.url"
multiple
ref="fileUpload"
- :headers="proxy.uploadHeader"
+ auto-upload
+ :headers="upload.headers"
:before-upload="handleBeforeUpload"
:on-error="handleUploadError"
:on-success="handleUploadSuccess"
+ :on-remove="handleRemove"
>
<el-button type="primary">涓婁紶</el-button>
<template #tip>
@@ -268,6 +270,7 @@
</template>
<script setup>
+import { getToken } from "@/utils/auth"
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
import {Search} from "@element-plus/icons-vue";
@@ -278,7 +281,7 @@
productList,
customerList,
addOrUpdateSalesLedger,
- getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct
+ getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct, delLedgerFile
} from "@/api/salesManagement/salesLedger.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
@@ -294,7 +297,6 @@
})
const total = ref(0)
const fileList = ref([])
-const uploadList = ref([])
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref('')
@@ -353,6 +355,12 @@
}
})
const { productForm, productRules } = toRefs(productFormData)
+const upload = reactive({
+ // 涓婁紶鐨勫湴鍧�
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { Authorization: "Bearer " + getToken() },
+})
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -374,6 +382,8 @@
item.children = []
})
total.value = res.total
+ }).catch(() => {
+ tableLoading.value = false
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -389,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;
@@ -462,9 +472,10 @@
})
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
})
}
dialogFormVisible.value = true
@@ -472,11 +483,9 @@
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
// 鏍℃鏂囦欢澶у皬
- if (props.fileSize) {
- if (file.size > 1024 * 1024) {
- proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
- return false
- }
+ if (file.size > 1024 * 1024 * 10) {
+ proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
+ return false
}
proxy.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...")
return true
@@ -487,15 +496,24 @@
proxy.$modal.closeLoading()
}
// 涓婁紶鎴愬姛鍥炶皟
-function handleUploadSuccess(res, file) {
+function handleUploadSuccess(res, file, uploadFiles) {
+ proxy.$modal.closeLoading()
if (res.code === 200) {
- uploadList.value.push({ name: res.fileName, url: res.fileName })
- fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value)
- uploadList.value = []
+ file.tempId = res.data.tempId
+ proxy.$modal.msgSuccess("涓婁紶鎴愬姛")
} else {
- proxy.$modal.closeLoading()
proxy.$modal.msgError(res.msg)
proxy.$refs.fileUpload.handleRemove(file)
+ }
+}
+// 绉婚櫎鏂囦欢
+function handleRemove (file) {
+ if (operationType.value === 'edit') {
+ let ids = []
+ ids.push(file.id)
+ delLedgerFile(ids).then(res => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ })
}
}
// 鎻愪氦琛ㄥ崟
@@ -508,6 +526,12 @@
proxy.$modal.msgWarning('璇锋坊鍔犱骇鍝佷俊鎭�')
return
}
+ let tempFileIds = []
+ if (fileList.value.length > 0) {
+ tempFileIds = fileList.value.map(item => item.tempId)
+ }
+ form.value.tempFileIds = tempFileIds
+ form.value.type = 1
addOrUpdateSalesLedger(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
@@ -549,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
})
})
@@ -583,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
})
})
@@ -632,8 +656,8 @@
).then(() => {
delLedger(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ getList()
})
- getList()
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
--
Gitblit v1.9.3