From 64f2f7629bab47b948ef5a0347f581a352f4a7ad Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 16a3edc..b658a1f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -453,7 +453,7 @@
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="400" ref="table" :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }"
:data="tableData">
- <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center" />
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="120" align="center" />
<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center" />
<el-table-column prop="height" :label="$t('Mounting.height')" align="center" />
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center" />
@@ -476,14 +476,14 @@
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50" />
- <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
- <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="65" />
+ <el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75" />
+ <el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75" />
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80" />
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')"
min-width="60" />
- <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
<template #default="scope">
<el-button :disabled="(!scope.row.patternThickness)" type="text" plain
@click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
--
Gitblit v1.8.0