From 1d3f8dc16ca98b14a40da8c70a405793295faa78 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 23 四月 2025 13:47:45 +0800
Subject: [PATCH] 系统配置页面修改bug，上片新增页面
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 2b63737..f875465 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -248,7 +248,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鍘熺墖鍏ュ簱
@@ -275,7 +274,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鍏ュ簱璇锋眰
@@ -293,8 +291,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱璇锋眰
@@ -312,8 +308,6 @@
}
}
catch (error) {
- // 澶勭悊閿欒
- console.error(error);
}
}
// 鍑哄簱
@@ -339,7 +333,6 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
// 鏌ヨ鏁版嵁
@@ -419,7 +412,6 @@
ElMessage.error(response.message);
}
} catch (error) {
- console.error(error);
}
};
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -458,11 +450,10 @@
// }
// }
// catch (error) {
-// console.error(error);
// }
// }
// 浠诲姟鎴愬姛澶勭悊
-const successfull = async(row) => {
+const successfull = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.psuccessfullyprocessed'),
@@ -482,12 +473,11 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
-const handleptask = async(row) => {
+const handleptask = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.ptaskfailure'),
@@ -507,8 +497,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
function getStatusType1(taskType) {
@@ -603,15 +592,15 @@
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="300" ref="table"
:data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" :label="$t('film.enableid')"/>
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')"/>
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')"/>
+ <el-table-column prop="endSlot" align="center" :label="$t('film.endoriginateslot')"/>
<el-table-column prop="patternQuantity" align="center" :label="$t('film.patternquantity')"/>
- <el-table-column
+ <el-table-column width="100"
align="center"
:label="$t('film.enabletype')"
prop="taskType"
@@ -634,7 +623,12 @@
</template>
</el-table-column>
<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
-
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-card>
@@ -700,27 +694,27 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
- <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" size="mini" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
+ <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity" type="text" plain @click="deleteWarehousing(scope.row)">{{ $t('film.delete') }}</el-button>
+ <el-button :disabled="!scope.row.remainQuantity || scope.row.remainQuantity === 0" type="text" plain @click="openc(scope.row)">{{ $t('film.outbound') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
marginheight="2000px"
width="100%"
- height="700px"
+ height="750px"
frameborder="0"
></iframe>
</el-dialog>
<el-dialog v-model="dialogFormVisibleb" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
@@ -832,7 +826,7 @@
</el-dialog>
<el-dialog v-model="Edit" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="150px">
+ <el-form label-width="150px">
<el-form label-width="100px" label-position="right">
<el-row style="margin-top: -15px;margin-bottom: -2px;">
<el-col :span="6">
--
Gitblit v1.8.0