From add613567296124356cf870be07d7e105f48afb6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 14:45:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 8dc1f41..ec5af28 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -115,26 +115,6 @@
closeWebSocket(socket);
}
});
- function getStatusTypeb(state) {
- switch (state) {
- case 0:
- return 'info';
- case 1:
- return 'success';
- case 1:
- return 'danger';
- }
-}
-function getStatusTextb(state) {
- switch (state) {
- case 0:
- return t('workOrder.nedging');
- case 1:
- return t('workOrder.edging');
- case 2:
- return t('workOrder.finedging');
- }
-}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -147,8 +127,8 @@
<div style="display: flex;">
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
- <el-option :label="$t('workOrder.edgingone')" value="930"></el-option>
- <el-option :label="$t('workOrder.edgingtwo')" value="931"></el-option>
+ <el-option :label="$t('workOrder.edgingone')" value="2001"></el-option>
+ <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
@@ -174,15 +154,10 @@
<el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" />
<el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" />
<el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" />
- <el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
- <!-- <template #default="scope">
+ <el-table-column prop="status" :label="$t('workOrder.status')" align="center" width="200">
+ <template #default="scope">
{{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
- </template> -->
- <template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.state)">
- {{ getStatusTextb(scope.row.state) }}
- </el-tag>
- </template>
+ </template>
</el-table-column>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
--
Gitblit v1.8.0