From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index ec5af28..8dc1f41 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -115,6 +115,26 @@
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();
@@ -127,8 +147,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="2001"></el-option>
- <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option>
+ <el-option :label="$t('workOrder.edgingone')" value="930"></el-option>
+ <el-option :label="$t('workOrder.edgingtwo')" value="931"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
@@ -154,10 +174,15 @@
<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="status" :label="$t('workOrder.status')" align="center" width="200">
- <template #default="scope">
+ <el-table-column prop="state" :label="$t('workOrder.status')" align="center" width="200">
+ <!-- <template #default="scope">
{{ scope.row.status==0?"鏈（杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬（杈�" }}
- </template>
+ </template> -->
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.state)">
+ {{ getStatusTextb(scope.row.state) }}
+ </el-tag>
+ </template>
</el-table-column>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
--
Gitblit v1.8.0