合并
This commit is contained in:
@ -535,20 +535,6 @@ const handleSubmit = async () => {
|
||||
}
|
||||
};
|
||||
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;
|
||||
materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => {
|
||||
tableData.value = res.rows
|
||||
@ -558,7 +544,6 @@ const materialsUsageDetails1 = () => {
|
||||
loading.value = false;
|
||||
})
|
||||
}
|
||||
>>>>>>> 8f9972343a005ce4424fbf2e3b2388060c854b5f
|
||||
// 格式化日期
|
||||
const formatDate = (dateString) => {
|
||||
if (!dateString) return '-';
|
||||
|
Reference in New Issue
Block a user