From 56fab901b298857ff4985b7429ef843c9a9d1471 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 28 八月 2024 16:20:02 +0800
Subject: [PATCH] 钢化模块打印功能，新增表格字段
---
UI-Project/src/lang/zh.js | 2 ++
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 65591e4..d365f5b 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -264,6 +264,8 @@
height:'楂�',
thickness:'鍘�',
glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
+ layoutID:'鐗堝浘ID',
+ glassID:'鐜荤拑ID',
},
reportWork:{
lowerbit:'涓嬬墖浣�',
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index e6c9858..fe85ccf 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -807,7 +807,7 @@
</div>
<div v-if="dialogFormVisiblec">
<!-- 鎵撳嵃 -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<div style="display: flex; flex-direction: row; align-items: center; margin-top: 5px;margin-left: 10px;">
<el-input :placeholder="$t('processCard.projectnumber')" v-model="engineerId" autocomplete="off" style="width: 300px;"/>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('processCard.inquire') }}</el-button>
@@ -817,15 +817,18 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
- height="350"
+ height="600"
ref="table"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
>
<el-table-column prop="engineerId" :label="$t('processCard.project')" width="200" align="center"/>
- <el-table-column prop="workingProcedure" :label="$t('processCard.awayprocess')" align="center"/>
- <el-table-column prop="deviceName" :label="$t('processCard.awayequipment')" align="center"/>
- <el-table-column prop="teamsGroupsName" :label="$t('processCard.awayteam')" align="center"/>
+ <el-table-column prop="temperingLayoutId" :label="$t('processCard.layoutID')" align="center"/>
+ <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center"/>
+ <el-table-column prop="glassId" :label="$t('processCard.glassID')" align="center"/>
+ <el-table-column prop="width" :label="$t('processCard.width')" align="center"/>
+ <el-table-column prop="height" :label="$t('processCard.height')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center"/>
</el-table>
</div>
</el-card>
--
Gitblit v1.8.0