From b3a4243739344b92af9339171e72829001b56fdf Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 30 十月 2025 15:01:34 +0800
Subject: [PATCH] 上片模块、钢化前大理片笼新增进页面接口，隐藏中空线预览任务按钮
---
UI-Project/src/views/hollow/hollowslicecage.vue | 155 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 97 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index f7eb58b..6c1b644 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -29,6 +29,7 @@
const carPosition = ref([])
const tableDatass = ref([])
const tableDataLack = ref([])
+const tableDataMiss = ref([])
// 鍝嶅簲寮忕姸鎬�
const showAlert = ref(false)
const alertMessage = ref('')
@@ -83,14 +84,29 @@
window.localStorage.setItem('slot', row.slot)
add.value = true;
};
-// 缂虹墖璇︽儏
-// const handleMissingFilms = (row) => {
-// currentPage2.value = 1;
-// const { flowCardId } = row;
-// currentLack.flowCardId = row.flowCardId;
-// dialogFormVisibleb.value = true;
-// fetchFlowBind(flowCardId, currentPage2.value);
-// };
+// 澶氭潯鐮存崯鏁版嵁
+const handleMissingFilms = (row) => {
+ dialogFormVisibleb.value = true;
+ handleAllMissing(row)
+};
+const handleAllMissing = async (row) => {
+ try {
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryLackGlassByFlowCard', {
+ flowCardId: row.flowCardId,
+ layer: row.layer,
+ orderSort: row.glassType,
+ // glassId: row.glassId
+ });
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableDataMiss.value = response.data
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ }
+}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
fetchFlowBind(currentLack.flowCardId, currentPage2.value);
@@ -204,6 +220,39 @@
try {
const confirmResult = await ElMessageBox.confirm(
t('searchOrder.broke'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ const response = await request.post('/hollowGlass/hollowGlassRelationInfo/hollowBigStorageGlassDamage', {
+ flowCardId: row.flowCardId,
+ glassType: row.glassType,
+ glassId: row.glassId,
+ layer: row.layer,
+ state: 8,
+ line: 1,
+ workingProcedure: '涓┖',
+ remark: '涓┖'
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind(flowCardId, currentPage2.value);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+// 缂虹墖璇︽儏-涓�閿牬鎹�
+const handleAllBroke = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.dilapidationWhether'),
t('workOrder.prompt'),
{
confirmButtonText: t('workOrder.yes'),
@@ -402,28 +451,28 @@
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
// 浠诲姟閲嶇疆
-const handleptask = async() => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('searchOrder.partasks'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
- cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- }
-};
+// const handleptask = async() => {
+// try {
+// const confirmResult = await ElMessageBox.confirm(
+// t('searchOrder.partasks'),
+// t('workOrder.prompt'),
+// {
+// confirmButtonText: t('workOrder.yes'),
+// cancelButtonText: t('workOrder.cancel'),
+// type: 'warning',
+// }
+// );
+// if (confirmResult === 'confirm') {
+// const response = await request.post('/hollowGlass/hollowBigStorageCage/resetCage')
+// if (response.code === 200) {
+// ElMessage.success(response.message);
+// } else {
+// ElMessage.error(response.msg);
+// }
+// }
+// } catch (error) {
+// }
+// };
// 璋冨害寮�鍏�
const handlediaodu = async () => {
try {
@@ -895,7 +944,7 @@
<div style="display: flex;">
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="primary" @click="handlexiang">{{ $t('searchOrder.cageinformation') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
+ <!-- <el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button> -->
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
<div style="display: flex;">
<div style="margin-left: 15px;margin-top: 5px;font-size: 14px;top: 5vh;margin-top: 12px;">{{ $t('searchOrder.hollowPriority') }}锛�</div>
@@ -1015,18 +1064,20 @@
max-height="calc(500px - 35px)"
style="width: 100%;"
>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
- <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="40" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="139" />
+ <el-table-column prop="layer" align="center" :label="$t('reportmanage.layer')" min-width="38" />
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="70" />
- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="70" />
- <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
- <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
+ <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="52" />
+ <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62"/>
+ <!-- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="62" show-overflow-tooltip/> -->
+ <el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="55" />
+ <el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="55" />
<el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
<el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
+ <!-- <el-table-column prop="patchCount" align="center" :label="$t('large.patchCount')"/> -->
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" min-width="82">
<template #default="scope">
- <el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain @click="handleMissingFilms(scope.row)">{{ $t('hellow.missingfilms') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -1235,35 +1286,23 @@
<div>
</div>
</el-dialog>
- <!-- 缂虹墖璇︽儏 -->
- <el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
- <div style="margin-top: -20px;text-align: center;margin-left: 400px;">
- <el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
- {{ currentLack.flowCardId }}
- </el-form-item>
- </div>
- <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataLack"
+ <!-- 澶氭潯鐮存崯鏁版嵁 -->
+ <el-dialog v-model="dialogFormVisibleb" top="15vh" width="70%" height="500">
+ <el-button plain @click="handleAllBroke">{{ $t('order.dilapidationAll') }}</el-button>
+ <el-table ref="table" style="margin-top: 20px;height: 400px;" :data="tableDataMiss"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="glassType" align="center" :label="$t('large.serialnumber')" min-width="80" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
<el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80" />
- <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('searchOrder.process')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80" />
- <el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80" />
- <el-table-column prop="damageCount" align="center" :label="$t('large.brokenNum')"/>
<el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
<template #default="scope">
<el-button type="text" plain @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
</template>
- </el-table-column>
- <div style="float: right;margin-bottom: 5px;">
- <el-pagination layout="prev, pager, next" :total="50" />
- </div>
+ </el-table-column>
</el-table>
- <div style="display: flex;margin-left: 40%;margin-top: 10px;">
- <el-pagination background size="large" layout="prev, pager, next" :total="30" :current-page.sync="currentPage2"
- @current-change="handlePageChange2" />
- </div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
--
Gitblit v1.8.0