From ef0a11243f8ccf842e7298ae11f028afee019e4c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 09:06:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index e3d1e15..1a1c930 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -408,7 +408,8 @@
<el-table-column :width="100" prop="state" :label="$t('State')">
<template slot-scope='scope'>
{{
- scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ? $t('Outing') : ""
+ scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
+ $t('Outing') : ""
}}
</template>
</el-table-column>
@@ -807,8 +808,26 @@
if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {
if (this.disabled1 == false) {
this.disabled1 = true;
+ this.$confirm(this.$t('The glass size is not within the range'), this.$t('confirm'), {
+ // inputType: 'password',
+ // inputPlaceholder: this.$t('Please enter the password'),
+
+ confirmwidth:7000,
+ height:8000,
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(() => {
+ this.$message.success(this.$t('Operation successful'));
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
this.$message.error(this.$t('The glass size is not within the range'));
}
+
} else {
this.disabled1 = false;
}
@@ -1047,7 +1066,7 @@
SelectAluminumFrameInfoById(this.framebarcode).then(res => {
this.AluminumFrame = res.data.listAluminumFrame;
this.AluminumFrame.sort(function (x, y) {
- if(x['storageCage']!=null&&y['storageCage']!=null){
+ if (x['storageCage'] != null && y['storageCage'] != null) {
return y['storageCage']['tier'] - x['storageCage']['tier'];
}
});
--
Gitblit v1.8.0