From 8738b8e0f7cfa65732bfc0e40fa80e1ca3c7e27e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 19 十月 2024 08:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index c5ffe12..4610faf 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -228,10 +228,10 @@
const requestData = {
state: 100
};
-
-
-
-
+
+
+
+
const selectgong = async (queryString: string) => {
try {
const response = await request.post('/loadGlass/optimizeProject/listByState',{
@@ -559,7 +559,7 @@
// window.location.reload()
blindb.value = false;
tableData.splice([]);
-
+
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
@@ -613,7 +613,7 @@
const handleBindb = (row) => {
blindb.value = true;
};
-
+
// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId;
@@ -723,7 +723,7 @@
<div style="margin-left: 70px;">{{ upstatus }} </div>
<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
<el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.change') }}</el-button>
-
+
</div>
<el-button :disabled="!canSelectProject" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('basicData.selectproject') }}</el-button>
<el-button :disabled="!canSelectProject" :style="{ backgroundColor: canStartLoading ? 'green' : 'initial',color: canStartLoading ? 'white' : 'black', }" style="margin-top: 5px;margin-left: 20px;" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
--
Gitblit v1.8.0