From 4dc1abb37aec033fdbd09d290c6f62d082ba774a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 29 十一月 2025 17:07:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Slicecage/slicecage.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index a3dfa97..eac6658 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1616,7 +1616,7 @@
></iframe>
</el-dialog>
<!-- 閽㈠寲鏌ヨ -->
-<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
+<el-dialog v-model="dialogFormVisiblec" top="5vh" width="90%" :title="$t('searchOrder.temperingqueries')">
<div style="margin-bottom: 20px">
<el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
@@ -1656,17 +1656,17 @@
</el-row>
</el-form>
</div>
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
+ <el-table ref="table" style="margin-top: 20px;height: 600px;"
:data="tableDatagh" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="150"/>
- <el-table-column prop="engineerName" fixed align="center" :label="$t('large.productname')" min-width="150"/>
- <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="150" />
- <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="150" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="120" />
- <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="150" />
- <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="150" />
- <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="150" />
- <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="150" />
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="100"/>
+ <el-table-column prop="engineerName" fixed align="center" :label="$t('large.productname')" min-width="120"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="100" />
+ <el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="100" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="100" />
+ <el-table-column prop="totalCount" align="center" :label="$t('searchOrder.allnumber')" min-width="100" />
+ <el-table-column prop="realCount" align="center" :label="$t('searchOrder.numbercages')" min-width="100" />
+ <el-table-column prop="lackCount" align="center" :label="$t('searchOrder.missingquantity')" min-width="100" />
+ <el-table-column prop="damageCount" align="center" :label="$t('searchOrder.breakquantity')" min-width="120" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="500">
<template #default="scope">
<el-button type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
--
Gitblit v1.8.0