From 8934b81f82311da255aa71b672f2db28daf16bf9 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 二月 2025 14:03:18 +0800
Subject: [PATCH] 原片仓储启用禁用字段
---
UI-Project/src/views/Returns/upreturns2.vue | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index b78e6c0..8b90912 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref, computed} from "vue";
import {useRouter} from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import {useI18n} from 'vue-i18n'
@@ -27,6 +27,22 @@
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
const tableData = ref([])
+const filteredData = computed(() => {
+ // applyFilters 鍑芥暟搴旇鍦ㄦ煇澶勫畾涔夛紝鐢ㄤ簬鏍规嵁褰撳墠绛涢�夋潯浠惰繃婊ゆ暟鎹�
+ return applyFilters(tableData, currentFilters);
+});
+// 褰撳墠绛涢�夋潯浠讹紝搴旇鏄竴涓搷搴斿紡鍙橀噺锛岀敤浜庡瓨鍌ㄧ敤鎴烽�夋嫨鐨勭瓫閫夊��
+const currentFilters = ref<{ state?: string }>({});
+const filterTag = (value: string, row: any) => {
+ // return String(row.state) === value;
+ return row.state === value
+};
+// 搴旂敤绛涢�夋潯浠剁殑鍑芥暟
+const applyFilters = (data: any[], filters: { state?: string }) => {
+ return data.filter(row => {
+ return (!filters.state || String(row.state) === filters.state);
+ });
+};
const titleSelectJson = ref({
engineerId: [],
})
@@ -60,6 +76,7 @@
if (response.code === 200) {
tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
+ window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
}
@@ -69,12 +86,15 @@
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(2, 4);
if(data.loadTask2.length !=0){
+ // tableData.splice(0, tableData.length, ...data.loadTask2[0]);
tableData.value = data.loadTask2[0]
+ window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
}
else {
+ tableData.value = '';
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
@@ -86,7 +106,6 @@
// 缁撴潫宸ョ▼
const handledelete = (row) => {
blindb.value = true;
- deleteTask()
};
const requestData = {
state: 100
@@ -114,11 +133,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);
+ closeWebSocket(socket);
tableData.value = response.data;
dialogFormVisible.value = false;
selectedProjectNo.value = '';
@@ -135,7 +154,7 @@
// 缁撴潫宸ョ▼
const deleteTask = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
@@ -147,6 +166,7 @@
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
+ blindb.value = false;
} else {
ElMessage.error(response.message);
}
@@ -165,13 +185,13 @@
// 寮�濮嬩笂鐗�
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: 6,
filmRemove: filmRemove,
- engineerId: engineeringId,
+ engineerId: engineeringIda,
state: 1,
})
if (response.code == 200) {
@@ -179,7 +199,7 @@
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
- // socket = initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
blind.value = false;
} else {
ElMessage.error(response.message);
@@ -195,7 +215,7 @@
const handleup = async () => {
try {
let filmRemove = window.localStorage.getItem('filmRemove')
- let engineeringId = window.localStorage.getItem('engineeringId')
+ let engineeringId = window.localStorage.getItem('engineeringIda')
console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
@@ -392,18 +412,6 @@
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
- <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.twoloadingline')"
- style="margin-top: 5px;margin-left: 20px;">
- <el-option :label="$t('Mounting.all')" value="0"></el-option>
- <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
- <el-option :label="$t('Mounting.twoloadingline')" value="2"></el-option>
- </el-select>
- <el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-top: 5px;margin-left: 20px;" >
- <el-option :label="$t('Mounting.waiting')" value="1"></el-option>
- <el-option :label="$t('film.execution')" value="2"></el-option>
- <el-option :label="$t('film.finish')" value="3"></el-option>
- </el-select>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
@@ -423,20 +431,27 @@
</template>
</el-table-column>
<el-table-column
- align="center"
- :label="$t('Mounting.state')"
- min-width="80"
- prop="state"
- >
- <template #default="scope">
- <el-tag
+ align="center"
+ prop="state"
+ :label="$t('Mounting.state')"
+ min-width="80"
+ :filters="[
+ { text: t('Mounting.pass'), value: 100 },
+ { text: t('Mounting.waiting'), value: 0 },
+ ]"
+ :filter-method="filterTag"
+ filter-placement="bottom-end"
+ >
+ <template #default="scope">
+ <el-tag
:type="scope.row.state === 100 ? 'success' : 'warning'"
@click="toggleEnableState(scope.row)"
+ disable-transitions
>
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
- </template>
- </el-table-column>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
@@ -468,7 +483,7 @@
</el-dialog>
<!-- 缁撴潫宸ョ▼ -->
<el-dialog v-model="blindb" top="10vh" width="80%">
- <el-table ref="table" style="margin-top: 20px;height: 300px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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')"/>
@@ -478,7 +493,7 @@
<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="270">
+ <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>
@@ -487,6 +502,7 @@
</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>
--
Gitblit v1.8.0