From 29f8c2e989cd6d9d3e93b1ac511dbd9e14b8b338 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 23:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/hollow/hollowequipmenttwo.vue |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index fa0c416..861978e 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -68,6 +68,7 @@
     <div style="display: flex;">
     <el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
     <el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+    <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
     <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
       {{$t('reportmanage.inquire')}}</el-button>
   </div>
@@ -519,6 +520,7 @@
 const filmRemove = ref('')
 const formulaName = ref('')
 const leftRemove = ref('')
+const thickness = ref('')
 const rightRemove = ref('')
 const topRemove = ref('')
 const filmsId = ref('')
@@ -689,6 +691,7 @@
     const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
       filmsId: '',
       flowCardId: '',
+      thickness: '',
     });
     if (response.code == 200) {
       ElMessage.success(response.message);
@@ -706,6 +709,7 @@
     const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
       filmsId: filmsId.value,
       flowCardId: flowCardId.value,
+      thickness: thickness.value
     });
     if (response.code == 200) {
       ElMessage.success(response.message);

--
Gitblit v1.8.0