From 69983d407ce1d271d7c67474490b1b2717558bd0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 18 二月 2025 15:43:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Returns/upreturns.vue | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 4a5a950..386f5b7 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -26,8 +26,7 @@
const cuttingMachineStatusColor = ref('#911005');
const tableDataa = ref<any[]>([]);
const tableDatab = ref<any[]>([]);
-// const tableData = ref([])
-const tableData = reactive([]);
+const tableData = ref([])
const filteredData = computed(() => {
// applyFilters 鍑芥暟搴旇鍦ㄦ煇澶勫畾涔夛紝鐢ㄤ簬鏍规嵁褰撳墠绛涢�夋潯浠惰繃婊ゆ暟鎹�
return applyFilters(tableData, currentFilters);
@@ -35,7 +34,6 @@
// 褰撳墠绛涢�夋潯浠讹紝搴旇鏄竴涓搷搴斿紡鍙橀噺锛岀敤浜庡瓨鍌ㄧ敤鎴烽�夋嫨鐨勭瓫閫夊��
const currentFilters = ref<{ state?: string }>({});
const filterTag = (value: string, row: any) => {
- // return String(row.state) === value;
return row.state === value
};
// 搴旂敤绛涢�夋潯浠剁殑鍑芥暟
@@ -75,7 +73,8 @@
try {
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
if (response.code === 200) {
- tableData.splice(0, tableData.length, ...response.data);
+ tableData.value = response.data
+ // tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
@@ -89,7 +88,6 @@
tableDataa.value = data.list[0].slice(0, 2);
if(data.loadTask1.length !=0){
tableData.value = data.loadTask1[0]
- // tableData.splice(0, tableData.length, ...data.loadTask1[0]);
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
@@ -363,6 +361,31 @@
console.error('鍙戠敓閿欒:', error);
}
};
+// 鏋跺瓙澶嶄綅
+const handleptask = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('basicData.prackreset'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/loadGlass/rawGlassStorageDetails/shelfReset?slot="+ 1;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -463,6 +486,11 @@
<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="70">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('basicData.rackreset') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
--
Gitblit v1.8.0