taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
Teo
2025-08-18 09:32:22 +08:00
parent 12e80c57d3
commit 174ef50f6f
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/materials/usageMaterials/material/indexSon.vue
View File

@ -535,20 +535,6 @@ const handleSubmit = async () => {
} }
}; };
const materialsUsageDetails1 = () => { const materialsUsageDetails1 = () => {
<<<<<<< HEAD
loading.value = true;
materialsUsageDetails({ physicalsupplyId: routeParams.value.id })
.then((res) => {
tableData.value = res.rows;
})
.catch(() => {
loading.value = false;
})
.finally(() => {
loading.value = false;
});
};
=======
loading.value = true; loading.value = true;
materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => { materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => {
tableData.value = res.rows tableData.value = res.rows
@ -558,7 +544,6 @@ const materialsUsageDetails1 = () => {
loading.value = false; loading.value = false;
}) })
} }
>>>>>>> 8f9972343a005ce4424fbf2e3b2388060c854b5f
// 格式化日期 // 格式化日期
const formatDate = (dateString) => { const formatDate = (dateString) => {
if (!dateString) return '-'; if (!dateString) return '-';