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/GlassStorage/rawfilmstorage.vue | 82 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 5c76637..98dca48 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -76,7 +76,7 @@
}
};
const handleEdit = (row) => {
- window.localStorage.setItem('slotId', row.slotId)
+ window.localStorage.setItem('slotId', row.slot)
Edit.value = true;
};
const handleBinda = (row) => {
@@ -222,8 +222,8 @@
const response = await request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest", {
beginDate: (timeRange.value && timeRange.value[0]) || '',
endDate: (timeRange.value && timeRange.value[1]) || '',
- taskState: stateList,
- taskType: celllist
+ taskState: celllist,
+ taskType: stateList
})
if (response.code === 200) {
// tableDataa.value = response.data;
@@ -241,7 +241,7 @@
}
const newState = row.state === 1 ? 0 : 1;
try {
- var url="/glassStorage/rawGlassStorageStation/updateSlotState?slot="+row.deviceId + "&state=" + newState;
+ var url="/glassStorage/rawGlassStorageStation/updateSlotState?slot="+row.slot + "&state=" + newState;
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -261,12 +261,21 @@
const response = await request.post('/glassStorage/rawGlassStorageDetails/updateQuantity', {
slotId: slotId,
remainQuantity: remainQuantity.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ patternHeight: patternHeight.value,
+ patternWidth: patternWidth.value,
}
);
if (response.code === 200) {
ElMessage.success(response.message);
Edit.value = false;
tableDatab.value = response.data;
+ patternWidth.value = '';
+ patternHeight.value = '';
+ patternThickness.value = '';
+ filmsId.value = '';
+ remainQuantity.value = '';
} else {
ElMessage.error(response.message);
}
@@ -429,7 +438,7 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="270">
<template #default="scope">
- <el-button :disabled="!scope.row.remainQuantity" size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('film.exit') }}</el-button>
+ <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>
</template>
@@ -548,22 +557,65 @@
</div>
</template>
</el-dialog>
- <el-dialog v-model="Edit" top="21vh" width="40%">
- <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="100px">
- <el-form label-width="210px" label-position="right">
- <el-form-item :label="$t('film.thickremainquantity')" :required="true" style="width: 25vw">
- <el-input v-model="remainQuantity" autocomplete="off" />
+ <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="100px" label-position="right">
+ <el-row style="margin-top: -15px;margin-bottom: -2px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.widtha')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inwidth')" v-model="patternWidth" autocomplete="off" />
+ </el-form-item>
+ </div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.heighta')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inheight')" v-model="patternHeight" autocomplete="off" />
+ </el-form-item></div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.thicknessa')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.inthickness')" v-model="patternThickness" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ <el-col :span="9">
+ <div id="dta" style="font-size: 15px;">
+ <div>
+ <el-form-item :label="$t('film.filmsa')" :required="true" style="width: 17vw;">
+ <el-input :placeholder="$t('film.infilms')" v-model="filmsId" autocomplete="off" />
+ </el-form-item></div></div>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 10px;">
+ <el-col :span="6">
+ <div id="dt" style="font-size: 15px;">
+ <div>
+ <el-form label-width="210px">
+ <el-form-item :label="$t('film.thickremainquantity')" :required="true" style="width: 44.5vw;margin-left: -40px;">
+ <el-input v-model="remainQuantity" autocomplete="off" :placeholder="$t('film.inquantity')"/>
</el-form-item>
</el-form>
- </el-form>
- </div>
+ </div></div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-form>
+ </div>
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="Editclick">
- {{ $t('reportWork.sure') }}
+ {{ $t('basicData.confirm') }}
</el-button>
- <el-button @click="Edit = false">{{ $t('reportWork.cancel') }}</el-button>
+ <el-button @click="Edit = false">{{ $t('basicData.cancel') }}</el-button>
</div>
</template>
</el-dialog>
--
Gitblit v1.8.0