From e875c70fea51ffafd689fd0d5f8b51bd3df40de0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 07 一月 2025 15:26:13 +0800
Subject: [PATCH] 中空模块新增空闲状态，中空配方新增字段，掰片模块调整文字样式
---
UI-Project/src/views/Returns/upreturns.vue | 126 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 595f20f..7033a51 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
-import {ElMessage} from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
import {useI18n} from 'vue-i18n'
import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
@@ -60,7 +60,8 @@
if (response.code === 200) {
tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
- }
+ window.localStorage.setItem('engineeringId', tableData[0].engineeringId)
+}
} catch (error) {
}
};
@@ -68,11 +69,17 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(0, 2);
- if(data.loadTask1!=null){
+ if(data.loadTask1.length !=0){
tableData.value = data.loadTask1[0]
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
+}
+else {
+ canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
+ canSelectProjectc.value = false;
+ tableData.value = '';
}
};
onBeforeUnmount(() => {
@@ -81,7 +88,6 @@
// 缁撴潫宸ョ▼
const handledelete = (row) => {
blindb.value = true;
- deleteTask()
};
const requestData = {
state: 100
@@ -109,10 +115,11 @@
engineerId: selectedProjectNo.value,
filmRemove: parseInt(filmRemove.value, 10),
})
- window.localStorage.setItem('engineeringId', selectedProjectNo.value)
+ window.localStorage.setItem('engineeringIda', selectedProjectNo.value)
window.localStorage.setItem('filmRemove', filmRemove.value)
if (response.code == 200) {
ElMessage.success(response.message);
+ // closeWebSocket(socket);
tableData.value = response.data;
dialogFormVisible.value = false;
selectedProjectNo.value = '';
@@ -139,7 +146,9 @@
ElMessage.success(response.message);
tableDatad.value = response.data;
canSelectProjecta.value = true;
+ canSelectProjectb.value = true;
canSelectProjectc.value = false;
+ blindb.value = false;
} else {
ElMessage.error(response.message);
}
@@ -158,21 +167,22 @@
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringIda = window.localStorage.getItem('engineeringIda')
if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
try {
const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
stationCell: 5,
filmRemove: filmRemove,
- engineerId: engineeringId,
+ engineerId: engineeringIda,
state: 1,
})
if (response.code == 200) {
- ElMessage.success(response.message);
- blind.value = false;
+ ElMessage.success(response.message);
canSelectProjecta.value = false;
+ canSelectProjectb.value = false;
canSelectProjectc.value = true;
-
+ // socket = initializeWebSocket(socketUrl, handleMessage);
+ blind.value = false;
} else {
ElMessage.error(response.message);
}
@@ -275,6 +285,66 @@
ElMessage.error(t('basicData.glassnull'));
}
};
+// 鐮存崯
+const opena = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.broke'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ glassId: row.glassId,
+ line: 5,
+ status: 1,
+ type: 8,
+ workingProcedure: '涓婄墖',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 浜哄伐鎷胯蛋
+const openb = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.takeawaya'),
+ t('productStock.prompt'),
+ {
+ confirmButtonText: t('productStock.yes'),
+ cancelButtonText: t('productStock.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ glassId: row.glassId,
+ line: 5,
+ status: 1,
+ type: 9,
+ workingProcedure: '涓婄墖',
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -399,30 +469,30 @@
</template>
</el-dialog>
<!-- 缁撴潫宸ョ▼ -->
- <el-dialog v-model="blindb" top="10vh" width="50%">
- <el-table ref="table" style="margin-top: 20px;height: 300px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="line" fixed align="center" :label="$t('basicData.line')"/>
- <el-table-column prop="workProcesses" fixed align="center" :label="$t('basicData.process')"/>
- <el-table-column prop="teamsGroupsName" align="center" :label="$t('basicData.team')"/>
- <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
- <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
- <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
- <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
- <el-table-column prop="deviceName" align="center" :label="$t('basicData.basic')"/>
+ <el-dialog v-model="blindb" top="10vh" width="80%">
+ <el-table ref="table" style="margin-top: 20px;height: 450px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="engineerId" fixed align="center" :label="$t('basicData.projectnumber')"/>
+ <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')"/>
+ <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')"/>
+ <el-table-column prop="width" align="center" :label="$t('basicData.width')"/>
+ <el-table-column prop="height" align="center" :label="$t('basicData.height')"/>
+ <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')"/>
+ <el-table-column prop="filmsid" align="center" :label="$t('basicData.coatingtypes')"/>
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
+ <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<template #footer>
<div id="dialog-footer">
+ <el-button type="danger" @click="deleteTask()">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
</div>
</template>
- <!-- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="deleteTask">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template> -->
</el-dialog>
<!-- 鍊肩彮淇℃伅 -->
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
--
Gitblit v1.8.0