CanadaMes.git - Gitblit

			@@ -238,9 +238,9 @@
			</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="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>
			@@ -258,9 +258,9 @@
			</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="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>
			@@ -390,9 +390,9 @@
			</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>
			@@ -439,7 +439,7 @@
			<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('State')">
			<el-table-column :min-width="90" prop="state" :label="$t('Glass State')">
			<template slot-scope='scope'>
			{{
			scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
			@@ -454,7 +454,7 @@
			</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;"
			<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"
			@@ -628,39 +628,60 @@
			</el-dialog>

			<el-dialog :visible.sync="dialogFormVisible6" :title="$t('Outing Queue')" top="5vh">
			<el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue == true ? $t('Start') : $t('Stop')
			<el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue
			== true ? $t('Start') : $t('Stop')
			}}</el-button>
			<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border
			<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 prop="glassId" :label="$t('Barcode')"></el-table-column>
			<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('State')">
			<el-table-column prop="state" :label="$t('Glass State')">
			<template slot-scope='scope'>
			{{ scope.row.state == 0 ? "Waiting" : "Outing" }}
			{{ 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')"></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="text" size="small" @click="getTopMove(scope.row, scope.$index)"
			style="font-size: 15px;"
			:disabled="(scope.$index == 0 \|\| isAllowQueue == true \|\| scope.row.state == 1)">
			: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 \|\| isAllowQueue == true \|\| scope.row.state == 1)">
			: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 \|\| isAllowQueue == true \|\| scope.row.state == 1)">
			: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"
			@@ -714,7 +735,7 @@
			import {
			home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
			SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
			SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername
			SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue
			} from "../../api/home";


			@@ -785,7 +806,6 @@
			currentPage: 1, //默认初始页
			pagesize: 15, //每页默认显示的数据
			pageCount: 0,

			currentPages: 1, //默认初始页
			pagesizes: 21, //每页默认显示的数据
			pageCounts: 0,
			@@ -793,19 +813,24 @@
			AluminumFrame: [],
			framebarcode: "",
			isAllowQueue: true,
			isAllowReordering: true,
			FrameNoFlag: "",
			isConfirm: true,
			ManuallyInfeedGlass: true,
			OutingQueue: true,
			OrderInfo: true,
			CageDetails: true
			CageDetails: true,

			};
			},
			created() {
			this.load();
			this.init();
			},
			}
			,
			methods: {


			init() {
			let viewname = "Home";
			if (typeof (WebSocket) == "undefined") {
			@@ -847,7 +872,7 @@
			//是否允许出片
			this.isAllowQueue = obj.isAllowQueue[0];
			//出片队列
			if (this.isAllowQueue == true) {
			if (this.isAllowReordering == true) {
			this.OutSlice = obj.listoutslice[0];
			}
			//获取上片位玻璃信息
			@@ -877,9 +902,9 @@
			this.form5 = obj.form3[0];
			this.showform3();
			this.Sizerange(this.form5, 3);
			this.glassid1="";
			this.glassid1 = "";
			} else {
			if(this.glassid1==""){
			if (this.glassid1 == "") {
			this.DeleteBarcodeGlass();
			}
			}
			@@ -916,13 +941,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;
			}
			});
			@@ -987,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'));
			}
			@@ -1234,7 +1258,7 @@
			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) {
			@@ -1286,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) {
			@@ -1354,7 +1383,7 @@
			//手动添加扫码位玻璃
			InsertQueueGlass(parameter) {
			if (parameter == 1 && this.form5.glassId != "") {
			if (this.form5.glassId != this.form2.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 = {};
			@@ -1367,7 +1396,7 @@
			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) {
			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 = {};
			@@ -1388,14 +1417,14 @@
			if (parameter == 1) {
			DeleteQueueGlass(1).then(res => {
			if (res.data.message == 200) {
			this.form2 = {};
			this.form3 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			});
			} else {
			DeleteQueueGlass(2).then(res => {
			if (res.data.message == 200) {
			this.form3 = {};
			this.form2 = {};
			this.$message.success(this.$t('Operation successful'));
			}
			});
			@@ -1551,6 +1580,10 @@
			}
			})
			},
			//
			isAllowReorderingState() {
			this.isAllowReordering = !this.isAllowReordering;
			},
			//切换上片是否需要确认玻璃信息
			isConfirmState() {
			isConfirmStates(!this.isConfirm).then(res => {
			@@ -1558,6 +1591,21 @@
			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;
			}
			,
			//合并行
			@@ -1574,7 +1622,7 @@
			if (rowIndex != 0) {
			barcode2 = arrOutSlice[rowIndex - 1].barcode;
			}
			if (columnIndex === 10) {
			if (columnIndex === 12) {
			if (barcode != barcode2) {
			// this.FrameNoFlag = barcode;
			for (let i = rowIndex; i < this.OutSlice.length; i++) {
			@@ -1634,6 +1682,14 @@
			//清空待确认玻璃信息
			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'));
			}
			});
			}
			}
			}