From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 36e0d64..befea3a 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -1,7 +1,7 @@
<template>
<div style="height: 500px;">
<div style="display: flex;">
- <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
+ <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')"/>
<el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
<el-pagination
v-model:current-page="currentPage"
@@ -14,7 +14,7 @@
style="margin-top: 10px;"
/>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -37,7 +37,7 @@
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
<el-button :disabled="currentGlassRect?.state === 8 || currentGlassRect?.state === 9" type="warning"
- plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ plain @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
<el-button :disabled="currentGlassRect?.state === 9 || currentGlassRect?.state === 8" type="danger"
@@ -149,7 +149,6 @@
totalPages.value = response.data.id;
}
} catch (error) {
- ElMessage.error(response.message);
}
};
const search = async () => {
@@ -197,8 +196,6 @@
};
const handleCurrentChange = async(val: number) => {
currentPage.value = val;
- console.log(currentPage.value);
-
const response = await request.post('/temperingGlass/temperingGlassInfo/selectTemperingGlass', {
engineerId: engineerId.value,
temperingLayoutId: currentPage.value
--
Gitblit v1.8.0