From 2ac453ea9765e05f2f5446b122b5e61dda7e4ab8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期六, 11 十月 2025 18:45:22 +0800
Subject: [PATCH] 上片模块主页面、钢化前理片笼-理片笼信息按钮和中空三条线-缺片详情新增loading效果，中空历史任务删除字段，中空三条线-缺片详情页面改造，中空理片笼页面改造
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 164 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 132 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index 479fc43..33a2687 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -45,11 +45,13 @@
</div>
<!-- 鍔ㄦ�佽〃鏍� -->
<el-table
+ height="630"
:data="tab.tableDataa"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
>
<el-table-column prop="flowCardId" :label="$t('hellow.flowCardId')" align="center" />
<el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" />
+ <el-table-column prop="slot" :label="$t('film.slot')" align="center" />
<el-table-column prop="hollowSequence" :label="$t('hellow.order')" align="center" />
<el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center" />
<el-table-column prop="layer" :label="$t('hellow.layer')" align="center" />
@@ -380,6 +382,7 @@
</el-dialog>
<!-- 缂虹墖璇︽儏 -->
<el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
+ <div v-loading="isLoading" class="loading-container" :element-loading-text="$t('searchOrder.loadingText')" >
<div style="margin-top: -20px;text-align: center;margin-left: 400px;">
<el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
{{ currentRow.flowCardId }}
@@ -387,27 +390,37 @@
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <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="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="totalCount" align="center" :label="$t('hellow.totalnumber')" 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('hellow.brokenpieces')" min-width="80"/> -->
+ <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="100" />
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="100" />
+ <el-table-column prop="layer" align="center" :label="$t('hellow.layer')" min-width="80" />
+ <el-table-column prop="glassType" align="center" :label="$t('reportmanage.number')" 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="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="80" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="80" />
+ <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>
- <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>
+ <div class="custom-page-buttons">
+ <button
+ v-for="page in pageList"
+ :key="page"
+ @click="switchPage(page)"
+ :class="{ 'active-page': currentPage === page }"
+ class="page-btn"
+ >
+ {{ page }}
+ </button>
+ </div>
+ </div>
</el-dialog>
<!-- 寮�濮嬩换鍔� -->
<el-dialog v-model="blinda" top="30vh" width="25%" :title="$t('hellow.pstarttask')">
@@ -540,6 +553,7 @@
const blindb = ref(false)
const blindc = ref(false)
const mulan = ref(false)
+const isLoading = ref(true)
const activeTab = ref('')
const tabList = ref([])
const internalInstance = getCurrentInstance()
@@ -560,7 +574,6 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
-const flowCardId = ref('')
const pairTotal = ref()
const productName = ref('')
const customerName = ref('')
@@ -572,7 +585,10 @@
const dialogFormVisiblee = ref(false)
const add = ref(false)
const adda = ref(false)
-const currentPage2 = ref(1)
+const pageList = ref([]);
+const allData = ref({});
+const currentData = ref([]);
+const flowCardId = ref('')
const currentRow = reactive({});
const formattedProcessType = ref([]);
let selectedFormulaId = ref(null);
@@ -607,10 +623,6 @@
const currentPageKey = computed(() => `93${currentPage.value - 1}`);
const handlePageChange1 = (newPage) => {
currentPage.value = newPage;
-};
-const handlePageChange2 = (newPage) => {
- currentPage2.value = newPage;
- fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
const rawData = data.queueInfo[0]
@@ -732,11 +744,12 @@
};
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
- currentPage2.value = 1;
- const { flowCardId} = row;
- currentRow.flowCardId = row.flowCardId;
+ let currentPageLack = window.localStorage.getItem('currentPageLack')
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
+ isLoading.value = true;
dialogFormVisibleb.value = true;
- fetchFlowBind(flowCardId, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
@@ -943,18 +956,65 @@
};
});
};
-const fetchFlowBind = async (flowCardId, page) => {
+
+// 缂虹墖璇︽儏-鐮存崯
+const handleBroke = async (row) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
- const response = await request.post(url)
+ 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) {
- tableDatac.value = response.data[page];
ElMessage.success(response.message);
+ const { flowCardId } = row;
+ fetchFlowBind();
+ fetchFlowCardId()
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+}
+const fetchFlowBind = async (flowCardId) => {
+ try {
+ const url = `/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId=${flowCardId}`;
+ const response = await request.post(url);
+ if (response.code === 200) {
+ isLoading.value = false;
+ allData.value = response.data;
+ // 鎻愬彇骞舵帓搴忛〉鐮�
+ pageList.value = Object.keys(response.data)
+ .map(Number)
+ .sort((a, b) => a - b);
+ // 鍒濆鍖栫涓�椤垫暟鎹�
+ currentPage.value = pageList.value[0];
+ tableDatac.value = response.data[pageList.value[0]] || [];
} else {
}
} catch (error) {
}
-}
+};
+// 椤甸潰鍒囨崲澶勭悊
+const switchPage = (page) => {
+ currentPage.value = page;
+ tableDatac.value = allData.value[page] || []; // 鍒囨崲鏁版嵁
+};
// 寮�濮嬩换鍔�
const handlea = async () => {
try {
@@ -1150,4 +1210,44 @@
::v-deep(.row-red-background) {
background-color: rgb(224.6, 242.8, 215.6) !important;
}
+.custom-page-buttons {
+ display: flex;
+ gap: 10px;
+ margin-top: 20px;
+}
+
+.custom-page-buttons {
+ display: flex;
+ gap: 10px;
+ margin: 20px 0;
+ flex-wrap: wrap;
+}
+
+.page-btn {
+ padding: 8px 16px;
+ min-width: 40px;
+ border: 1px solid #dcdfe6;
+ border-radius: 4px;
+ background: #f5f7fa;
+ cursor: pointer;
+ transition: all 0.3s;
+}
+
+.page-btn:hover {
+ background: #e6f1ff;
+}
+
+.page-btn.active-page {
+ background: #409eff;
+ color: white;
+ border-color: #409eff;
+}
+.loading-container {
+ position: relative;
+ height: 100%;
+}
+/* 纭繚閬僵灞傚湪鏈�椤跺眰 */
+.el-loading-mask {
+ z-index: 2000 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0