From 1ef594ec1f04383ad052d7bd6647742371038674 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 23 四月 2024 10:58:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7622122..2de9353 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)
@@ -743,17 +743,9 @@
<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
== true ? $t('Stop') : $t('Start')
}}</el-button>
- <!-- {{ $t('Sorting State') }}:
- {{
- this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
- }}
- <el-button type="primary" @click="isAllowReorderings()" :disabled="this.isAllowQueue">{{
- this.isAllowReordering == true ? $t('Allow') : $t('Not Allow')
- }}</el-button> -->
- <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input> -->
<el-button type="primary" @click="showform7()">{{ $t('Add') }}</el-button>
<label style="background-color:yellow;font-size: 23px;" for="">
- {{ isQueueWarning == true ? $t('The cage is disabled') : "" }}
+ {{ isQueueWarning == true ? $t('The slot is disabled') : "" }}
</label>
<div style="display:flex;">
<div style="width:70%;">
@@ -1025,7 +1017,7 @@
const specialChars = /[^\w\s]/g;
this.CurrrentGlassId = obj.CurrrentGlassId[0].replace(specialChars, "");
}
-
+
//鏌ヨ褰撳墠閾濇淇℃伅
this.CurrentFrame = obj.CurrentFrame;
@@ -1051,7 +1043,6 @@
this.InsertQueueGlass(1);
}
}
-
// if (obj.alarmmg[0].length > 0) {
@@ -1124,8 +1115,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 = "";
@@ -1516,6 +1508,7 @@
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
+ this.glassid="";
}
else if (res.data.message == 400) {
this.$message.error(this.$t('The glass size is not within the range'));
--
Gitblit v1.8.0