From 68d56160c32384f8d939df0bd25bdc9c50b042b9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 30 十月 2023 11:08:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 7f82e44..7012203 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -195,7 +195,7 @@
</div>
<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
- <el-button type="primary" @click="showform3()">{{ $t('Infeed barcodid') }}</el-button>
+ <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Infeed barcodid') }}</el-button>
<el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
</div>
@@ -338,11 +338,12 @@
<el-form :model="form" label-width="100px" style="padding-right: 30px">
<el-form-item style="text-align: center;">
<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
- <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
+ <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Query') }}</el-button>
</el-form-item>
- <div style="display: flex;justify-content: space-around;">
- <label for="">鎵爜浣�</label>
- <label for="">涓婄墖浣�</label>
+ <div style="display: flex;justify-content: space-around;height: 40px;">
+ <label for="">{{ $t('Scan Code Point') }}</label>
+ <label for="">{{ $t('Upper film position') }}</label>
+ <label for="">{{ $t('Glass Information') }}</label>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Barcodid')">
@@ -350,6 +351,9 @@
</el-form-item>
<el-form-item :label="$t('Barcodid')">
<el-input v-model="form3.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form4.glassId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -359,6 +363,9 @@
<el-form-item :label="$t('order')">
<el-input v-model="form3.orderId" readonly autocomplete="off" />
</el-form-item>
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ </el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('length')">
@@ -366,6 +373,9 @@
</el-form-item>
<el-form-item :label="$t('length')">
<el-input v-model="form3.height" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form4.height" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -375,12 +385,18 @@
<el-form-item :label="$t('width')">
<el-input v-model="form3.width" readonly autocomplete="off" />
</el-form-item>
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form4.width" readonly autocomplete="off" />
+ </el-form-item>
</div>
-
+
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="FeedInglassid()" type="primary">{{ $t('confirm') }}</el-button>
+ <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
+ }}</el-button>
+ <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm')
+ }}</el-button>
<el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
</span>
</template>
@@ -477,8 +493,8 @@
<script>
//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
import {
- home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,
- SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass
+ home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId
} from "../../api/home";
@@ -512,16 +528,22 @@
number: 800,
},
form2: {
- orderId: "5",
- glassId: "6",
- height: "7",
- width: "8"
+ orderId: "1145",
+ glassId: "112",
+ height: "59.06",
+ width: "48.03"
},
form3: {
orderId: "1",
glassId: "2",
height: "3",
width: "4"
+ },
+ form4: {
+ orderId: "",
+ glassId: "",
+ height: "",
+ width: ""
},
alarm: [],
tableData: [],
@@ -550,6 +572,8 @@
zhuangtai: "",
orderid: "",
GlassInfo: [],
+ disabled: true,
+ disabled1: true,
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCount: 0
@@ -580,7 +604,6 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
-
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
if (obj.params != null) {
@@ -602,6 +625,7 @@
this.glassid1 = obj.queid[0];
if (this.glassid1 != "") {
+ this.disabled1=false;
this.showform3();
}
this.form2 = obj.form2;
@@ -734,7 +758,7 @@
if (res.data.form != null) {
this.form = res.data.form;
this.dialogFormVisible = true;
- this.$message.success('query was successful');
+ this.$message.success(this.$t('query was successful'));
} else {
this.dialogFormVisible = true;
this.$message.error(this.$t('There is no such glass'));
@@ -753,8 +777,25 @@
}
},
//鏄剧ず鎵爜浣嶅拰涓婄墖浣�
- showform3() {
+ showform3(){
this.dialogFormVisible5 = true;
+ },
+ //鑾峰彇鎵爜浣嶅拰涓婄墖浣嶆暟鎹�
+ SelectGlassByGlassIDs() {
+ this.showform3();
+ SelectGlassByGlassID(this.glassid1).then(res => {
+ if (res.data.form != null) {
+ this.form4 = res.data.form;
+ this.$message.success(this.$t('query was successful'));
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
+ if (this.form2.glassId == "") {
+ this.disabled = false;
+ } else {
+ this.disabled = true;
+ }
+ });
},
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
@@ -947,6 +988,13 @@
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage;
},
+ InsertQueueGlass() {
+ InsertQueueGlassId(this.glassid1).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
}
}
</script>
\ No newline at end of file
--
Gitblit v1.8.0