From 6bc7ce4b5bb2cbaf458766ac40d9ba8c5d40133d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 15 八月 2024 09:12:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
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 9e9f6a1..2ba2936 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);
@@ -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);
@@ -157,18 +157,18 @@
<template>
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable>
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable style="margin-left: 20px;">
<el-option label="纾ㄨ竟涓�绾�" value="2001"></el-option>
<el-option label="纾ㄨ竟浜岀嚎" value="2002"></el-option>
</el-select>
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable >
+ <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable style="margin-left: 20px;" >
<el-option label="鏈（杈�" value="0"></el-option>
<el-option label="纾ㄨ竟涓�" value="1"></el-option>
<el-option label="宸茬（杈�" value="2"></el-option>
</el-select>
- <span class="demonstration">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <span class="demonstration" style="margin-left: 20px;">鏃堕棿娈�</span>
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
--
Gitblit v1.8.0