From f5a13d8fc3d0e49adcf73231e7ba60bfd7f5e296 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 09:14:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 591e943..70a5bcc 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -83,10 +83,10 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.glass_id,
- controlsId: 8,
- line: 2001,
- machine: '鍐峰姞宸�',
+ glassId: row.glassId,
+ state: 8,
+ line: row.line,
+ workingProcedure: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -96,9 +96,9 @@
// alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
}
};
// 鎷胯蛋
@@ -116,10 +116,10 @@
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
- glassId: row.glass_id,
- controlsId: 9,
- line: 2001,
- machine: '鍐峰姞宸�',
+ glassId: row.glassId,
+ state: 9,
+ line: row.line,
+ workingProcedure: '鍐峰姞宸�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -176,7 +176,7 @@
}}</el-button>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="240" ref="table"
+ <el-table height="750" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="glassId" align="center" :label="$t('workOrder.glassID')" min-width="180" />
--
Gitblit v1.8.0