From 73d050cad30ba9c8cc168709f116013f7eeb864c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 二月 2025 15:04:17 +0800
Subject: [PATCH] 大理片笼新增小车并调整位置，上片更换结束工程显示及逻辑，更改破损、人工拿走接口
---
UI-Project/src/views/Returns/upreturns2.vue | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index b893360..2b1697e 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -184,35 +184,38 @@
}
// 缁撴潫宸ョ▼
const deleteTask = async () => {
- try {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.pdeleteTask'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
engineerId: engineeringId,
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatad.value = response.data;
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
- blindb.value = false;
+ blindb.value = true;
+ tableDatad.value = response.data;
} else {
- ElMessage.error(response.message);
+ ElMessage.error(response.message);
+ }
+ } else {
+ }
}
+ } catch (error) {
}
- else {
- ElMessage({
- type: 'info',
- message: t('basicData.infonull'),
- })
- }
-}
-catch (error) {
- console.error(error);
- }
-}
+};
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
@@ -347,7 +350,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ const response = await request.post('/loadGlass/engineering/engineering/identControls', {
glassId: row.glassId,
line: 6,
status: 1,
@@ -377,7 +380,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
+ const response = await request.post('/loadGlass/engineering/engineering/identControls', {
glassId: row.glassId,
line: 6,
status: 1,
@@ -441,7 +444,7 @@
<el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
- <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
@@ -456,11 +459,7 @@
<el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
- <el-table-column :label="$t('Mounting.projectnumber')" align="center">
- <template #default="{ row }">
- <span>{{ 1 }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
<el-table-column
align="center"
prop="state"
@@ -542,14 +541,6 @@
<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
</div>
</template>
- <!-- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="deleteTask">
- {{ $t('basicData.confirm') }}
- </el-button>
- <el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
- </div>
- </template> -->
</el-dialog>
<!-- 鍊肩彮淇℃伅 -->
<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
--
Gitblit v1.8.0