CanadaMes.git - Gitblit

			@@ -195,7 +195,7 @@
			</div>
			<div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">
			<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Infeed barcodid') }}</el-button>
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Infeed barcodid') }}</el-button>
			<el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>
			<el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>
			</div>
			@@ -207,7 +207,7 @@
			<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
			<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
			<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
			<el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
			<el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
			<el-table-column :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			@@ -222,7 +222,7 @@
			<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
			<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
			<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
			<el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
			<el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
			<el-table-column :label="$t('Operate')">
			<template slot-scope='scope'>
			<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
			@@ -311,10 +311,10 @@
			<el-form-item :label="$t('order')">
			<el-input v-model="form.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('length')">
			<el-form-item :label="$t('length(inch)')">
			<el-input v-model="form.height" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('width')">
			<el-form-item :label="$t('width(inch)')">
			<el-input v-model="form.width" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcodid')">
			@@ -336,21 +336,44 @@

			<el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
			<el-form :model="form" label-width="100px" style="padding-right: 30px">
			<el-form-item style="text-align: center;">
			<el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs()" :disabled="disabled">{{ $t('Query')
			}}</el-button>
			</el-form-item>
			<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>
			</div>
			<div style="display: flex;justify-content: space-around;height: 40px;">
			<label for="">{{ $t('Scan Code Point') }}</label>
			<label for="">{{ $t('Upper film position') }}</label>
			<label for="">{{ $t('current Information') }}</label>
			<label for="">{{ $t('Modify Information') }}</label>
			<label for="">{{ $t('current Information') }}</label>
			<label for="">{{ $t('Modify Information') }}</label>
			</div>
			<div style="display: flex;justify-content: space-around;">
			<el-form-item>
			<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass lD')"
			v-model="glassid2"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs(1)" :disabled="disabled">{{ $t('Query')
			}}</el-button>
			</el-form-item>
			<el-form-item>
			<el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass lD')"
			v-model="glassid1"></el-input>
			<el-button type="primary" @click="SelectGlassByGlassIDs(2)" :disabled="disabled">{{ $t('Query')
			}}</el-button>
			</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>
			<el-form-item :label="$t('Barcodid')">
			<el-input v-model="form4.glassId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcodid')">
			<el-input v-model="form3.glassId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('Barcodid')">
			<el-input v-model="form5.glassId" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			@@ -358,7 +381,13 @@
			<el-input v-model="form2.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('order')">
			<el-input v-model="form4.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('order')">
			<el-input v-model="form3.orderId" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('order')">
			<el-input v-model="form5.orderId" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			@@ -366,7 +395,13 @@
			<el-input v-model="form2.height" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('length')">
			<el-input v-model="form4.height" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('length')">
			<el-input v-model="form3.height" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('length')">
			<el-input v-model="form5.height" readonly autocomplete="off" />
			</el-form-item>
			</div>
			<div style="display: flex;justify-content: space-around;">
			@@ -374,15 +409,29 @@
			<el-input v-model="form2.width" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('width')">
			<el-input v-model="form4.width" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('width')">
			<el-input v-model="form3.width" readonly autocomplete="off" />
			</el-form-item>
			<el-form-item :label="$t('width')">
			<el-input v-model="form5.width" 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>
			<el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled1">
			{{ $t('Confirm Modification') }}</el-button>
			<el-button @click="DeleteQueueGlasss(1)" type="primary" :disabled="disabled1">{{ $t('Clear Current')
			}}</el-button>
			<el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">
			{{ $t('Confirm Modification') }}</el-button>
			</div>
			</el-form>
			<template #footer>
			<span class="dialog-footer">
			<el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled1">{{ $t('confirm')
			}}</el-button>

			<el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
			</span>
			</template>
			@@ -421,7 +470,7 @@
			<el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
			<el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
			<el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
			<el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
			<el-table-column :width="170" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></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;"
			@@ -480,7 +529,7 @@
			//: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
			SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass
			} from "../../api/home";


			@@ -525,6 +574,18 @@
			height: "",
			width: ""
			},
			form4: {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			},
			form5: {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			},
			alarm: [],
			tableData: [],
			cagelist1: [],
			@@ -538,6 +599,7 @@
			order: "",
			glassid: "",
			glassid1: "",
			glassid2: "",
			url: "../../img/bigcar01.png",
			car1: 145,
			car2: 210,
			@@ -552,12 +614,11 @@
			zhuangtai: "",
			orderid: "",
			GlassInfo: [],
			disabled: true,
			disabled1: true,
			disabled: false,
			disabled1: false,
			currentPage: 1, //默认初始页
			pagesize: 15, //每页默认显示的数据
			pageCount: 0,
			state: true
			pageCount: 0
			};
			},
			created() {
			@@ -607,26 +668,44 @@
			}

			// 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.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];
			}
			if (obj.form3 != null && obj.form3 != "") {
			} else {
			this.form2 = {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			};
			}

			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
			this.form3 = obj.form3[0];
			} else {
			this.form3 = {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			};
			}
			if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
			this.form5 = obj.form3[0];
			}
			//if (obj.dbconnected == "false") {
			this.text = this.$t('DataBase Connection failed');
			@@ -778,24 +857,44 @@
			this.dialogFormVisible5 = true;
			},
			//获取扫码位和上片位数据
			SelectGlassByGlassIDs() {
			SelectGlassByGlassIDs(parameter) {
			this.showform3();
			SelectGlassByGlassID(this.glassid1).then(res => {
			if (res.data.form != null) {
			this.form2 = res.data.form;
			this.$message.success(this.$t('query was successful'));
			} else {
			this.$message.error(this.$t('There is no such glass'));
			}
			if (this.form2.length > 0) {
			if (this.form2.glassId == "") {
			this.disabled = false;
			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'));
			} else {
			this.disabled = true;
			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'));
			} 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 => {
			@@ -989,21 +1088,70 @@
			this.currentPage = currentPage;
			},
			//手动添加扫码位玻璃
			InsertQueueGlass() {
			if (this.state == true) {
			InsertQueueGlassId(this.form2.glassId).then(res => {
			InsertQueueGlass(parameter) {
			if (parameter == 1 && this.form5.glassId != "") {
			if (this.form5.glassId != this.form2.glassId) {
			InsertQueueGlassId(this.form5.glassId, 1).then(res => {
			if (res.data.message == 200) {
			this.form5 = {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			};
			this.$message.success(this.$t('Operation successful'));
			}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 => {
			if (res.data.message == 200) {
			this.form4 = {
			orderId: "",
			glassId: "",
			height: "",
			width: ""
			};
			this.$message.success(this.$t('Operation successful'));
			}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'));
			}


			}
			},
			//清除上片队列玻璃
			DeleteQueueGlasss(parameter) {
			if (parameter == 1) {
			DeleteQueueGlass(1).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			});
			} else {
			UpdateQueueState().then(res => {
			DeleteQueueGlass(2).then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			});
			}

			},
			//修改扫码位玻璃状态
			UpdateQueueStates() {
			UpdateQueueState().then(res => {
			if (res.data.message == 200) {
			this.$message.success(this.$t('Operation successful'));
			}
			});
			}
			}
			}