From ab58ff107cf4604a3e2b4997854b38f403186a70 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 10 七月 2025 08:17:34 +0800
Subject: [PATCH] 解决现场强制出片提示bug
---
UI-Project/src/views/hollow/hollowequipment.vue | 242 +++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 116 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index cf8653a..ce2f379 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -92,10 +92,13 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="productName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.inproductname')"/>
+ <el-input v-model="customerName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.incustomerName')"/>
<el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
+ <div style="margin-left: 87%;">{{$t('hellow.pairsnumbertotal')}}{{ pairTotal }}</div>
<el-table
ref="table"
style="margin-top: 20px; height: 700px;"
@@ -114,13 +117,14 @@
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
<el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80"/>
- <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80"/>
+ <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
</el-table>
</template>
</el-table-column>
<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 prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -137,22 +141,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>
@@ -161,7 +165,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>
@@ -169,31 +173,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>
@@ -201,11 +205,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>
@@ -214,8 +218,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>
@@ -224,8 +228,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>
@@ -234,8 +238,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>
@@ -245,31 +249,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>
@@ -277,31 +281,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>
@@ -309,31 +313,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>
@@ -341,11 +345,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>
@@ -354,8 +358,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>
@@ -364,8 +368,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>
@@ -374,8 +378,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>
@@ -399,18 +403,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>
@@ -419,7 +423,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>
@@ -427,31 +431,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>
@@ -459,11 +463,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>
@@ -472,8 +476,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>
@@ -482,8 +486,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>
@@ -492,8 +496,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>
@@ -503,31 +507,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>
@@ -535,31 +539,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>
@@ -567,31 +571,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>
@@ -599,11 +603,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>
@@ -612,8 +616,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>
@@ -622,8 +626,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>
@@ -632,8 +636,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>
@@ -758,7 +762,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;"
@@ -991,6 +995,8 @@
const topRemove = ref('')
const filmsId = ref('')
const thickness = ref('')
+const productName = ref('')
+const customerName = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1025,6 +1031,7 @@
const currentRow = reactive({});
const formattedProcessType = ref([]);
const selectedFormulaName = ref('');
+const pairTotal = ref();
let selectedFormulaId = ref(null);
const formulaNameid = ref({ id: null });
const titleformulaName = ref({ formulaName: [] ,formulaId: []});
@@ -1056,7 +1063,7 @@
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
@@ -1109,7 +1116,7 @@
5: t('hellow.intervalFrameTypea')
}
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮
-function handleEdit(row) {
+function handleEdit(row) {
window.localStorage.setItem('id', row.id)
formulaName.value = row.formulaName;
filmRemove.value = removalMethodMap[row.filmRemove];
@@ -1347,10 +1354,10 @@
// 缂虹墖璇︽儏
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) => {
@@ -1376,11 +1383,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
function tableRowClassName({ row }) {
@@ -1400,16 +1406,17 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ productName: productName.value,
+ customerName: customerName.value,
thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟
@@ -1422,10 +1429,8 @@
tableDatax.value = response.data;
titleformulaName.value = response.data.map(item => ({ formulaId: item.id, formulaName: item.formulaName }));
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const handleFormulaChange = (value) => {
@@ -1524,10 +1529,8 @@
intervalFrameWidthFour.value = '';
sealInsert.value = '';
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
@@ -1582,10 +1585,8 @@
adda.value = false
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟鍒犻櫎
@@ -1607,7 +1608,6 @@
ElMessage.success(response.message);
fetchmulan()
} else {
- ElMessage.error(response.msg);
}
}
} catch (error) {
@@ -1625,14 +1625,16 @@
}));
titleSelectJson.value.processType = processTypes;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 棰勮
const handleup = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/appointHollowTaskDetails?cell="+ 930 + "&flowCardId=" + selectedProjectNo.value;
window.localStorage.setItem('flowCardId', selectedProjectNo.value)
@@ -1644,10 +1646,8 @@
selectedProjectNo.value = ''
closeWebSocket(socket);
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const parseData = (rawData) => {
@@ -1662,15 +1662,14 @@
};
});
};
-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];
ElMessage.success(response.message);
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -1686,7 +1685,6 @@
ElMessage.success(response.message);
blinda.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1708,7 +1706,6 @@
ElMessage.success(response.message);
blindc.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1730,7 +1727,6 @@
ElMessage.success(response.message);
blindd.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -1743,6 +1739,14 @@
}
// 棰嗗彇浠诲姟
const finisha = async () => {
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
try {
@@ -1755,7 +1759,6 @@
formulaName.value = '';
totalPairQuantity.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -1764,6 +1767,14 @@
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantitya.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 930 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -1773,7 +1784,6 @@
cella.value = '';
totalPairQuantitya.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
--
Gitblit v1.8.0