From cf9e6eb7bfe620184ada5594dabb2734b34bb7cb Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 12 五月 2025 10:53:01 +0800
Subject: [PATCH] 添加 比对数据,不同变红警告
---
UI-Project/src/views/hollow/hollowequipment.vue | 225 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 121 insertions(+), 104 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index d69481d..27bb9b6 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -100,12 +100,15 @@
ref="table"
style="margin-top: 20px; height: 700px;"
:data="tableDatab"
+ :row-class-name="tableRowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
<el-table-column>
<template #default="props">
- <el-table :data="props.row.records" style="width: 100%">
+ <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
+ :row-class-name="(row) => nestedTableRowClassName(props.row, row)"
+ >
<el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -116,11 +119,11 @@
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
- <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
- <el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
+ <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
<el-button type="text" plain @click="handleBindRack(scope.row)">{{
$t('hellow.missingfilms')
}}
@@ -134,22 +137,22 @@
</el-table>
</el-dialog>
<!-- 涓┖閰嶆柟娣诲姞 -->
-<el-dialog v-model="add" top="15vh" width="85%" :title="$t('hellow.hollowformula')" >
+<el-dialog v-model="add" top="15vh" width="90%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px" label-position="right">
<!-- 绗竴琛岋細3涓厓绱� -->
<el-row style="margin-top: 10px;">
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.formulaName')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
<el-input v-model="formulaName" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 100%;">
- <el-select v-model="filmRemove" clearable style="width: 100%" >
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -158,7 +161,7 @@
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.sealInsertb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
<el-input v-model="sealInsert" autocomplete="off" />
</el-form-item>
</div>
@@ -166,31 +169,31 @@
</el-row>
<!-- 绗簩琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.topRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
<el-input v-model="topRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.bottomRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
<el-input v-model="bottomRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.leftRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
<el-input v-model="leftRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.rightRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
<el-input v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div>
@@ -198,11 +201,11 @@
</el-row>
<!-- 绗笁琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casOneb')" style="width: 100%;">
- <el-select v-model="casOne" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -211,8 +214,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casTwob')" style="width: 100%;">
- <el-select v-model="casTwo" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -221,8 +224,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casThreeb')" style="width: 100%;">
- <el-select v-model="casThree" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -231,8 +234,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casFourb')" style="width: 100%;">
- <el-select v-model="casFour" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -242,31 +245,31 @@
</el-row>
<!-- 绗洓琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameOneb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
<el-input v-model="frameOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameTwob')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
<el-input v-model="frameTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameThreeb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
<el-input v-model="frameThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameFourb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
<el-input v-model="frameFour" autocomplete="off" />
</el-form-item>
</div>
@@ -274,31 +277,31 @@
</el-row>
<!-- 绗簲琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
<el-input v-model="intervalFrameHeightOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
<el-input v-model="intervalFrameHeightThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
<el-input v-model="intervalFrameHeightFour" autocomplete="off" />
</el-form-item>
</div>
@@ -306,31 +309,31 @@
</el-row>
<!-- 绗叚琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
<el-input v-model="intervalFrameWidthOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
<el-input v-model="intervalFrameWidthThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
<el-input v-model="intervalFrameWidthFour" autocomplete="off" />
</el-form-item>
</div>
@@ -338,11 +341,11 @@
</el-row>
<!-- 绗竷琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -351,8 +354,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -361,8 +364,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -371,8 +374,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -396,18 +399,18 @@
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
<el-form label-width="150px" label-position="right">
<!-- 绗竴琛岋細3涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.formulaName')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.formulaName')" style="width: 90%;">
<el-input v-model="formulaName" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 100%;">
- <el-select v-model="filmRemove" clearable style="width: 100%" >
+ <el-form-item :label="$t('Mounting.removalmethoda')" style="width: 90%;">
+ <el-select v-model="filmRemove" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -416,7 +419,7 @@
</el-col>
<el-col :span="8">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.sealInsertb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.sealInsertb')" style="width: 90%;">
<el-input v-model="sealInsert" autocomplete="off" />
</el-form-item>
</div>
@@ -424,31 +427,31 @@
</el-row>
<!-- 绗簩琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.topRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.topRemove')" style="width: 90%;">
<el-input v-model="topRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.bottomRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.bottomRemove')" style="width: 90%;">
<el-input v-model="bottomRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.leftRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.leftRemove')" style="width: 90%;">
<el-input v-model="leftRemove" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.rightRemove')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.rightRemove')" style="width: 90%;">
<el-input v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div>
@@ -456,11 +459,11 @@
</el-row>
<!-- 绗笁琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casOneb')" style="width: 100%;">
- <el-select v-model="casOne" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casOneb')" style="width: 90%;">
+ <el-select v-model="casOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -469,8 +472,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casTwob')" style="width: 100%;">
- <el-select v-model="casTwo" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casTwob')" style="width: 90%;">
+ <el-select v-model="casTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -479,8 +482,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casThreeb')" style="width: 100%;">
- <el-select v-model="casThree" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casThreeb')" style="width: 90%;">
+ <el-select v-model="casThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -489,8 +492,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.casFourb')" style="width: 100%;">
- <el-select v-model="casFour" clearable style="width: 100%">
+ <el-form-item :label="$t('hellow.casFourb')" style="width: 90%;">
+ <el-select v-model="casFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.F')" value="0"></el-option>
<el-option :label="$t('hellow.Y')" value="1"></el-option>
</el-select>
@@ -500,31 +503,31 @@
</el-row>
<!-- 绗洓琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameOneb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameOneb')" style="width: 90%;">
<el-input v-model="frameOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameTwob')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameTwob')" style="width: 90%;">
<el-input v-model="frameTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameThreeb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameThreeb')" style="width: 90%;">
<el-input v-model="frameThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.frameFourb')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.frameFourb')" style="width: 90%;">
<el-input v-model="frameFour" autocomplete="off" />
</el-form-item>
</div>
@@ -532,31 +535,31 @@
</el-row>
<!-- 绗簲琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbOne')" style="width: 90%;">
<el-input v-model="intervalFrameHeightOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameHeightTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbThree')" style="width: 90%;">
<el-input v-model="intervalFrameHeightThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameHeightbFour')" style="width: 90%;">
<el-input v-model="intervalFrameHeightFour" autocomplete="off" />
</el-form-item>
</div>
@@ -564,31 +567,31 @@
</el-row>
<!-- 绗叚琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbOne')" style="width: 90%;">
<el-input v-model="intervalFrameWidthOne" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbTwo')" style="width: 90%;">
<el-input v-model="intervalFrameWidthTwo" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbThree')" style="width: 90%;">
<el-input v-model="intervalFrameWidthThree" autocomplete="off" />
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 100%;">
+ <el-form-item :label="$t('hellow.intervalFrameWidthbFour')" style="width: 90%;">
<el-input v-model="intervalFrameWidthFour" autocomplete="off" />
</el-form-item>
</div>
@@ -596,11 +599,11 @@
</el-row>
<!-- 绗竷琛岋細4涓厓绱� -->
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 20px;">
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedOne')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeOne" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -609,8 +612,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedTwo')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeTwo" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -619,8 +622,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedThree')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeThree" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -629,8 +632,8 @@
</el-col>
<el-col :span="6">
<div style="font-size: 15px;">
- <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 100%;">
- <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" >
+ <el-form-item :label="$t('hellow.intervalFrameTypedFour')" style="width: 90%;">
+ <el-select v-model="intervalFrameTypeFour" clearable style="width: 100%" :placeholder="$t('screendisplay.pchoice')">
<el-option :label="$t('hellow.intervalFrameTypeb')" value="1"></el-option>
<el-option :label="$t('hellow.intervalFrameTypea')" value="5"></el-option>
</el-select>
@@ -755,7 +758,7 @@
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
- {{ currentRow.projectNumber }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -1053,7 +1056,7 @@
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
@@ -1344,20 +1347,20 @@
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
- const { projectNumber, layer } = row;
- currentRow.projectNumber = row.projectNumber;
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer,currentPage2.value);
+ fetchFlowBind(flowCardId,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisibled.value = true;
fetchmulan()
};
@@ -1365,14 +1368,14 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
+ deviceId: 0,
filmsId: '',
flowCardId: '',
- thickness: '',
+ thickness: 0,
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1380,6 +1383,18 @@
ElMessage.error('Error fetching data');
}
};
+function tableRowClassName({ row }) {
+ if (row.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
+function nestedTableRowClassName(parentRow, row) {
+ if (parentRow.isThroughSlot == true) {
+ return 'row-red-background';
+ }
+ return '';
+}
const fetchFlowCardsearch = async () => {
try {
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -1389,8 +1404,7 @@
});
if (response.code == 200) {
ElMessage.success(response.message);
- const newData = parseData(response.data);
- tableDatab.value = newData;
+ tableDatab.value = response.data;
} else {
ElMessage.error('Failed to fetch data');
}
@@ -1648,9 +1662,9 @@
};
});
};
-const fetchFlowBind = async (flowCardId, layer, page) => {
+const fetchFlowBind = async (flowCardId, page) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
const response = await request.post(url)
if (response.code == 200) {
tableDatac.value = response.data[page];
@@ -1783,4 +1797,7 @@
margin-top: 20px;
margin-bottom: 10px;
}
+::v-deep(.row-red-background) {
+ background-color: rgb(224.6, 242.8, 215.6) !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0