From 870b2e410af104ce9a551cd7f3f462b77800266a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 六月 2025 09:47:15 +0800
Subject: [PATCH] 解决中空一线、二线、三线前端返回空数据时报错问题
---
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 170 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 57 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index fd68574..0d1a301 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -65,10 +65,13 @@
<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="productName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.inproductname')"/>
+ <el-input v-model="customerName" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('large.incustomerName')"/>
<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>
+ <div style="margin-left: 87%;">{{$t('hellow.pairsnumbertotal')}}{{ pairTotal }}</div>
<el-table
ref="table"
style="margin-top: 20px; height: 700px;"
@@ -88,13 +91,14 @@
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
<el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80"/>
- <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80"/>
+ <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
</el-table>
</template>
</el-table-column>
<el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
+ <el-table-column prop="customerName" fixed align="center" :label="$t('large.customerName')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -113,21 +117,21 @@
<!-- 涓┖閰嶆柟娣诲姞 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" 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('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -136,35 +140,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" 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('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" 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('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -185,21 +189,21 @@
<!-- 涓┖閰嶆柟淇敼 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
<div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form label-width="150px">
- <el-form label-width="150px" label-position="right">
+ <el-form label-width="200px">
+ <el-form label-width="200px" label-position="right">
<el-row style="margin-top: 10px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" 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('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
- <el-select v-model="filmRemove" clearable style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
+ <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
+ <el-select v-model="filmRemove" clearable style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.removal')" value="1"></el-option>
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
</el-select>
@@ -208,35 +212,35 @@
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" 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('hellow.topRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
</el-form-item>
</div></div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
+ <el-row style="margin-top: 30px;">
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" 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('hellow.rightRemove')" :required="true" style="width: 16vw;">
+ <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
<el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
</el-form-item>
</div></div>
@@ -360,7 +364,7 @@
<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">
- {{ currentRow.projectNumber }}
+ {{ currentRow.flowCardId }}
</el-form-item>
</div>
<el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -512,7 +516,7 @@
const tableDatax = ref([])
const cell = ref('')
const cella = ref('')
-const selectedProjectNo = ref('');
+const selectedProjectNo = ref('')
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -523,6 +527,9 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const pairTotal = ref()
+const productName = ref('')
+const customerName = ref('')
const flowCardId = ref('')
const freetwo = ref('#911005');
const dialogFormVisiblea = ref(false)
@@ -567,7 +574,7 @@
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
+ fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
try {
@@ -666,20 +673,20 @@
// 缂虹墖璇︽儏
const handleBindRack = (row) => {
currentPage2.value = 1;
- const { projectNumber, layer } = row;
- currentRow.projectNumber = row.projectNumber;
+ const { flowCardId } = row;
+ currentRow.flowCardId = row.flowCardId;
dialogFormVisibleb.value = true;
- fetchFlowBind(projectNumber, layer,currentPage2.value);
+ fetchFlowBind(flowCardId,currentPage2.value);
};
// 棰嗗彇浠诲姟
const handletake = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisiblec.value = true;
fetchmulan()
};
// 寮哄埗鍑虹墖
const handleout = (row) => {
- window.localStorage.setItem('flowCardId', row.projectNumber)
+ window.localStorage.setItem('flowCardId', row.flowCardId)
dialogFormVisibled.value = true;
fetchmulan()
};
@@ -695,11 +702,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
function tableRowClassName({ row }) {
@@ -724,11 +730,10 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatab.value = response.data;
+ pairTotal.value = response.data[0].pairTotalCount;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟
@@ -741,10 +746,8 @@
tableDatax.value = response.data;
titleformulaName.value = response.data.map(item => ({ formulaId: item.id, formulaName: item.formulaName }));
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const handleFormulaChange = (value) => {
@@ -758,6 +761,30 @@
};
// 涓┖閰嶆柟娣诲姞
const handleConfirm = async () => {
+ if (!formulaName.value) {
+ ElMessage.error(t('hellow.formulaNamea'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
+ if (!bottomRemove.value) {
+ ElMessage.error(t('hellow.bottomRemovea'))
+ return
+ }
+ if (!topRemove.value) {
+ ElMessage.error(t('hellow.topRemovea'))
+ return
+ }
+ if (!leftRemove.value) {
+ ElMessage.error(t('hellow.leftRemovea'))
+ return
+ }
+ if (!rightRemove.value) {
+ ElMessage.error(t('hellow.rightRemovea'))
+ return
+ }
try {
const response = await request.post('/hollowGlass/hollowFormulaDetails/saveFormulaDetails',{
formulaName: formulaName.value,
@@ -779,10 +806,8 @@
topRemove.value = '';
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const removalMethodMapa = {
@@ -791,6 +816,30 @@
};
// 涓┖閰嶆柟淇敼
const handledit = async () => {
+ if (!formulaName.value) {
+ ElMessage.error(t('hellow.formulaNamea'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
+ if (!bottomRemove.value) {
+ ElMessage.error(t('hellow.bottomRemovea'))
+ return
+ }
+ if (!topRemove.value) {
+ ElMessage.error(t('hellow.topRemovea'))
+ return
+ }
+ if (!leftRemove.value) {
+ ElMessage.error(t('hellow.leftRemovea'))
+ return
+ }
+ if (!rightRemove.value) {
+ ElMessage.error(t('hellow.rightRemovea'))
+ return
+ }
try {
const response = await request.post('/hollowGlass/hollowFormulaDetails/updateFormulaDetails',{
formulaName: formulaName.value,
@@ -805,10 +854,8 @@
adda.value = false
fetchmulan()
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 涓┖閰嶆柟鍒犻櫎
@@ -830,7 +877,6 @@
ElMessage.success(response.message);
fetchmulan()
} else {
- ElMessage.error(response.msg);
}
}
} catch (error) {
@@ -848,14 +894,16 @@
}));
titleSelectJson.value.processType = processTypes;
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
// 棰勮
const handleup = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/appointHollowTaskDetails?cell="+ 931 + "&flowCardId=" + selectedProjectNo.value;
window.localStorage.setItem('flowCardId', selectedProjectNo.value)
@@ -867,10 +915,8 @@
selectedProjectNo.value = ''
closeWebSocket(socket);
} else {
- ElMessage.error('Failed to fetch data');
}
} catch (error) {
- ElMessage.error('Error fetching data');
}
};
const parseData = (rawData) => {
@@ -885,15 +931,14 @@
};
});
};
-const fetchFlowBind = async (flowCardId, layer, page) => {
+const fetchFlowBind = async (flowCardId, page) => {
try {
- var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
+ var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
const response = await request.post(url)
if (response.code == 200) {
tableDatac.value = response.data[page];
ElMessage.success(response.message);
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -909,7 +954,6 @@
ElMessage.success(response.message);
blinda.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -931,7 +975,6 @@
ElMessage.success(response.message);
blindc.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -953,7 +996,6 @@
ElMessage.success(response.message);
blindd.value = false;
} else {
- ElMessage.error(response.message);
}
} else {
ElMessage({
@@ -968,6 +1010,14 @@
const finisha = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/receiveTask?cell="+ 931 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -978,7 +1028,6 @@
formulaName.value = '';
totalPairQuantity.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -987,6 +1036,14 @@
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
let id = window.localStorage.getItem('id')
+ if (!totalPairQuantity.value) {
+ ElMessage.error(t('hellow.cpairQuantity'))
+ return
+ }
+ if (!selectedFormulaName.value) {
+ ElMessage.error(t('hellow.phollowformula'))
+ return
+ }
try {
var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+ 931 + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value+ "&formulaId=" + id;
const response = await request.post(url)
@@ -996,7 +1053,6 @@
cella.value = '';
totalPairQuantitya.value = '';
} else {
- ElMessage.error(response.message);
}
} catch (error) {
}
@@ -1007,11 +1063,11 @@
});
</script>
<style scoped>
-#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
-#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
+#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
+#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
text-align: center;
- margin-top: -15px;
+ margin-top: -5px;
}
#dotClass {
display: flex;
--
Gitblit v1.8.0