From 9102806e784fff6ebbd8773f2f07f8e5768de702 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 23 二月 2024 09:47:33 +0800
Subject: [PATCH] 代码更新
---
CanadaMes-ui/src/views/home/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7622122..857ea53 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -256,7 +256,7 @@
:class="ManuallyInfeedGlass == true ? 'hide' : ''">
{{ $t('Manually Infeed Glass') }}</el-button>
<el-button type="primary" @click="showform2()" :disabled="OrderInfo"
- :class="OrderInfo == true ? 'hide' : ''">{{ $t('OrderInfo')
+ :class="OrderInfo == true ? 'hide' : ''">{{ $t('Order Info')
}}</el-button>
<el-button type="primary" @click="showform6()" :disabled="OutingQueue"
:class="OutingQueue == true ? 'hide' : ''">
@@ -588,7 +588,7 @@
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+ <el-dialog :visible.sync="dialogFormVisible4" :title="$t('Order Info')" top="5vh">
<el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
<el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
<el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
@@ -1124,8 +1124,9 @@
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
this.loadglassheight1 = 70;
- if (this.form5.glassId != obj.form3[0].glassId) {
+ if (this.form5.glassId != obj.form3[0].glassId&&this.ManuallyInfeedGlass==false) {
this.showform3();
+
}
this.form5 = obj.form3[0];
this.glassid1 = "";
--
Gitblit v1.8.0