Albania_Mes.git

			@@ -448,16 +448,28 @@
			</el-main>
			<el-dialog :visible.sync="Importorder" :title="$t('Import order')" top="5vh">
			<!--文件导入数据页面-->
			<div id="fileinput" class="container">
			<div id="" class="container">
			<div class="header">
			<div class="btn">
			<button @click="AllAdd">保存</button>
			</div>
			<div class="inp">
			<el-button type="primary" @click="importData()">保存</el-button>

			<input type="file" id="uploadExcel" multiple @change="Change" />
			</div>
			</div>
			<table id="table">
			<el-table :data="this.dataList" border style="width: 100%;">
			<el-table-column prop="Customer" :label="$t('Customer')"></el-table-column>
			<el-table-column prop="order" :label="$t('Order')"></el-table-column>
			<el-table-column prop="base" :label="$t('Width')"></el-table-column>
			<el-table-column prop="height" :label="$t('Height')"></el-table-column>
			<el-table-column prop="thickness" :label="$t('Thickness')"></el-table-column>
			<el-table-column prop="films" :label="$t('Films')"></el-table-column>
			<el-table-column prop="quantity" :label="$t('No')"></el-table-column>
			<el-table-column prop="tier" :label="$t('Tier')"></el-table-column>
			<el-table-column prop="matching" :label="$t('Matching')"></el-table-column>
			<el-table-column prop="glasstype" :label="$t('Glasstype')"></el-table-column>
			<el-table-column prop="productname" :label="$t('Productname')"></el-table-column>
			</el-table>
			<!-- <table id="table">
			<thead>
			<tr>
			<th>Customer</th>
			@@ -475,17 +487,6 @@
			</thead>
			<tbody style="text-align: center">
			<tr v-for="item in dataList" :key="item.id">
			<!-- <td>{{ item[0] }}</td>
			<td>{{ item[1] }}</td>
			<td>{{ item[2] }}</td>
			<td>{{ item[3] }}</td>
			<td>{{ item[4] }}</td>
			<td>{{ item[5] }}</td>
			<td>{{ item[6] }}</td>
			<td>{{ item[7] }}</td>
			<td>{{ item[8] }}</td>
			<td>{{ item[9] }}</td>
			<td>{{ item[10] }}</td> -->
			<td>{{ item.Customer }}</td>
			<td>{{ item.order }}</td>
			<td>{{ item.base }}</td>
			@@ -499,7 +500,7 @@
			<td>{{ item.productname }}</td>
			</tr>
			</tbody>
			</table>
			</table> -->
			</div>
			</el-dialog>

			@@ -511,7 +512,9 @@
			<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">人工匹配</el-button>
			<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">人工匹配</el-button>
			style="z-index: 999;">人工拿走</el-button>
			<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">重新测量</el-button>
			</div>
			<!--显示-->
			<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;margin: auto auto;">
			@@ -655,7 +658,7 @@
			Disabled, SelectPermissionByUserName, currentUsername, CompleteQueue,
			isAllowReorderings,

			UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue
			UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue,importData,ManualTake,AnewMeasure
			} from "../../api/home";


			@@ -1050,7 +1053,21 @@
			},
			//人工拿走
			ManualTake() {

			let s="123";
			ManualTake(s).then(res => {
			if (res.data.message == 200) {
			console.log(res.data.message);
			}
			})
			},
			//重新测量
			AnewMeasure() {
			let s="123";
			AnewMeasure(s).then(res => {
			if (res.data.message == 200) {
			console.log(res.data.message);
			}
			})
			},
			Change(event) {
			// 获取到文件夹
			@@ -1081,12 +1098,16 @@
			Add() {

			},
			Hide() {

			},
			AllAdd() {
			//添加数据进后台
			console.log(this.dataList);
			importData() {
			alert(1);
			//let tbdata=JSON.stringify(this.dataList);
			let tbdata=this.dataList;
			console.log(tbdata);
			importData(tbdata).then(res => {
			if (res.data.message == 200) {
			//this.$message.success(this.$t('Operation successful'));
			}
			});
			},
			del() {