From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 2d65daf..00ecd88 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -634,7 +634,7 @@
<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
+ <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
style="width: 100%;overflow: auto;">
<el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
@@ -648,13 +648,22 @@
</template>
</el-table-column>
<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column prop="position" :label="$t('Position')"></el-table-column>
+ <el-table-column prop="position" :label="$t('Position')">
+ <template slot-scope='scope'>
+ {{ scope.row.position==1?$t('Yes'):$t('No') }}
+ </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"
- @click="CompleteQueue(scope.row.id,scope.row.barcode)">{{ $t('Complete') }}</el-button>
+ @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')">
@@ -809,14 +818,18 @@
ManuallyInfeedGlass: true,
OutingQueue: true,
OrderInfo: true,
- CageDetails: true
+ CageDetails: true,
+
};
},
created() {
this.load();
this.init();
- },
+ }
+ ,
methods: {
+
+
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
@@ -927,13 +940,13 @@
if (item.permissionId == "32" && item.state == 1) {
this.ManuallyInfeedGlass = false;
}
- if (item.permissionId == "32" && item.state == 1) {
+ if (item.permissionId == "33" && item.state == 1) {
this.OutingQueue = false;
}
- if (item.permissionId == "33" && item.state == 1) {
+ if (item.permissionId == "34" && item.state == 1) {
this.OrderInfo = false;
}
- if (item.permissionId == "34" && item.state == 1) {
+ if (item.permissionId == "35" && item.state == 1) {
this.CageDetails = false;
}
});
@@ -1575,6 +1588,20 @@
});
}
,
+ cellStyle({ row, column, rowIndex, columnIndex }) {
+ // console.log(row, column, "ss");
+ column=rowIndex;
+ rowIndex=column;
+ let style="";
+ if (columnIndex === 8&&row.position==1) {
+ style="background-Color:yellow;";
+ }
+ if (columnIndex === 9&&row.flip==1) {
+ style="background-Color:yellow;";
+ }
+ return style;
+ }
+ ,
//鍚堝苟琛�
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log(row, column, "ss");
@@ -1589,7 +1616,7 @@
if (rowIndex != 0) {
barcode2 = arrOutSlice[rowIndex - 1].barcode;
}
- if (columnIndex === 11) {
+ if (columnIndex === 12) {
if (barcode != barcode2) {
// this.FrameNoFlag = barcode;
for (let i = rowIndex; i < this.OutSlice.length; i++) {
@@ -1651,8 +1678,8 @@
this.form5 = {};
},
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
- CompleteQueue(id,frameid) {
- CompleteQueue(id,frameid).then(res => {
+ CompleteQueue(id,frameid,glassid) {
+ CompleteQueue(id,frameid,glassid).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
--
Gitblit v1.8.0