From 5780c58879296cfced72012c8831c1d3cf4dafb2 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 十一月 2024 00:33:13 +0800
Subject: [PATCH] 增加任务队列 任务日志，客户名称字段
---
Albania_Mes-ui/src/views/home/index.vue | 376 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 256 insertions(+), 120 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index 4de1eaa..5f748db 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -124,7 +124,6 @@
left: 500px;
top: -10px;
} */
-
.blocks-img3 {
height: 90px;
max-width: 100vw;
@@ -334,14 +333,14 @@
font-weight: bold;
text-align: center;
}
+
.el-table .el-table__body-wrapper tr {
- height: 40px; /* 璁剧疆姣忚鐨勯珮搴︿负 30px */
- line-height: 30px;
+ height: 40px;
+ /* 璁剧疆姣忚鐨勯珮搴︿负 30px */
+ line-height: 30px;
}
-.el-table .el-table__body-wrapper td {
- /* 纭繚鍗曞厓鏍煎唴瀹瑰瀭鐩村眳涓� */
-}
+/* 鍑虹墖闃熷垪鏄剧ず琛� */
</style>
<template>
<el-container>
@@ -379,9 +378,9 @@
:class="SoftEmergencyStopState == true ? 'hide' : ''">
{{ $t('Task queue') }}</el-button>
- <!-- <el-button type="primary" @click="showform(5)" :disabled="SoftEmergencyStopState" style="z-index: 999;"
+ <el-button type="primary" @click="showform(5)" :disabled="SoftEmergencyStopState" style="z-index: 999;"
:class="SoftEmergencyStopState == true ? 'hide' : ''">
- {{ $t('Outing Queue') }}</el-button> -->
+ {{ $t('Outing Queue') }}</el-button>
</div>
<div style="display: flex;align-items: center;overflow: hidden;">
@@ -462,7 +461,7 @@
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="FinishTask(scope.row.id)">{{ $t('Complete') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="TerminateTask(scope.row.id)">{{ $t('Terminate') }}</el-button>
</template>
</el-table-column>
@@ -480,7 +479,7 @@
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="FinishTask(scope.row.id)">{{ $t('Complete') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@click="TerminateTask(scope.row.id)">{{ $t('Terminate') }}</el-button>
</template>
</el-table-column>
@@ -534,26 +533,27 @@
style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
<el-button type="primary" @click="ManualTake()" :disabled="(this.LastQueue.state > 0)"
style="z-index: 999;">{{
- $t('Manual removal') }}</el-button>
- <el-button type="primary" @click="AnewMeasure()"
- style="z-index: 999;">{{
- $t('Remeasure') }}</el-button>
+ $t('Manual removal') }}</el-button>
+ <el-button type="primary" @click="AnewMeasure()" style="z-index: 999;">{{
+ $t('Remeasure') }}</el-button>
<!-- 杈撳叆涓嬫媺妗�1 -->
<!-- SelectSetting -->
- <label for="file-upload" style="font-weight: bold;font-size: 16px;margin-left: 50px;">{{ $t('Films') }}:{{SelectSetting.films }}</label>
+ <label for="file-upload" style="font-weight: bold;font-size: 16px;margin-left: 50px;">{{ $t('Films')
+ }}:{{ SelectSetting.films }}</label>
<el-select v-model="selectedValue1" :placeholder="$t('Films')">
<el-option v-for="item in selectedOption1.films" :key="item.value" :label="item.films"
:value="item.films">
</el-option>
</el-select>
<!-- 杈撳叆涓嬫媺妗�2 -->
- <label for="file-upload" style="font-weight: bold;font-size: 16px;">{{ $t('Thickness') }}:{{SelectSetting.thickness }}mm</label>
+ <label for="file-upload" style="font-weight: bold;font-size: 16px;">{{ $t('Thickness')
+ }}:{{ SelectSetting.thickness }}mm</label>
<el-select v-model="selectedValue2" :placeholder="$t('Thickness')">
<el-option v-for="item in selectedOption2.thickness" :key="item.value" :label="item.thickness"
:value="item.thickness">
</el-option>
</el-select>
- <el-button type="primary" @click="SaveMeasure(selectedValue1,selectedValue2)"
+ <el-button type="primary" @click="SaveMeasure(selectedValue1, selectedValue2)"
style="z-index: 999;">{{
$t('Save') }}</el-button>
</div>
@@ -561,7 +561,8 @@
<!--鏄剧ず-->
<div style="width:900px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'
+ <div
+ :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'
+ ((720 - (this.LastQueue.glassheight / 25 * 7)) / 2) + 'px auto;width:'
+ (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
@@ -571,8 +572,10 @@
{{ $t('Measure') }}
</div>
<div>
- {{ $t('Width') + "*" + $t('Height') }}:{{ (this.LastQueue.glasswidth +this.LastQueue.glassheight) != 0 ?
- (this.LastQueue.glasswidth +"*" + this.LastQueue.glassheight) + "" : "" }}
+ {{ $t('Width') + "*" + $t('Height') }}:{{ (this.LastQueue.glasswidth
+ + this.LastQueue.glassheight) !=
+ 0 ?
+ (this.LastQueue.glasswidth +"*" + this.LastQueue.glassheight) + "" : "" }}
</div>
<div>
@@ -604,7 +607,8 @@
this.LastQueue.state > 0 ? $t('Matching successful') :
(this.LastQueue.state == 0 ? $t('Multiple data matching') : $t('Matching failed')) }}</span>
<br> -->
- <el-table :data="this.tasklist3" :height="700" :row-class-name="rowClassName" style="width: 100%;padding:0;">
+ <el-table :data="this.tasklist3" :height="700" :row-class-name="rowClassName"
+ style="width: 100%;padding:0;">
<el-table-column prop="flowcard" :label="$t('Flowcard')"></el-table-column>
<el-table-column prop="mateid" :label="$t('Mateid')"></el-table-column>
<el-table-column prop="films" :label="$t('Films')"></el-table-column>
@@ -625,6 +629,7 @@
<el-table-column :min-width="80" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :min-width="80" prop="cell" :label="$t('Slot No')"></el-table-column>
<el-table-column :min-width="80" prop="flowcard" :label="$t('Flowcard')"></el-table-column>
+ <el-table-column :min-width="80" prop="customer" :label="$t('Customer')"></el-table-column>
<el-table-column :min-width="80" prop="mateid" :label="$t('Mateid')"></el-table-column>
<el-table-column :min-width="80" prop="glassWidth" :label="$t('Width')"></el-table-column>
<el-table-column :min-width="80" prop="glassHeight" :label="$t('Height')"></el-table-column>
@@ -646,13 +651,14 @@
:disabled="scope.row.number >= 1 ? false : true"
@click="UpdateStroageCageByCell(scope.row.cell, scope.row.number, -1)">{{ $t('Reduce')
}}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- :disabled="scope.row.number >= 1 ? false : true"
- @click="AddOutGlass(scope.row.cell,scope.row.glasstype)">{{ $t('OutGlass')
- }}</el-button>
+
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
:disabled="scope.row.number >= 1 ? false : true"
@click="UpdateStroageCageByCell(scope.row.cell, scope.row.number, 0)">{{ $t('Delete')
+ }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ :disabled="scope.row.number >= 1 ? false : true"
+ @click="AddOutGlass(scope.row.cell, scope.row.glasstype)">{{ $t('OutGlass')
}}</el-button>
</template>
</el-table-column>
@@ -669,11 +675,18 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="customer" :label="$t('Customer')" width="150" align="center">
+ <template slot-scope='scope'>
+ <div>
+ {{ scope.row.customer }}
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="mateid" :label="$t('Mateid')" align="center">
</el-table-column>
- <el-table-column prop="tier" :label="$t('Tier')" align="center">
+ <el-table-column prop="tier" :label="$t('Tier')" width="50" align="center">
</el-table-column>
- <el-table-column prop="number" :label="$t('Number')" align="center">
+ <el-table-column prop="number" :label="$t('Number')" width="50" align="center">
</el-table-column>
<el-table-column prop="cageno" :label="$t('Cage GlassNumber')" align="center">
</el-table-column>
@@ -703,7 +716,7 @@
</template>
</el-table-column> -->
<el-table-column prop="method" :label="$t('Task Method')" align="center">
- <template slot-scope='scope'>
+ <template slot-scope='scope' >
<div style="text-align: center;width: 105%;">
{{ scope.row.state >= 0 ? (scope.row.method == 0 ? $t('Out') : $t('All Out')) : "" }}
</div>
@@ -711,26 +724,27 @@
</el-table-column>
<el-table-column prop="line" :label="$t('Task Line')">
</el-table-column>
- <el-table-column width="380" :label="$t('Operate')">
+ <el-table-column width="420" :label="$t('Operate')">
- <template slot-scope='scope'>
- <el-select v-model="selected[scope.$index]" :placeholder="$t('Line')"
+ <template slot-scope='scope' >
+ <el-select v-model="selected[scope.$index]" :placeholder="$t('Line')" style="min-width: 70px; max-width: 70px;"
v-show="scope.row.state >= 0 ? true : false">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- v-show="scope.row.state >= 0 ? true : false" @click="StartChange(scope.row.flowcard, scope.row.orderstate)">
+ v-show="scope.row.state >= 0 ? true : false"
+ @click="StartChange(scope.row.flowcard, scope.row.orderstate)">
{{ scope.row.orderstate > 0 ? $t('stop work') : $t('start work') }}</el-button>
-
+
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
v-show="scope.row.state >= 0 ? true : false"
@click="ModeChange(scope.row.flowcard, scope.row.method)">
{{ $t('Mode Change') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;margin-left: 6px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;margin-left: 6px;"
v-show="scope.row.state >= 0 ? true : false"
@click="ClaimTasks(scope.row.flowcard, scope.row.state, selected[scope.$index], scope.row.line)">
{{ scope.row.state > 0 ? $t('Stop Task') : $t('Start Task') }}</el-button>
@@ -743,86 +757,177 @@
</el-table-column>
</el-table>
</el-dialog>
- <!-- 鍑虹墖闃熷垪鏄剧ず琛� -->
- <!-- <el-dialog :visible.sync="Outqueue" :title="$t('Outing Queue')" top="5vh">
- <el-table :data="tableData2" style="width: 100%;margin-bottom: 20px;" row-key="id" border lazy
- :tree-props="{ children: 'glassinfo', hasChildren: 'hasChildren' }">
- <el-table-column prop="flowcard" :label="$t('Order')" width="150" align="center">
- <template slot-scope='scope'>
- <div>
+
+ <!-- 鍑虹墖闃熷垪鏄剧ず琛� -->
+ <el-dialog :visible.sync="Outqueue" top="5vh" style="height: 100%; overflow-y: auto;">
+ <!-- //鍑虹墖璁板綍 -->
+ <label style="font-weight: bold; font-size: 18px;">{{$t('Out Records')}}</label>
+ <el-table :data="OutLog" style="width: 100%;margin-bottom: 20px;" row-key="id" border lazy>
+ <el-table-column prop="id" :label="$t('Task Id')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.id }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="flowcard" :label="$t('Flowcard')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
{{ scope.row.flowcard }}
</div>
</template>
</el-table-column>
- <el-table-column prop="mateid" :label="$t('Mateid')" align="center">
+ <el-table-column prop="customer" :label="$t('Customer')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.customer }}
+ </div>
+ </template>
</el-table-column>
+
<el-table-column prop="tier" :label="$t('Tier')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.tier }}
+ </div>
+ </template>
</el-table-column>
- <el-table-column prop="number" :label="$t('Number')" align="center">
- </el-table-column>
- <el-table-column prop="cageno" :label="$t('Cage GlassNumber')" align="center">
- </el-table-column>
- <el-table-column prop="finishnumber" :label="$t('Finish No')" align="center">
- </el-table-column>
- <el-table-column prop="mateid" :label="$t('Mate No')" align="center">
- </el-table-column>
- <el-table-column prop="films" :label="$t('Films')" align="center">
- </el-table-column>
+
<el-table-column prop="thickness" :label="$t('Thickness')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.thickness }}
+ </div>
+ </template>
</el-table-column>
<el-table-column prop="width" :label="$t('Width')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.width }}
+ </div>
+ </template>
</el-table-column>
<el-table-column prop="height" :label="$t('Height')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.height }}
+ </div>
+ </template>
</el-table-column>
- <el-table-column prop="state" :label="$t('Task State')" align="center">
+ <el-table-column prop="cell" :label="$t('Slot No')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.cell }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="films" :label="$t('Films')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.films }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="mateid" :label="$t('Mateid')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.mateid }}
+ </div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+ <label style="font-weight: bold; font-size: 18px;">{{$t('Outing Queue')}}</label>
+
+ <!-- //鍑虹墖闃熷垪 -->
+ <el-table :data="OutTask" style="width: 100%;margin-bottom: 20px;" row-key="id" border lazy>
+ <el-table-column prop="id" :label="$t('Task Id')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.id }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="flowcard" :label="$t('Flowcard')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.flowcard }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="customer" :label="$t('Customer')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.customer }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tier" :label="$t('Tier')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.tier }}
+ </div>
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="thickness" :label="$t('Thickness')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.thickness }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="width" :label="$t('Width')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.width }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="height" :label="$t('Height')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.height }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="films" :label="$t('Films')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.films }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="mateid" :label="$t('Mateid')" align="center">
+ <template slot-scope="scope">
+ <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
+ {{ scope.row.mateid }}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="task_state" :label="$t('Task State')" align="center">
<template slot-scope='scope'>
<div
- :style="{ backgroundColor: scope.row.state === 0 ? '' : '#00FFFF', width: '105%', height: '125%', lineHeight: '50px' }">
- {{ scope.row.state >= 0 ? scope.row.state == 0 ? $t('Stop') : $t('Start') : "" }}
+ :style="{backgroundColor: scope.row.state === 0 ? '#00FFFF' : '', width: '105%', height: '100%%', lineHeight: '38px' }">
+ {{scope.row.state == 0 ? $t('Waiting') : $t('Suspend') }}
</div>
</template>
</el-table-column>
- <el-table-column prop="method" :label="$t('Task Method')" align="center">
+ <el-table-column width="250" :label="$t('Operate')">
<template slot-scope='scope'>
- <div style="text-align: center;width: 105%;">
- {{ scope.row.state >= 0 ? (scope.row.method == 0 ? $t('Out') : $t('All Out')) : "" }}
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="line" :label="$t('Task Line')">
- </el-table-column>
- <el-table-column width="380" :label="$t('Operate')">
-
- <template slot-scope='scope'>
- <el-select v-model="selected[scope.$index]" :placeholder="$t('Line')"
- v-show="scope.row.state >= 0 ? true : false">
- <el-option v-for="item in options" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- v-show="scope.row.state >= 0 ? true : false" @click="StartChange(scope.row.flowcard, scope.row.orderstate)">
- {{ scope.row.orderstate > 0 ? $t('stop work') : $t('start work') }}</el-button>
-
-
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;height:42px;width: 70px;"
v-show="scope.row.state >= 0 ? true : false"
- @click="ModeChange(scope.row.flowcard, scope.row.method)">
- {{ $t('Mode Change') }}</el-button>
+ @click="UpdateOutTask(scope.row.id, scope.row.state)">
+ {{ scope.row.state == 0 ? $t('Suspend') : $t('Start') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;margin-left: 6px;"
- v-show="scope.row.state >= 0 ? true : false"
- @click="ClaimTasks(scope.row.flowcard, scope.row.state, selected[scope.$index], scope.row.line)">
- {{ scope.row.state > 0 ? $t('Stop Task') : $t('Start Task') }}</el-button>
-
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- v-show="scope.row.state >= 0 ? true : false" @click="deleteTasks(scope.row.flowcard)">
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;height:42px;width: 70px;"
+ v-show="scope.row.state >= 0 ? true : false" @click="DeleteOutTask(scope.row.id)">
{{ $t('langDelete') }}</el-button>
</template>
</el-table-column>
</el-table>
- </el-dialog> -->
+ </el-dialog>
<!-- 浜哄伐鍖归厤 -->
<el-dialog :visible.sync="StorageCageAdd" :title="$t('StorageCageAdd')" top="5vh" width="80%">
<div style="display: flex;height: 40px;line-height: 40px;">
@@ -864,7 +969,7 @@
Disabled, SelectPermissionByUserName, currentUsername, CompleteQueue,
isAllowReorderings,
- UpdateStroageCageByCell,AddOutGlass, FinishTask,TerminateTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue, importData, ManualTake, AnewMeasure, StartChange, deleteTasks,SaveMeasure
+ UpdateStroageCageByCell, AddOutGlass, FinishTask, TerminateTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue, importData, ManualTake, AnewMeasure, StartChange,UpdateOutTask,DeleteOutTask, deleteTasks, SaveMeasure
} from "../../api/home";
@@ -888,21 +993,23 @@
// 娴嬮噺涓嬫媺妗嗚啘绯�
selectedOption1: {
films: [],
- },
- selectedOption2: {
+ },
+ selectedOption2: {
thickness: [],
- },
+ },
// selectedOption1: [films],
// selectedOption2: [thickness],
selectedValue1: null, // 鐢ㄤ簬瀛樺偍绗竴涓笅鎷夋鐨勯�変腑鍊�
selectedValue2: null, // 鐢ㄤ簬瀛樺偍绗簩涓笅鎷夋鐨勯�変腑鍊�
// 灏嗗�艰祴缁� selectedValue1 鍜� selectedValue2
-
+
dataList: [],
tableData1: [],
tableData2: [],
+ OutTask: [],
+ OutLog: [],
Measuermode: false,
confirm1: false,
confirm2: false,
@@ -1025,7 +1132,7 @@
this.StorageCage = true;
} else if (i == 4) {
this.Taskqueue = true;
- }else if (i == 5) {
+ } else if (i == 5) {
this.Outqueue = true;
}
},
@@ -1065,7 +1172,7 @@
this.tasklist3 = obj.glassInfoFlowCard[0];
this.tasklist2 = obj.StoragTaskeTaskFeed[0];
this.tasklist1 = obj.StoragTaskeTaskOut[0];
- this.SelectSetting=obj.SelectSetting[0];
+ this.SelectSetting = obj.SelectSetting[0];
this.selectedOption1.films = obj.SelectMeasure[0];
this.selectedOption2.thickness = obj.SelectMeasure[0];
// if(obj.StorageCageForm.length == 0){
@@ -1076,7 +1183,7 @@
// }else{
// this.StorageCageForm = obj.StorageCageForm[0];
// }
-
+
// console.log(obj.StorageCageForm[0]);
@@ -1098,6 +1205,11 @@
}
this.tableData1 = obj.OrderTask[0];
+ this.OutTask = obj.OutTask[0];
+ this.OutLog = obj.OutLog[0];
+
+
+
this.tableData2 = obj.OrderTask[0];
this.LastQueue = obj.LastQueue[0];
@@ -1138,7 +1250,7 @@
});
}
},
-
+
load() {
//鍔犺浇鐢ㄦ埛鏉冮檺
currentUsername().then(res => {
@@ -1230,23 +1342,38 @@
}
});
},//閫夋嫨寮�濮嬪伐绋�
- StartChange(flowcard,orderstate) {
- if(orderstate==1){
-
- StartChange(flowcard,0).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }else{
- StartChange(flowcard,1).then(res => {
- if (res.data.message == 200) {
- this.$message.success(this.$t('Operation successful'));
- }
- });
- }
+ StartChange(flowcard, orderstate) {
+ if (orderstate == 1) {
+
+ StartChange(flowcard, 0).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ } else {
+ StartChange(flowcard, 1).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
},
- //閫夋嫨寮�濮嬪伐绋�
+ //寮�濮�/鏆傚仠鍑虹墖闃熷垪
+ UpdateOutTask(id, state) {
+ console.log(id + " 鐘舵��" + state);
+ if( state == 0){
+ state=2
+ }else{
+ state=0
+ }
+ UpdateOutTask(id, state).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+
+ },
+ //鍒犻櫎宸ョ▼
deleteTasks(flowcard) {
deleteTasks(flowcard).then(res => {
console.log("@" + flowcard + "@");
@@ -1255,11 +1382,20 @@
}
});
},
+ //鍒犻櫎鍑虹墖闃熷垪
+ DeleteOutTask(id) {
+ DeleteOutTask(id).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ },
+
//淇濆瓨娴嬮噺鑶滅郴鐨勫弬鏁�
- SaveMeasure(films,thickness) {
+ SaveMeasure(films, thickness) {
console.log('Films:', films); // 鎵撳嵃 films
console.log('Thickness:', thickness); // 鎵撳嵃 thickness
- SaveMeasure(films,thickness).then(res => {
+ SaveMeasure(films, thickness).then(res => {
if (res.data.message >= 1) {
this.$message.success(this.$t('Operation successful'));
}
@@ -1268,7 +1404,7 @@
//鏌ヨ鐜荤拑淇℃伅
SelectGlassInfo() {
console.log(this.StorageCageForm.glasswidthmm);
-
+
SelectGlassInfo(this.StorageCageForm.glasswidthmm, this.StorageCageForm.glassheightmm, this.StorageCageForm.thickness, this.StorageCageForm.films).then(res => {
this.StorageCageAddInfo = res.data.StorageCageAddInfo;
})
@@ -1308,15 +1444,15 @@
}
},
- AddOutGlass(cell,glasstype) {
- AddOutGlass(cell,glasstype).then(res => {
+ AddOutGlass(cell, glasstype) {
+ AddOutGlass(cell, glasstype).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
- }else {
+ } else {
this.$message.error(this.$t('Operation failed'));
}
});
-
+
},
//鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
--
Gitblit v1.8.0