From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index b7cc24a..250e9b4 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -410,7 +410,7 @@
<el-table-column :width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
<el-table-column :width="100" prop="state" :label="$t('State')">
<template slot-scope='scope'>
- {{ scope.row.state==1?"1":"2" }}
+ {{ scope.row.state==1?$t('Normal'):scope.row.state==2?$t('Entering'):scope.row.state==3?$t('Outing'):"" }}
</template>
</el-table-column>
<el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')">
@@ -422,7 +422,7 @@
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
- <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="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
@@ -586,14 +586,16 @@
<el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">
<el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button>
+ <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue==true?$t('Stop'):$t('Start') }}</el-button>
+
<el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">
<el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="listId" :label="$t('List No')"></el-table-column>
- <el-table-column prop="boxId" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="barCode" :label="$t('Frame No')"></el-table-column>
- <el-table-column prop="glasswidthmm" :label="$t('Length')"></el-table-column>
- <el-table-column prop="glassheightmm" :label="$t('Width')"></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="barcode" :label="$t('Frame 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 :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
@@ -660,7 +662,7 @@
import {
home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
- SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS
+ SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues
} from "../../api/home";
@@ -731,7 +733,8 @@
pageCount: 0,
OutSlice: [],
AluminumFrame: [],
- framebarcode: ""
+ framebarcode: "",
+ isAllowQueue:true
};
},
created() {
@@ -775,6 +778,8 @@
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
+ this.isAllowQueue=obj.isAllowQueue;
+ console.log(obj);
//鍑虹墖闃熷垪
this.OutSlice = obj.listoutslice[0];
this.loadglassheight = obj.loadglassheight;
@@ -1150,11 +1155,8 @@
if (res.data.message3 == 200) {
this.$message.success(this.$t('Operation successful'));
}
- else if (res.data.message2 == 300) {
- this.$message.error(this.$t('There is no such grid'));
- }
else if (res.data.message2 == 500) {
- this.$message.error(this.$t('This glass is already in the cage'));
+ this.$message.error(this.$t('This glass is already in the Queue'));
}
});
} else {
@@ -1347,6 +1349,14 @@
getDownMove(row, index) {
let arr = this.OutSlice;
arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));
+ },
+ //鍒囨崲鍑虹墖闃熷垪鐘舵��
+ isAllowQueueState(){
+ isAllowQueues(!this.isAllowQueue).then(res=>{
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ })
}
}
}
--
Gitblit v1.8.0