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/hollowequipment.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 623ff53..960454e 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -95,6 +95,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>
@@ -1028,6 +1029,7 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const thickness = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1096,8 +1098,8 @@
const allPageData = data;
const currentPageKeyValue = currentPageKey.value;
const currentPageData = allPageData[currentPageKeyValue];
- if (data.free0neReguestEntity != null) {
- freeone.value = data.free0neReguestEntity == 1 ? 'green' : '#911005';
+ if (data.freeOneRequestEntity != null) {
+ freeone.value = data.freeOneRequestEntity == 1 ? 'green' : '#911005';
}
// if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
// tableDataa.value = currentPageData[0];
@@ -1406,6 +1408,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1423,6 +1426,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