CanadaMes.git - Gitblit

			@@ -215,8 +215,7 @@
			<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 :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')">
			@@ -236,8 +235,7 @@
			<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 :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')">
			@@ -405,12 +403,13 @@
			<el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
			<el-table-column :width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
			<el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
			<el-table-column :width="80" prop="listId"
			:label="$t('List No')"></el-table-column>
			<el-table-column :width="80" prop="listId" :label="$t('List No')"></el-table-column>
			<el-table-column :width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
			<el-table-column :width="100" prop="state" :label="$t('State')">
			<template slot-scope='scope'>
			{{ scope.row.state==1?$t('Normal'):scope.row.state==2?$t('Entering'):scope.row.state==3?$t('Outing'):"" }}
			{{
			scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ? $t('Outing') : ""
			}}
			</template>
			</el-table-column>
			<el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')">
			@@ -422,12 +421,14 @@
			<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;" :disabled="scope.row.state==1?false:true"
			<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"
			<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>
			@@ -586,7 +587,8 @@

			<el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">
			<el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button>
			<el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue==true?$t('Stop'):$t('Start') }}</el-button>
			<el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue == true ? $t('Stop') : $t('Start')
			}}</el-button>

			<el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">
			<el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
			@@ -779,7 +781,6 @@
			this.alarm = obj.alarmmg[0];

			this.isAllowQueue=obj.isAllowQueue;
			console.log(obj);
			//出片队列
			this.OutSlice = obj.listoutslice[0];
			this.loadglassheight = obj.loadglassheight;
			@@ -946,7 +947,6 @@
			SelectGlassByGlassID(this.glassid).then(res => {
			if (res.data.form != null) {
			this.form = res.data.form;
			console.log(this.form);
			this.dialogFormVisible = true;
			this.$message.success(this.$t('query was successful'));
			} else {
			@@ -1046,6 +1046,11 @@
			showform7() {
			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) {
			item.isCheck = true;