From 63650b635ac59b24292c584a80a9ad3496a14748 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十二月 2023 09:22:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 94 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14fbabe..daa8132 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -390,9 +390,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
+ <!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
type="primary">{{
- $t('confirm') }}</el-button>
+ $t('confirm') }}</el-button> -->
<el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
type="primary">{{
$t('confirm') }}</el-button>
@@ -439,7 +439,7 @@
<el-table-column :min-width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
<el-table-column :min-width="80" prop="listId" :label="$t('List No')"></el-table-column>
<el-table-column :min-width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
- <el-table-column :min-width="90" prop="state" :label="$t('State')">
+ <el-table-column :min-width="90" prop="state" :label="$t('Glass State')">
<template slot-scope='scope'>
{{
scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
@@ -454,7 +454,7 @@
</el-table-column>
<el-table-column :min-width="250" :label="$t('Operate')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state == 1 ? false : true"
@click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
:disabled="scope.row.state == 1 ? false : true"
@@ -636,34 +636,35 @@
}}</el-button>
<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
style="width: 100%;overflow: auto;">
- <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column :min-width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
<el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>
<el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>
<el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>
<el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>
- <el-table-column prop="state" :label="$t('State')">
+ <el-table-column prop="state" :label="$t('Glass State')">
<template slot-scope='scope'>
- {{ scope.row.state == 0 ? "Waiting" : scope.row.state == 1 ?"Outing":"Completed" }}
+ {{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') : scope.row.state == 2 ? $t('Completed') :scope.row.state == 3 ? $t('Absent') :$t('Deleted') }}
</template>
</el-table-column>
<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column prop="position" :label="$t('Position')">
+ <el-table-column prop="position" :label="$t('Position')" style="font-size: 20px;">
<template slot-scope='scope'>
- {{ scope.row.position==1?$t('Yes'):$t('No') }}
+ {{ scope.row.position == 1 ? "鈻勨杽鈻�" : "鈻�" }}
</template>
</el-table-column>
<el-table-column prop="position" :label="$t('Flip')">
<template slot-scope='scope'>
- {{ scope.row.flip==1?$t('Yes'):$t('No') }}
+ {{ scope.row.flip == 1 ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
<el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>
<el-table-column prop="barcode" :label="$t('Complete')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="!isAllowQueue"
- @click="CompleteQueue(scope.row.id,scope.row.barcode)">{{ $t('Complete') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="(!isAllowQueue||scope.row.state!=1)"
+ @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{ $t('Complete')
+ }}</el-button>
</template>
</el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
@@ -819,22 +820,17 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
-
+
};
},
created() {
this.load();
this.init();
- setInterval(() => {
- if(socket.readyState != 1){
- this.init();
- }
- }, 20000);
}
,
methods: {
-
-
+
+
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
@@ -851,13 +847,6 @@
//鎵撳紑浜嬩欢
socket.onopen = function () {
console.log("websocket宸叉墦寮�");
- // setInterval(()=>{
- // if(socket){
- // if(socket.readyState==socket.OPEN){
- // socket.send('');
- // }
- // }
- // },5000);
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = function (msg) {
@@ -1023,7 +1012,6 @@
if (res.data.message == 200) {
this.dialogFormVisible1 = false;
this.$message.success(this.$t('Operation successful'));
-
} else {
this.$message.error(this.$t('There is no glass for this order'));
}
@@ -1322,19 +1310,24 @@
},
//鎵嬪姩涓婄墖
FeedInglassid() {
- Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
- if (this.form.barcode != "") {
+ if (this.form.glassId != ""&&this.form.glassId != null) {
+ Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
- } else {
+ }
+ else if (res.data.message == 400) {
+ this.$message.error(this.$t('The glass size is not within the range'));
+ }
+ else if (res.data.message == 300) {
this.$message.error(this.$t('This glass is already in the cage'));
}
- } else {
- this.$message.error(this.$t('There is no such glass'));
- }
+ });
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
- });
+
},
//鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
@@ -1600,19 +1593,20 @@
});
}
,
- cellStyle({ row, column, rowIndex, columnIndex }) {
- // console.log(row, column, "ss");
- column=rowIndex;
- rowIndex=column;
- let style="";
- if (columnIndex === 8&&row.position==1) {
- style="background-Color:yellow;";
- }
- if (columnIndex === 9&&row.flip==1) {
- style="background-Color:yellow;";
- }
- return style;
- }
+ cellStyle({ row, column, rowIndex, columnIndex }) {
+ // console.log(row, column, "ss");
+ column = rowIndex;
+ rowIndex = column;
+ let style = "";
+ if (columnIndex === 8 ) {
+ style = "font-size:25px;";
+ }
+ if (columnIndex === 9 && row.flip == 1) {
+ style = "background-Color:yellow;";
+ }
+ style
+ return style;
+ }
,
//鍚堝苟琛�
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -1690,8 +1684,8 @@
this.form5 = {};
},
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
- CompleteQueue(id,frameid) {
- CompleteQueue(id,frameid).then(res => {
+ CompleteQueue(id, frameid, glassid) {
+ CompleteQueue(id, frameid, glassid).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
--
Gitblit v1.8.0