From 0b28598dabd95862411a75a3cd2152f896671261 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 五月 2025 16:12:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/hollow/hollowequipment.vue | 193 ++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 96 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index ecf2fdd..5b66a71 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -121,6 +121,7 @@
</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 +138,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 +162,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 +170,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 +202,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 +215,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 +225,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 +235,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 +246,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 +278,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 +310,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 +342,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 +355,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 +365,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 +375,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 +400,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 +420,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 +428,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 +460,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 +473,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 +483,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 +493,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 +504,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 +536,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 +568,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 +600,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 +613,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 +623,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 +633,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 +759,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;"
@@ -1056,7 +1057,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 +1110,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,20 +1348,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()
};
@@ -1662,9 +1663,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];
--
Gitblit v1.8.0