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 | 842 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 621 insertions(+), 221 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index f6c4317..daa8132 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; */
@@ -104,7 +104,7 @@
position: absolute;
background-image: url('../../img/dipan.png');
background-size: 70px 85px;
- left: 654px;
+ left: 501px;
top: 333px;
/* background-size: 85px 100px;
left: 912px;
@@ -119,8 +119,8 @@
.orderbutton2 {
position: absolute;
- left: 1170px;
- top: 70px;
+ left: 500px;
+ top: -10px;
}
.blocks-img3 {
@@ -132,7 +132,7 @@
position: absolute;
background-image: url('../../img/taimian.png');
background-size: 120px 30px;
- left: 630px;
+ left: 477px;
top: 420px;
/* background-size: 160px 40px;
left: 875px;
@@ -185,6 +185,36 @@
.el-dialog {
width: 90%;
}
+
+.el-message-box__message {
+ font-size: 27px;
+}
+
+.el-message-box {
+ height: 200px;
+ width: 600px;
+}
+
+.el-button--small {
+ font-size: 25px;
+}
+
+@media screen and (min-width: 1900px) {
+ .blocks {
+ transform: scale(1.5, 1.05);
+ width: 1210px;
+ }
+}
+
+.el-message-box__btns {
+ padding: 0px 15px 0;
+ text-align: right;
+}
+
+/* .el-table td,
+.el-table th {
+ padding: 0px 0;
+} */
</style>
<template>
<el-container>
@@ -199,21 +229,26 @@
</label>
</div>
</div>
- <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
+ <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">
<el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>
- <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</el-button>
- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
- <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
+ <el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="ManuallyInfeedGlass">
+ {{ $t('Manually Infeed Glass') }}</el-button>
+ <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>
+ <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->
</div>
<div>
<el-table :data="this.tasklist1" border style="width: 100%">
+ <el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
<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="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 }}*{{ 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;"
@@ -223,15 +258,15 @@
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
+ <el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>
<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="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 }}*{{ scope.row.glassheightmm }}
</template>
</el-table-column>
@@ -281,14 +316,19 @@
@click="showcageinfo(item['cage'])"></div>
</div>
<div class="blue gezi"
- :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">
+ :style="{ display: 'flex', position: 'absolute', float: 'left', top: 28 + 'px', left: 1050 + 'px', height: loadglassheight1 + 'px', width: 4 + 'px' }">
+ </div>
+ <div class="blue gezi"
+ :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight2 + 'px', width: 4 + 'px' }">
</div>
<div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>
<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
- <el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
- <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>
+ <el-button class="orderbutton1" type="primary" @click="showform2()" :disabled="OrderInfo">{{ $t('OrderInfo')
+ }}</el-button>
+ <el-button class="orderbutton2" type="primary" @click="showform6()" :disabled="OutingQueue">
+ {{ $t('Outing Queue') }}</el-button>
<!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
<div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
@@ -323,36 +363,36 @@
<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>
<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>
@@ -388,31 +428,54 @@
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
- <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
- <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="100" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column :width="100" prop="north_glass_buffer1s.listnumber"
- :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="280" :label="$t('Operate')">
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="cageglassid"></el-input>
+ <el-button type="primary" @click="showcageinfo(1)">{{ $t('Query') }}</el-button>
+ <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border
+ style="width: 100%;overflow: auto;">
+ <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column :min-width="55" prop="tier" :label="$t('The Side')"></el-table-column>
+ <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <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('Glass State')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ {{
+ 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 :min-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 :min-width="250" :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <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"
@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;"
+ :disabled="scope.row.glassId != null ? true : false"
@click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
}}</el-button>
</template>
</el-table-column>
</el-table>
+
+ <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"
+ @current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"
+ :page-sizes="[21, 42, 84, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"
+ :total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">
+ </el-pagination>
+
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
@@ -420,11 +483,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>
@@ -437,10 +500,10 @@
<el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
<div style="display: flex;justify-content: space-around;">
- <el-form-item>
- <label for="">{{ $t('Upper film position') }}</label>
- <label for="">{{ $t('Scan Code Point') }}</label>
- </el-form-item>
+ <label for="">{{ $t('Upper film position') }}</label>
+ <el-button type="primary" @click="isConfirmState()">
+ {{ this.isConfirm == true ? "Allow" : "Not Allow" }}</el-button>
+ <label for="">{{ $t('Scan Code Point') }}</label>
</div>
<div style="display: flex;justify-content: space-around;height: 40px;">
<label for="">{{ $t('current Information') }}</label>
@@ -452,106 +515,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>
@@ -564,20 +627,65 @@
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">
- <el-button type="primary" @click="showform7()">{{ $t('Increase') }}</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-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
+ <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
+ == true ? $t('Start') : $t('Stop')
+ }}</el-button>
+ <el-button type="primary" @click="isAllowReorderingState()" :disabled="this.isAllowQueue">{{
+ this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')
+ }}</el-button>
+ <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
+ style="width: 100%;overflow: auto;">
+ <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('Glass State')">
+ <template slot-scope='scope'>
+ {{ 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')" style="font-size: 20px;">
+ <template slot-scope='scope'>
+ {{ 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') }}
+ </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||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')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
+ <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"
+ style="font-size: 15px;"
+ :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">
+ {{ $t('Top') }}
+ </el-button>
+ <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"
+ style="font-size: 15px;"
+ :disabled="(scope.$index == 0 || isAllowReordering == true || scope.row.state == 1)">
+ {{ $t('Up') }}
+ </el-button>
+ <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"
+ style="font-size: 15px;"
+ :disabled="(OutSlice.length - 1 == scope.$index || isAllowReordering == true || scope.row.state == 1)">
+ {{ $t('Down') }}
+ </el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"
+ @click="deleteproductionqueueglass(scope.row.barcode)">{{ $t('Delete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -599,16 +707,14 @@
<el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
<el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
<el-table-column prop="storageCage.tier" :label="$t('The Side')"></el-table-column>
-
<el-table-column prop="FrameNo" :label="$t('Frame No')"></el-table-column>
-
<el-table-column prop="Flip" :label="$t('Flip')"></el-table-column>
<el-table-column prop="out_slice.state" :label="$t('In the queue')">
<template slot-scope='scope'>
{{ 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 +722,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 +733,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, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue
} from "../../api/home";
@@ -678,6 +785,7 @@
glassid: "",
glassid1: "",
glassid2: "",
+ cageglassid: "",
url: "../../img/bigcar01.png",
car1: 145,
car2: 210,
@@ -686,7 +794,8 @@
cageinfo: [],
cage: 0,
carlist: [],
- loadglassheight: 0,
+ loadglassheight1: 0,
+ loadglassheight2: 0,
password: 1,
text: "",
zhuangtai: "",
@@ -697,24 +806,38 @@
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
pageCount: 0,
+ currentPages: 1, //榛樿鍒濆椤�
+ pagesizes: 21, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pageCounts: 0,
OutSlice: [],
AluminumFrame: [],
- framebarcode: ""
+ framebarcode: "",
+ isAllowQueue: true,
+ isAllowReordering: true,
+ FrameNoFlag: "",
+ isConfirm: true,
+ ManuallyInfeedGlass: true,
+ OutingQueue: true,
+ OrderInfo: true,
+ CageDetails: true,
+
};
},
created() {
this.load();
this.init();
- },
+ }
+ ,
methods: {
+
+
init() {
let viewname = "Home";
-
if (typeof (WebSocket) == "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+ let socketUrl = "ws://" + this.$t('ip') + ":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
socket = null;
@@ -743,53 +866,59 @@
this.tasklist1 = obj.tasklist1[0];
this.tasklist2 = obj.tasklist2[0];
this.alarm = obj.alarmmg[0];
- this.loadglassheight = obj.loadglassheight;
+ //閾濇id鎻愮ず
+
+
+ //鏄惁鍏佽鍑虹墖
+ this.isAllowQueue = obj.isAllowQueue[0];
+ //鍑虹墖闃熷垪
+ if (this.isAllowReordering == true) {
+ this.OutSlice = obj.listoutslice[0];
+ }
+ //鑾峰彇涓婄墖浣嶇幓鐠冧俊鎭�
+
if (obj.zhuangtai != null) {
this.zhuangtai = obj.zhuangtai[0];
}
- 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];
+ this.loadglassheight2 = 70;
} else {
this.form2 = {};
}
+ //鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
+ this.isConfirm = obj.isConfirm[0];
+ //鎵爜浣嶇幓鐠冧俊鎭�
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
+ this.loadglassheight1 = 70;
} else {
this.form3 = {};
-
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
+ this.loadglassheight1 = 70;
this.form5 = obj.form3[0];
+ this.showform3();
+ this.Sizerange(this.form5, 3);
+ this.glassid1 = "";
+ } else {
+ if (this.glassid1 == "") {
+ this.DeleteBarcodeGlass();
+ }
}
- //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 (obj.dbconnected == "false") {
+ this.text = this.$t('DataBase Connection failed');
+ }
+ //鐞嗙墖绗肩幓鐠冧俊鎭�
+ if (this.dialogFormVisible3 == true) {
+ SelectCageInfo(this.cageglassid).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ });
+ }
+
this.$forceUpdate();
@@ -805,9 +934,34 @@
}
},
load() {
+ //鍔犺浇鐢ㄦ埛鏉冮檺
+ currentUsername().then(res => {
+ SelectPermissionByUserName(res.data).then(res => {
+ res.data.permission.forEach(item => {
+ if (item.permissionId == "32" && item.state == 1) {
+ this.ManuallyInfeedGlass = false;
+ }
+ if (item.permissionId == "33" && item.state == 1) {
+ this.OutingQueue = false;
+ }
+ if (item.permissionId == "34" && item.state == 1) {
+ this.OrderInfo = false;
+ }
+ if (item.permissionId == "35" && item.state == 1) {
+ this.CageDetails = false;
+ }
+ });
+ });
+
+ });
//鍔犺浇绗煎瓙浣跨敤鎯呭喌鏁版嵁
home().then(res => {
this.tableData = res.data.list;
+ });
+ //鍔犺浇鐞嗙墖绗肩幓鐠冧俊鎭�
+ SelectCageInfo("").then(res => {
+ this.cageinfo = res.data.cageinfo;
+ this.currentPages = 1;
});
//鍔犺浇鐞嗙墖绗肩幓鐠冩暟鎹�
home2().then(res => {
@@ -816,14 +970,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;
@@ -858,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'));
}
@@ -935,72 +1088,74 @@
if (parameter == 1) {
SelectGlassByGlassID(this.glassid2).then(res => {
if (res.data.form != null) {
- this.form4 = res.data.form;
- this.$message.success(this.$t('query was successful'));
+ if (res.data.form.glassId != null) {
+ this.form4 = res.data.form;
+ this.$message.success(this.$t('query was successful'));
+ this.Sizerange(this.form4, 2);
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
+
} else {
this.$message.error(this.$t('There is no such glass'));
}
- if (this.form4.length > 0) {
- if (this.form4.glassId == "") {
- this.disabled = false;
- } else {
- this.disabled = true;
- }
- }
-
});
} else {
SelectGlassByGlassID(this.glassid1).then(res => {
if (res.data.form != null) {
- this.form5 = res.data.form;
- this.$message.success(this.$t('query was successful'));
+ if (res.data.form.glassId != null) {
+ this.form5 = res.data.form;
+ this.$message.success(this.$t('query was successful'));
+ this.Sizerange(this.form5, 1);
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
} else {
this.$message.error(this.$t('There is no such glass'));
}
- if (this.form5.length > 0) {
- if (this.form5.glassId == "") {
- this.disabled = false;
- } else {
- this.disabled = true;
- }
- }
-
});
}
},
+ //鏌ヨ瀹㈡埛鐜荤拑淇℃伅
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
this.currentPage = 1;
this.GlassInfo = res.data.glass;
});
},
+ //鏄剧ず瀹㈡埛鐜荤拑淇℃伅
showform2() {
SelectGlass(this.orderid).then(res => {
this.GlassInfo = res.data.glass;
});
this.dialogFormVisible4 = true;
},
+ //鏄剧ず鍑虹墖闃熷垪
showform6() {
- SelectProductionqueue().then(res => {
- this.OutSlice = res.data.listoutslice;
- });
this.dialogFormVisible6 = true;
},
+ //鏄剧ず閾濇瀵瑰簲鐜荤拑淇℃伅
showform7() {
+ //鏌ヨ閾濇id瀵瑰簲鐜荤拑淇℃伅
SelectAluminumFrameInfoById(this.framebarcode).then(res => {
this.AluminumFrame = res.data.listAluminumFrame;
+ this.AluminumFrame.sort(function (x, y) {
+ if (x['storageCage'] != null && y['storageCage'] != null) {
+ return y['storageCage']['tier'] - x['storageCage']['tier'];
+ }
+ });
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;
+ // this.dialogFormVisible7 = true;
},
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel() {
@@ -1017,6 +1172,7 @@
this.dialogFormVisible1 = false;
this.form1 = {};
},
+ //鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel3() {
this.dialogFormVisible5 = false;
this.form1 = {};
@@ -1048,12 +1204,17 @@
},
//鏄剧ず鐞嗙墖绗艰鎯呬俊鎭�
showcageinfo(cage) {
- this.cage = cage;
- SelectCageInfo(cage).then(res => {
- this.cageinfo = res.data.cageinfo;
- console.log(this.cageinfo)
- this.dialogFormVisible3 = true;
- });
+ if (this.CageDetails == false) {
+ cage = this.cageglassid;
+ SelectCageInfo(cage).then(res => {
+ this.cageinfo = res.data.cageinfo;
+ this.currentPages = 1;
+ this.dialogFormVisible3 = true;
+ });
+ } else {
+ this.$message.error(this.$t('You do not have this permission'));
+ }
+
},
//鍒犻櫎鐞嗙墖绗肩幓鐠�
deleteglass(glassid, state) {
@@ -1097,14 +1258,17 @@
if (this.password == value) {
if (state == 1) {
OutByGlassID(glassid).then(res => {
- if (res.data.message3 == 200) {
+ if (res.data.message2 == 200) {
this.$message.success(this.$t('Operation successful'));
}
else if (res.data.message2 == 300) {
- this.$message.error(this.$t('There is no such grid'));
+ this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));
+ }
+ else if (res.data.message2 == 400) {
+ this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));
}
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 {
@@ -1146,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) {
@@ -1190,8 +1359,6 @@
message: this.$t('Operation canceled')
});
});
- }, handleEdit(index, row) {
- console.log(index, row);
},
//琛ㄦ牸鍒犻櫎
handleDelete(index, row) {
@@ -1205,11 +1372,19 @@
handleCurrentChange: function (currentPage) {
this.currentPage = currentPage;
},
+ //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+ handleSizeChanges: function (size) {
+ this.pagesizes = size;
+ },
+ //鍒囨崲椤电爜
+ handleCurrentChanges: function (currentPage) {
+ this.currentPages = currentPage;
+ },
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
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 && this.form5.glassId != this.form3.glassId) {
+ InsertQueueGlassId(1, this.form5).then(res => {
if (res.data.message == 200) {
this.form5 = {};
this.$message.success(this.$t('Operation successful'));
@@ -1220,9 +1395,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 && this.form4.glassId != this.form2.glassId) {
+ InsertQueueGlassId(2, this.form4).then(res => {
if (res.data.message == 200) {
this.form4 = {};
this.$message.success(this.$t('Operation successful'));
@@ -1242,12 +1417,14 @@
if (parameter == 1) {
DeleteQueueGlass(1).then(res => {
if (res.data.message == 200) {
+ this.form3 = {};
this.$message.success(this.$t('Operation successful'));
}
});
} else {
DeleteQueueGlass(2).then(res => {
if (res.data.message == 200) {
+ this.form2 = {};
this.$message.success(this.$t('Operation successful'));
}
});
@@ -1261,31 +1438,254 @@
}
});
},
- CheckBoxchange(glassid,isChecked){
- this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
- console.log(this.AluminumFrame);
+ //閾濇瀵瑰簲鐜荤拑淇℃伅娣诲姞閾濇id鍜屾槸鍚︽坊鍔犲埌闃熷垪
+ CheckBoxchange(glassid, isChecked) {
+ this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })
},
- 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();
+ //娣诲姞鍒板嚭鐗囬槦鍒�
+ addoutslice() {
+ 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) {
+ let Sequence = [];
+ this.OutSlice.forEach(item => {
+ Sequence.push(item.sequence);
+ });
+ let OutSliceArr = [];
+ OutSliceArr.push(row);
+ let belowstop = 1;
+ let hereframeno = this.OutSlice[index].barcode;
+ let upperstop = 0;
+ for (let i = index + 1; i < this.OutSlice.length; i++) {
+ if (this.OutSlice[i].barcode == hereframeno) {
+ OutSliceArr.push(this.OutSlice[i]);
+ belowstop += 1;
+ } else {
+ break;
+ }
+ }
+ this.OutSlice.splice(index, belowstop);
+ for (let i = 0; i < OutSliceArr.length; i++) {
+ this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+ upperstop += 1;
+ }
+ this.UpdateSequence(Sequence);
+ },
+ //涓婄Щ
+ getUpMove(row, index) {
+ let Sequence = [];
+ this.OutSlice.forEach(item => {
+ Sequence.push(item.sequence);
+ });
+ let OutSliceArr = [];
+ OutSliceArr.push(row);
+ let belowstop = 1;
+ let upperstop = 0;
+ let index_x = index - 1;
+ let hereframeno = this.OutSlice[index].barcode;
+ let upperframeno = this.OutSlice[index_x].barcode;
+ for (let i = index + 1; i < this.OutSlice.length; i++) {
+ if (this.OutSlice[i].barcode == hereframeno) {
+ OutSliceArr.push(this.OutSlice[i]);
+ belowstop += 1;
+ } else {
+ break;
+ }
+ }
+ this.OutSlice.splice(index, belowstop);
+ for (let i = index_x; i >= 0; i--) {
+ if (this.OutSlice[i].barcode != upperframeno) {
+ upperstop = i + 1;
+ break;
+ }
+ }
+ for (let i = 0; i < OutSliceArr.length; i++) {
+ this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+ upperstop += 1;
+ }
+ this.UpdateSequence(Sequence);
+ },
+ //涓嬬Щ
+ getDownMove(row, index) {
+ let Sequence = [];
+ this.OutSlice.forEach(item => {
+ Sequence.push(item.sequence);
+ });
+ let OutSliceArr = [];
+ OutSliceArr.push(row);
+
+ let belowstop = 1;
+ let upperstop = this.OutSlice.length - 1;
+ let flag = 0;
+ let hereframeno = this.OutSlice[index].barcode;
+ let upperframeno;
+ for (let i = index + 1; i < this.OutSlice.length; i++) {
+ if (this.OutSlice[i].barcode == hereframeno) {
+ OutSliceArr.push(this.OutSlice[i]);
+ belowstop += 1;
+ } else {
+ break;
+ }
+ }
+ this.OutSlice.splice(index, belowstop);
+ for (let i = index; i < this.OutSlice.length; i++) {
+ if (this.OutSlice[i].barcode != hereframeno && this.OutSlice[i].barcode != upperframeno) {
+ upperframeno = this.OutSlice[i].barcode;
+ flag += 1;
+ upperstop = i;
+ }
+ if (i == this.OutSlice.length - 1 && flag == 1) {
+ flag += 1;
+ upperstop = i + 1;
+ }
+ if (flag == 2) {
+ break;
+ }
+ }
+ for (let i = 0; i < OutSliceArr.length; i++) {
+ this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);
+ upperstop += 1;
+ }
+ this.UpdateSequence(Sequence);
+ },
+ //淇敼椤哄簭
+ UpdateSequence(Sequence) {
+ let i = 0;
+ this.OutSlice.forEach(item => {
+ item.sequence = Sequence[i];
+ i++;
+ });
+ },
+ //鍒囨崲鍑虹墖闃熷垪鐘舵��
+ isAllowQueueState() {
+ isAllowQueues(!this.isAllowQueue, this.OutSlice).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ })
+ },
+ //
+ isAllowReorderingState() {
+ this.isAllowReordering = !this.isAllowReordering;
+ },
+ //鍒囨崲涓婄墖鏄惁闇�瑕佺‘璁ょ幓鐠冧俊鎭�
+ isConfirmState() {
+ isConfirmStates(!this.isConfirm).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ ,
+ 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 }) {
+ // console.log(row, column, "ss");
+ row = column;
+ column = row
+ let arrOutSlice = this.OutSlice;
+ let rowspans = 0;
+ let colspans = 1;
+ let barcode = arrOutSlice[rowIndex].barcode;
+
+ let barcode2;
+ if (rowIndex != 0) {
+ barcode2 = arrOutSlice[rowIndex - 1].barcode;
+ }
+ if (columnIndex === 12) {
+ if (barcode != barcode2) {
+ // this.FrameNoFlag = barcode;
+ for (let i = rowIndex; i < this.OutSlice.length; i++) {
+ if (barcode == arrOutSlice[i].barcode) {
+ barcode = arrOutSlice[i].barcode;
+ rowspans += 1;
+ } else {
+
+ break;
+ }
+ }
+ return {
+ rowspan: rowspans,
+ colspan: colspans
+ };
+ } else {
+ return {
+ rowspan: 0,
+ colspan: 0
+ };
+ }
+ }
+ },
+ //鍒ゆ柇鐜荤拑鏄惁瓒呭嚭鑼冨洿
+ Sizerange(Glass, position) {
+ if (this.ManuallyInfeedGlass == true) {
+ if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {
+ this.$alert(this.$t('The glass size is not within the range'), this.$t('confirm'), {
+ confirmButtonText: this.$t('Yes'),
+ type: 'info',
+ callback: (action) => {
+ this.$message({
+ type: 'info',
+ message: `action: ${action}`
+ }).then(
+ this.DeleteBarcodeGlass()
+ );
+ }
+ });
+ if (position == 1 || position == 3) {
+ this.disabled1 = true;
+ } else {
+ this.disabled = true;
+ }
+ } else {
+ if (position == 1 || position == 3) {
+ this.disabled1 = false;
+ } else {
+ this.disabled = false;
+ }
+ if (position == 3 && this.isConfirmState == true) {
+ this.InsertQueueGlass(1);
+ }
+ }
+ }
+ },
+ //娓呯┖寰呯‘璁ょ幓鐠冧俊鎭�
+ DeleteBarcodeGlass() {
+ this.form5 = {};
+ },
+ //鎵嬪姩瀹屾垚鍑虹墖浠诲姟
+ 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