From 3f98ccf49e7ffc098689c37237bd1dceed651ca1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 536 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 337 insertions(+), 199 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 69e2eed..f6c4317 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -111,9 +111,15 @@
top: 366px; */
}
-.orderbutton {
+.orderbutton1 {
position: absolute;
left: 1070px;
+ top: 70px;
+}
+
+.orderbutton2 {
+ position: absolute;
+ left: 1170px;
top: 70px;
}
@@ -204,29 +210,36 @@
<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="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="list" :label="$t('List No')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box No')"></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 :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
<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" :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="list" :label="$t('List No')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Dim')"></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')">
+ <template slot-scope='scope'>
+ {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight }}
+ </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;"
- @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -274,7 +287,8 @@
<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
- <el-button class="orderbutton" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
+ <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>
<!-- <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']"
@@ -304,22 +318,35 @@
</el-footer>
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('Barcodid')">
+ <el-form-item :label="$t('Barcode')">
<el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>
<el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form.boxnumber" readonly autocomplete="off" />
</el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasslength" 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">
@@ -334,6 +361,79 @@
</template>
</el-dialog>
+ <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
+ <el-form :model="form1" label-width="100px" style="padding-right: 30px">
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form1.order" autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Number')">
+ <el-input v-model="form1.number" autocomplete="off" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
+ <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
+ </span>
+ </template>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
+ <el-table :data="this.alarm" border style="width: 100%;">
+ <el-table-column prop="id" :label="$t('id')"></el-table-column>
+ <el-table-column prop="content" :label="$t('content')"></el-table-column>
+ <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
+ <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
+ </el-table>
+ </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')">
+ <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;"
+ @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;"
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
+ }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
+ <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="glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
+ </el-table>
+ <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
+ layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
+ background style="float: right; margin-top: 20px">
+ </el-pagination>
+ </el-dialog>
<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;">
@@ -363,59 +463,87 @@
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form2.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form2.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form4.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form4.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form3.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form3.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form5.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form5.barcode" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('order')">
- <el-input v-model="form2.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form2.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form4.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form3.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form3.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form5.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form5.ordernumber" 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.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form2.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form4.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form4.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form3.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form3.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form5.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form5.listnumber" 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.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form2.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form4.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form4.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form3.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form3.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form5.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form5.boxnumber" 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-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form4.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form3.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form5.glasslength" 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-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form4.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form3.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form5.glassheight" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -431,105 +559,76 @@
</el-form>
<template #footer>
<span class="dialog-footer">
-
<el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
- <el-form :model="form1" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('order')">
- <el-input v-model="form1.order" autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('number')">
- <el-input v-model="form1.number" autocomplete="off" />
- </el-form-item>
- </el-form>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
- </span>
- </template>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
- <el-table :data="this.alarm" border style="width: 100%;">
- <el-table-column prop="id" :label="$t('id')"></el-table-column>
- <el-table-column prop="content" :label="$t('content')"></el-table-column>
- <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
- <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
- </el-table>
- </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('Barcodid')"></el-table-column>
- <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column :width="100" prop="list" :label="$t('List No')"></el-table-column>
- <el-table-column :width="100" prop="box" :label="$t('Box No')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <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-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;"
- @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;"
- @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('increase')
- }}</el-button>
+ @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
- <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="glassId" :label="$t('Barcodid')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="width" :label="$t('length')"></el-table-column>
- <el-table-column prop="height" :label="$t('width')"></el-table-column>
- </el-table>
+ <el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"
+ top="5vh">
+ <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
+ <el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
+ <el-button type="primary" @click="addoutslice()">{{ $t('Increase') }}</el-button>
+ <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
- <!-- <el-table :data="tableDatas.slice((currentPage - 1) * pagesize, currentPage * pagesize)
- " style="width: 100%">
- <el-table-column label="Date" prop="date"> </el-table-column>
- <el-table-column label="Name" prop="name"> </el-table-column>
- <el-table-column label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Edit</el-button>
- <el-button size="mini" type="danger"
- @click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+ <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="glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
+ <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> -->
-
- <!-- 琛ㄦ牸鍒嗛〉 -->
- <!-- pager-count pager-count灞炴�у彲浠ヨ缃渶澶ч〉鐮佹寜閽暟,瓒呭嚭鎶樺彔,榛樿涓�7-->
- <!-- 娉ㄦ剰锛氳嫢鏁版嵁鏄悗绔帴鍙ｈ繑鍥炵殑鍒欐鏃�:total="pageCount"-->
- <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
- layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
- background style="float: right; margin-top: 20px">
- </el-pagination>
-
-
+
+ <el-table-column prop="storageCage.tier" :label="$t('In the cage')">
+ <template slot-scope='scope'>
+ {{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
+ </template>
+ </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>
+ </template>
+ </el-table-column>
+ </el-table>
</el-dialog>
</el-container>
</template>
<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, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
+ SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS
} from "../../api/home";
@@ -552,40 +651,19 @@
dialogFormVisible3: false,
dialogFormVisible4: false,
dialogFormVisible5: false,
+ dialogFormVisible6: false,
+ dialogFormVisible7: false,
form: {
orderId: "",
glassId: "",
height: "",
width: ""
},
- form1: {
- order: "NG2210210",
- number: 800,
- },
- form2: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form3: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form4: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form5: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
+ form1: {},
+ form2: {},
+ form3: {},
+ form4: {},
+ form5: {},
alarm: [],
tableData: [],
cagelist1: [],
@@ -618,7 +696,10 @@
disabled1: false,
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
- pageCount: 0
+ pageCount: 0,
+ OutSlice: [],
+ AluminumFrame: [],
+ framebarcode: ""
};
},
created() {
@@ -666,7 +747,9 @@
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;
@@ -686,23 +769,14 @@
if (obj.form2 != null && obj.form2 != "") {
this.form2 = obj.form2[0];
} else {
- this.form2 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form2 = {};
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
} else {
- this.form3 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form3 = {};
+
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
this.form5 = obj.form3[0];
@@ -844,11 +918,10 @@
//鏄剧ず璁㈠崟淇℃伅椤甸潰
showform1() {
if (this.order != "") {
- this.form1 =
- {
- order: "NG2210210",
- number: 800,
- };
+ SelectGlassNo(this.order).then(res => {
+ this.form1.order = this.order;
+ this.form1.number = res.data.count;
+ });
this.dialogFormVisible1 = true;
}
},
@@ -898,6 +971,7 @@
},
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
+ this.currentPage = 1;
this.GlassInfo = res.data.glass;
});
},
@@ -906,6 +980,27 @@
this.GlassInfo = res.data.glass;
});
this.dialogFormVisible4 = true;
+ },
+ showform6() {
+ SelectProductionqueue().then(res => {
+ this.OutSlice = res.data.listoutslice;
+ });
+ this.dialogFormVisible6 = true;
+ },
+ showform7() {
+ SelectAluminumFrameInfoById(this.framebarcode).then(res => {
+ this.AluminumFrame = res.data.listAluminumFrame;
+ this.AluminumFrame.forEach(item => {
+ if(item.storageCage!=null&&item.out_slice==null){
+ item.isCheck = true;
+ }else{
+ item.isCheck = false;
+ }
+ item.Flip=res.data.flip;
+ item.FrameNo=this.framebarcode;
+ });
+ });
+ this.dialogFormVisible7 = true;
},
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel() {
@@ -956,6 +1051,7 @@
this.cage = cage;
SelectCageInfo(cage).then(res => {
this.cageinfo = res.data.cageinfo;
+ console.log(this.cageinfo)
this.dialogFormVisible3 = true;
});
},
@@ -1051,7 +1147,7 @@
//鎵嬪姩涓婄墖
FeedInglassid() {
Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
- if (this.form.glassId != "") {
+ if (this.form.barcode != "") {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
@@ -1072,7 +1168,29 @@
}
});
},
- handleEdit(index, row) {
+ //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ deleteproductionqueueglass(id) {
+ this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ DeleteProductionQueueGlass(id).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ }, handleEdit(index, row) {
console.log(index, row);
},
//琛ㄦ牸鍒犻櫎
@@ -1089,36 +1207,26 @@
},
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
InsertQueueGlass(parameter) {
- if (parameter == 1 && this.form5.glassId != "") {
- if (this.form5.glassId != this.form2.glassId) {
- InsertQueueGlassId(this.form5.glassId, 1).then(res => {
+ if (parameter == 1 && this.form5.barcode != "") {
+ if (this.form5.barcode != this.form2.barcode) {
+ InsertQueueGlassId(this.form5.barcode, 1).then(res => {
if (res.data.message == 200) {
- this.form5 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form5 = {};
this.$message.success(this.$t('Operation successful'));
- }else{
+ } else {
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
} else {
this.$message.error(this.$t('The glass ID already exists in the loading queue'));
}
- } else if (parameter == 2 && this.form4.glassId != "") {
- if (this.form4.glassId != this.form3.glassId) {
- InsertQueueGlassId(this.form4.glassId, 2).then(res => {
+ } else if (parameter == 2 && this.form4.barcode != "") {
+ if (this.form4.barcode != this.form3.barcode) {
+ InsertQueueGlassId(this.form4.barcode, 2).then(res => {
if (res.data.message == 200) {
- this.form4 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form4 = {};
this.$message.success(this.$t('Operation successful'));
- }else{
+ } else {
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
@@ -1152,6 +1260,36 @@
this.$message.success(this.$t('Operation successful'));
}
});
+ },
+ CheckBoxchange(glassid,isChecked){
+ this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
+ console.log(this.AluminumFrame);
+ },
+ 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();
+ 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_;
+ });
+ 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=>{
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
}
}
--
Gitblit v1.8.0