From 32ff006f92134dd1fae4cd4d625560963dff3289 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 十月 2024 15:49:00 +0800
Subject: [PATCH] 修改进炉前显示
---
UI-Project/src/views/Slicecage/slicecage.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index c741d63..6732174 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -79,6 +79,7 @@
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
const temperingtotal = ref(0);
const glasstotal = ref(0);
+const fulltotals = ref(0);
const temperingengineerId=ref('');
// 褰撳墠椤电爜鍜屾瘡椤垫樉绀虹殑鏉℃暟
const currentPage = ref(1);
@@ -361,7 +362,7 @@
}
};
// 鎸囧畾閽㈠寲
- const brokee = async(row) => {
+ const brokee = async(row,temperingFeedSequence) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.specifytemperinga'),
@@ -376,6 +377,7 @@
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/TemperingGlass",{
engineerId: row.engineer_id,
temperingLayoutId: row.tempering_layout_id,
+ temperingFeedSequence:temperingFeedSequence
});
if (response.code === 200) {
ElMessage.success(response.message);
@@ -386,6 +388,7 @@
} catch (error) {
console.error('鍙戠敓閿欒:', error);
}
+ handleganghua();
};
// 鎸囧畾宸ョ▼
const brokek = async(row) => {
@@ -624,11 +627,17 @@
ElMessage.success(response.message);
tableDatagh.value = response.data
temperingtotal.value = response.data.length
- let totalCount = 0;
+ let totalCount = 0;
+ let fullCount = 0;
response.data.forEach(item => {
- totalCount += item.count2 || 0;
+ totalCount += item.count1 || 0;
+ if(item.count2-item.count1-item.count4==0){
+ fullCount+=1;
+ }
});
glasstotal.value = totalCount;
+ fulltotals.value = fullCount;
+
} else {
ElMessage.error(response.message);
}
@@ -642,8 +651,8 @@
const fetchFlowCardId = async () => {
try {
const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
- line: 2001,
- workingProcedure : '鍐峰姞宸�'
+ line: 4001,
+ workingProcedure : '閽㈠寲'
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1524,6 +1533,13 @@
</el-col>
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('婊＄倝鏁伴噺')" style="width: 14vw">
+ {{ fulltotals }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('褰撳墠鎸囧畾宸ョ▼')" style="width: 14vw">
{{ temperingengineerId }}
</el-form-item>
@@ -1544,12 +1560,13 @@
<el-table-column prop="count2" align="center" :label="$t('鎬绘暟閲�')" min-width="150" />
<el-table-column prop="count1" align="center" :label="$t('绗煎瓙鍐呮暟閲�')" min-width="150" />
<el-table-column prop="count3" align="center" :label="$t('缂哄皯鏁伴噺')" min-width="150" />
+ <el-table-column prop="count4" align="center" :label="$t('鐮存崯/鎷胯蛋鏁伴噺')" min-width="150" />
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="250">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="brokee(scope.row)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button size="mini" type="text" plain @click="brokee(scope.row,1)">{{ $t('searchOrder.specifytempering') }}</el-button>
+ <el-button size="mini" type="text" plain @click="brokee(scope.row,0)">{{ $t('searchOrder.specifyout') }}</el-button>
<el-button size="mini" type="text" plain @click="brokek(scope.row)">{{ $t('searchOrder.specifyengineerid') }}</el-button>
</template>
-
</el-table-column>
</el-table>
</el-dialog>
--
Gitblit v1.8.0