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 | 353 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 210 insertions(+), 143 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index f6c4317..250e9b4 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -67,17 +67,17 @@
}
.blocks {
-
-
background-image: url('../../img/xmjc.png');
margin: 0 auto;
background-repeat: no-repeat;
background-attachment: local;
- width: 1660px;
min-height: 55vh;
+ width: 1400px;
max-width: 94vw;
background-size: 1200px 510px;
- /* max-width: 100vw;
+ margin: 0 auto;
+ /* width: 1660px;
+ max-width: 100vw;
background-size: 1660px 560px; */
@@ -119,8 +119,8 @@
.orderbutton2 {
position: absolute;
- left: 1170px;
- top: 70px;
+ left: 500px;
+ top: -10px;
}
.blocks-img3 {
@@ -185,6 +185,11 @@
.el-dialog {
width: 90%;
}
+
+/* .el-table td,
+.el-table th {
+ padding: 0px 0;
+} */
</style>
<template>
<el-container>
@@ -209,11 +214,16 @@
<el-table :data="this.tasklist1" border style="width: 100%">
<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
- <el-table-column :width="150" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
- <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="orderId"
+ :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
+ <template slot-scope='scope'>
+ {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -225,13 +235,14 @@
<el-table :data="this.tasklist2" border style="width: 100%">
<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
- <el-table-column :width="150" prop="glassId" :labelf="$t('Infeed glass barcode')"></el-table-column>
- <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Dim')">
+ <el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="orderId"
+ :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">
<template slot-scope='scope'>
- {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight }}
+ {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}
</template>
</el-table-column>
@@ -323,28 +334,28 @@
<el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
</el-form-item>
<el-form-item :label="$t('Barcode')">
- <el-input v-model="form.barcode" readonly autocomplete="off" />
+ <el-input v-model="form.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Order No')">
- <el-input v-model="form.ordernumber" readonly autocomplete="off" />
+ <el-input v-model="form.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('List No')">
- <el-input v-model="form.listnumber" readonly autocomplete="off" />
+ <el-input v-model="form.listId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Box No')">
- <el-input v-model="form.boxnumber" readonly autocomplete="off" />
+ <el-input v-model="form.boxId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Length')">
- <el-input v-model="form.glasslength" readonly autocomplete="off" />
+ <el-input v-model="form.glasswidthmm" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form.glassheightmm" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasswidth" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Width')">
<el-input v-model="form.glassheight" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Length')">
- <el-input v-model="form.glasslengthMm" readonly autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('Width')">
- <el-input v-model="form.glassheightMm" readonly autocomplete="off" />
</el-form-item>
</el-form>
@@ -392,22 +403,31 @@
<el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
- <el-table-column :width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column :width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
<el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column :width="100" prop="north_glass_buffer1s.listnumber"
+ <el-table-column :width="80" prop="listId"
:label="$t('List No')"></el-table-column>
- <el-table-column :width="100" prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <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?$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')">
+ <template slot-scope='scope'>
+ {{ scope.row.glassWidthMm }}{{scope.row.glassWidthMm>0?"*":""}}{{ scope.row.glassHeightMm }}
+ </template>
+ </el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
<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)">
{{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</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.glassId!=null?true:false"
@click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
}}</el-button>
</template>
@@ -420,11 +440,11 @@
<el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
<el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
" :height="700" border style="width: 100%;overflow: auto;">
-
<el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
<el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
<el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="frameBarcode" :label="$t('Frame No')"></el-table-column>
<el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
<el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
</el-table>
@@ -452,106 +472,106 @@
<el-form-item>
<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
v-model="glassid2"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs(1)" :disabled="disabled">{{ $t('Query')
+ <el-button type="primary" @click="SelectGlassByGlassIDs(1)" >{{ $t('Query')
}}</el-button>
</el-form-item>
<el-form-item>
<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"
v-model="glassid1"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="disabled">{{ $t('Query')
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)" >{{ $t('Query')
}}</el-button>
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Barcode')">
- <el-input v-model="form2.barcode" readonly autocomplete="off" />
+ <el-input v-model="form2.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcode')">
- <el-input v-model="form4.barcode" readonly autocomplete="off" />
+ <el-input v-model="form4.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcode')">
- <el-input v-model="form3.barcode" readonly autocomplete="off" />
+ <el-input v-model="form3.glassId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcode')">
- <el-input v-model="form5.barcode" readonly autocomplete="off" />
+ <el-input v-model="form5.glassId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Order No')">
- <el-input v-model="form2.ordernumber" readonly autocomplete="off" />
+ <el-input v-model="form2.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Order No')">
- <el-input v-model="form4.ordernumber" readonly autocomplete="off" />
+ <el-input v-model="form4.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Order No')">
- <el-input v-model="form3.ordernumber" readonly autocomplete="off" />
+ <el-input v-model="form3.orderId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Order No')">
- <el-input v-model="form5.ordernumber" readonly autocomplete="off" />
+ <el-input v-model="form5.orderId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('List No')">
- <el-input v-model="form2.listnumber" readonly autocomplete="off" />
+ <el-input v-model="form2.listId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('List No')">
- <el-input v-model="form4.listnumber" readonly autocomplete="off" />
+ <el-input v-model="form4.listId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('List No')">
- <el-input v-model="form3.listnumber" readonly autocomplete="off" />
+ <el-input v-model="form3.listId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('List No')">
- <el-input v-model="form5.listnumber" readonly autocomplete="off" />
+ <el-input v-model="form5.listId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Box No')">
- <el-input v-model="form2.boxnumber" readonly autocomplete="off" />
+ <el-input v-model="form2.boxId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Box No')">
- <el-input v-model="form4.boxnumber" readonly autocomplete="off" />
+ <el-input v-model="form4.boxId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Box No')">
- <el-input v-model="form3.boxnumber" readonly autocomplete="off" />
+ <el-input v-model="form3.boxId" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Box No')">
- <el-input v-model="form5.boxnumber" readonly autocomplete="off" />
+ <el-input v-model="form5.boxId" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Length')">
- <el-input v-model="form2.glasslength" readonly autocomplete="off" />
+ <el-input v-model="form2.glasswidthmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Length')">
- <el-input v-model="form4.glasslength" readonly autocomplete="off" />
+ <el-input v-model="form4.glasswidthmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Length')">
- <el-input v-model="form3.glasslength" readonly autocomplete="off" />
+ <el-input v-model="form3.glasswidthmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Length')">
- <el-input v-model="form5.glasslength" readonly autocomplete="off" />
+ <el-input v-model="form5.glasswidthmm" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
<el-form-item :label="$t('Width')">
- <el-input v-model="form2.glassheight" readonly autocomplete="off" />
+ <el-input v-model="form2.glassheightmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Width')">
- <el-input v-model="form4.glassheight" readonly autocomplete="off" />
+ <el-input v-model="form4.glassheightmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Width')">
- <el-input v-model="form3.glassheight" readonly autocomplete="off" />
+ <el-input v-model="form3.glassheightmm" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Width')">
- <el-input v-model="form5.glassheight" readonly autocomplete="off" />
+ <el-input v-model="form5.glassheightmm" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-button @click="DeleteQueueGlasss(2)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ <el-button @click="DeleteQueueGlasss(2)" type="primary" >{{ $t('Clear Current')
}}</el-button>
- <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled1">
+ <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">
{{ $t('Confirm Modification') }}</el-button>
- <el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
+ <el-button @click="DeleteQueueGlasss(1)" type="primary" >{{ $t('Clear Current')
}}</el-button>
<el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
{{ $t('Confirm Modification') }}</el-button>
@@ -566,16 +586,29 @@
<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="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="barCode" :label="$t('Frame No')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.glasslength" :label="$t('Length')"></el-table-column>
- <el-table-column prop="north_glass_buffer1s.glassheight" :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)"
+ :disabled="scope.$index == 0">
+ 缃《
+ </el-button>
+ <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
+ :disabled="scope.$index == 0">
+ 涓婄Щ
+ </el-button>
+ <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
+ :disabled="OutSlice.length - 1 == scope.$index">涓嬬Щ
+ </el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
</template>
@@ -608,7 +641,7 @@
{{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
-
+
<el-table-column prop="storageCage.tier" :label="$t('In the cage')">
<template slot-scope='scope'>
{{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
@@ -616,7 +649,8 @@
</el-table-column>
<el-table-column :width="80" :label="$t('Operate')">
<template slot-scope='scope'>
- <el-checkbox label="" :disabled="!(scope.row.storageCage != null&&scope.row.out_slice == null)" :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode,$event)"></el-checkbox>
+ <el-checkbox label="" :disabled="!(scope.row.storageCage != null && scope.row.out_slice == null)"
+ :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode, $event)"></el-checkbox>
</template>
</el-table-column>
</el-table>
@@ -626,9 +660,9 @@
<script>
import {
- home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
+ 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";
@@ -699,7 +733,8 @@
pageCount: 0,
OutSlice: [],
AluminumFrame: [],
- framebarcode: ""
+ framebarcode: "",
+ isAllowQueue:true
};
},
created() {
@@ -709,7 +744,6 @@
methods: {
init() {
let viewname = "Home";
-
if (typeof (WebSocket) == "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
@@ -743,53 +777,58 @@
this.tasklist1 = obj.tasklist1[0];
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;
if (obj.zhuangtai != null) {
this.zhuangtai = obj.zhuangtai[0];
}
- if(this.dialogFormVisible7==true){
+ if (this.dialogFormVisible7 == true) {
this.showform7();
}
- // this.glassid1 = obj.queid[0];
- // if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 0) {
- // this.state = false;
- // this.disabled = true;
- // this.disabled1 = false;
- // this.showform3();
- // } else if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 1) {
- // this.state = true;
- // this.disabled = true;
- // this.disabled1 = true;
- // }
- // else {
- // this.state = true;
- // this.disabled = false;
- // this.disabled1 = false;
- // }
if (obj.form2 != null && obj.form2 != "") {
this.form2 = obj.form2[0];
} else {
this.form2 = {};
}
-
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
+
} else {
this.form3 = {};
-
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
this.form5 = obj.form3[0];
+ this.showform3();
+ 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.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled1 = false;
+ }
+ } else {
+ 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.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled1 = false;
+ }
}
//if (obj.dbconnected == "false") {
this.text = this.$t('DataBase Connection failed');
// }
- SelectCageInfo(this.cage).then(res => {
- this.cageinfo = res.data.cageinfo;
- });
- SelectGlass(this.orderid).then(res => {
- this.GlassInfo = res.data.glass;
- });
+ if (this.dialogFormVisible3 == true) {
+ SelectCageInfo(this.cage).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ });
+ }
this.$forceUpdate();
@@ -816,14 +855,14 @@
this.cagelist3 = res.data.list3;
this.cagelist4 = res.data.list4;
});
- //鍔犺浇杩涚墖浠诲姟鏁版嵁
- loadtask(this.task1).then(res => {
- this.tasklist1 = res.data.list;
- });
- //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
- loadtask(this.task2).then(res => {
- this.tasklist2 = res.data.list;
- });
+ // //鍔犺浇杩涚墖浠诲姟鏁版嵁
+ // loadtask(this.task1).then(res => {
+ // this.tasklist1 = res.data.list;
+ // });
+ // //鍔犺浇杩涘嚭鐗囦换鍔℃暟鎹�
+ // loadtask(this.task2).then(res => {
+ // this.tasklist2 = res.data.list;
+ // });
//鍔犺浇鎶ヨ淇℃伅
SelectAlarmmgInfo().then(res => {
this.alarm = res.data.alarmmg;
@@ -907,6 +946,7 @@
SelectGlassByGlassID(this.glassid).then(res => {
if (res.data.form != null) {
this.form = res.data.form;
+ console.log(this.form);
this.dialogFormVisible = true;
this.$message.success(this.$t('query was successful'));
} else {
@@ -937,6 +977,14 @@
if (res.data.form != null) {
this.form4 = res.data.form;
this.$message.success(this.$t('query was successful'));
+ if (this.form4.glassheight < 380 || this.form4.glasswidth < 390 || this.form4.glassheight > 1810 || this.form4.glasswidth > 2760) {
+ if (this.disabled == false) {
+ this.disabled = true;
+ this.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled = false;
+ }
} else {
this.$message.error(this.$t('There is no such glass'));
}
@@ -954,6 +1002,14 @@
if (res.data.form != null) {
this.form5 = res.data.form;
this.$message.success(this.$t('query was successful'));
+ 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.$message.error(this.$t('The glass size is not within the range'));
+ }
+ } else {
+ this.disabled1 = false;
+ }
} else {
this.$message.error(this.$t('There is no such glass'));
}
@@ -991,13 +1047,13 @@
SelectAluminumFrameInfoById(this.framebarcode).then(res => {
this.AluminumFrame = res.data.listAluminumFrame;
this.AluminumFrame.forEach(item => {
- if(item.storageCage!=null&&item.out_slice==null){
+ if (item.storageCage != null && item.out_slice == null) {
item.isCheck = true;
- }else{
+ } else {
item.isCheck = false;
}
- item.Flip=res.data.flip;
- item.FrameNo=this.framebarcode;
+ item.Flip = res.data.flip;
+ item.FrameNo = this.framebarcode;
});
});
this.dialogFormVisible7 = true;
@@ -1051,7 +1107,6 @@
this.cage = cage;
SelectCageInfo(cage).then(res => {
this.cageinfo = res.data.cageinfo;
- console.log(this.cageinfo)
this.dialogFormVisible3 = true;
});
},
@@ -1100,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 {
@@ -1207,9 +1259,9 @@
},
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
InsertQueueGlass(parameter) {
- if (parameter == 1 && this.form5.barcode != "") {
- if (this.form5.barcode != this.form2.barcode) {
- InsertQueueGlassId(this.form5.barcode, 1).then(res => {
+ if (parameter == 1 && this.form5.glassId != "") {
+ if (this.form5.glassId != this.form2.glassId) {
+ InsertQueueGlassId(1,this.form5).then(res => {
if (res.data.message == 200) {
this.form5 = {};
this.$message.success(this.$t('Operation successful'));
@@ -1220,9 +1272,9 @@
} else {
this.$message.error(this.$t('The glass ID already exists in the loading queue'));
}
- } else if (parameter == 2 && this.form4.barcode != "") {
- if (this.form4.barcode != this.form3.barcode) {
- InsertQueueGlassId(this.form4.barcode, 2).then(res => {
+ } else if (parameter == 2 && this.form4.glassId != "") {
+ if (this.form4.glassId != this.form3.glassId) {
+ InsertQueueGlassId(2,this.form4).then(res => {
if (res.data.message == 200) {
this.form4 = {};
this.$message.success(this.$t('Operation successful'));
@@ -1261,35 +1313,50 @@
}
});
},
- CheckBoxchange(glassid,isChecked){
- this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
- console.log(this.AluminumFrame);
+ CheckBoxchange(glassid, isChecked) {
+ this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
},
- addoutslice(){
+ addoutslice() {
// var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});
// var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});
// var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});
- var dats_=new Array();
+ var dats_ = new Array();
this.AluminumFrame.forEach(item => {
- var dats2_=new Array();
- dats2_[0]=item.barcode;
- dats2_[1]=item.isCheck;
- dats2_[2]=item.Flip;
- dats2_[3]=item.FrameNo;
- dats2_[4]=item.glasslengthMm;
- dats2_[5]=item.glassheightMm;
- dats_[dats_.length]=dats2_;
+ var dats2_ = new Array();
+ dats2_[0] = item.barcode;
+ dats2_[1] = item.isCheck;
+ dats2_[2] = item.Flip;
+ dats2_[3] = item.FrameNo;
+ dats2_[4] = item.glasslengthmm;
+ dats2_[5] = item.glassheightmm;
+ dats_[dats_.length] = dats2_;
});
- console.log(dats_);
- //var AluminumFrames=this.AluminumFrame.map((item)=>({barcode,isCheck,Flip}) );
- // console.log(AluminumFrames1);
- // console.log(AluminumFrames2);
- // console.log(AluminumFrames3);
- AddOutSliceS(dats_).then(res=>{
+ AddOutSliceS(dats_).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
});
+ }, getTopMove(row, index) {
+ this.OutSlice.splice(index, 1)
+ this.OutSlice.unshift(row)
+ },
+ //涓婄Щ
+ getUpMove(row, index) {
+ let arr = this.OutSlice;
+ arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]));
+ },
+ //涓嬬Щ
+ 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