From 2f1c9c7b482652311139920dd315bb7b0e1cb1bf Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 17 六月 2025 14:16:46 +0800
Subject: [PATCH] 中空创建任务界面增加查询和统计数据
---
UI-Project/src/views/hollow/hollowequipmenthree.vue | 10 +++++++++-
UI-Project/src/lang/en.js | 3 +++
UI-Project/src/lang/py.js | 3 +++
UI-Project/src/lang/zh.js | 3 +++
UI-Project/src/utils/constants.js | 2 +-
UI-Project/src/views/hollow/hollowequipment.vue | 12 +++++++++++-
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 12 ++++++++++--
UI-Project/src/lang/kr.js | 3 +++
8 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 9f7dd6b..8049bb7 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -573,6 +573,7 @@
detailID: 'Detail ID',
building: 'Building No',
serialnumber: 'Order serial number',
+ inproductname: 'Please enter a product name',
productname: 'Product name',
serial: 'Process validation number',
slicemarker: 'Frame marker (position)',
@@ -598,6 +599,7 @@
orderId: 'Order ID',
order: 'Order details',
customerName: 'The name of the customer',
+ incustomerName: 'Please enter the name of the customer',
project: 'The name of the project',
are: 'are',
quantity: 'quantity',
@@ -940,6 +942,7 @@
cardnumbera: 'Process card number锛�',
layernumber: 'Layer number',
totalnumber: 'Total number of films',
+ pairsnumbertotal: 'The total number of pairs锛�',
pairsnumber: 'Matched quantity',
missingnumber: 'Number of missing pieces',
damagenumber: 'A quantity broken.',
diff --git a/UI-Project/src/lang/kr.js b/UI-Project/src/lang/kr.js
index 02b5f8f..3cbdb3a 100644
--- a/UI-Project/src/lang/kr.js
+++ b/UI-Project/src/lang/kr.js
@@ -575,6 +575,7 @@
building: '瓯措 氩堩樃',
serialnumber: '欤茧 氩堩樃',
productname: '鞝滍拡 鞚措',
+ inproductname: '鞝滍拡 鞚措鞚� 鞛呺牓頃橃嫮鞁滌槫.',
serial: '頂勲靹胳姢 頇曥澑 氩堩樃',
slicemarker: '霠堨澊鞏� 氩堩樃',
numberpatches: '韺箻 靾�',
@@ -599,6 +600,7 @@
orderId: '欤茧 ID',
order: '欤茧 靸侅劯 鞝曤炒',
customerName: '瓿犼皾 鞚措',
+ incustomerName: '瓿犼皾鞚� 鞚措鞚� 鞛呺牓頃橃嫮鞁滌槫.',
project: '頂勲鞝濏姼 鞚措',
are: '氅挫爜',
quantity: '靾橂焿',
@@ -944,6 +946,7 @@
layernumber: '霠堨澊鞏� 氩堩樃',
totalnumber: '齑� 韼胳垬',
pairsnumber: '歆濎旮� 靾橂焿',
+ pairsnumbertotal: '齑� 鞂� 靾橃瀰雼堧嫟锛�',
missingnumber: '瓴绊幐 靾橂焿',
damagenumber: '韺岇啇 靾橂焿',
operate: '鞛戩梾',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 4081cd4..608fb95 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -524,6 +524,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
numberpatches: '琛ョ墖鏁伴噺',
@@ -548,6 +549,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '袣芯谢懈褔械褋褌胁芯',
@@ -863,6 +865,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 4d290ea..d473471 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -577,6 +577,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '灞傚彿',
numberpatches: '琛ョ墖鏁伴噺',
@@ -601,6 +602,7 @@
orderId: '璁㈠崟ID',
order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
+ incustomerName: '璇疯緭鍏ュ鎴峰悕绉�',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
quantity: '鏁伴噺',
@@ -946,6 +948,7 @@
layernumber: '灞傚彿',
totalnumber: '鎬荤墖鏁�',
pairsnumber: '宸查厤瀵规暟閲�',
+ pairsnumbertotal: '宸查厤瀵规�绘暟閲忥細',
missingnumber: '缂虹墖鏁伴噺',
damagenumber: '鐮存崯鏁伴噺',
operate: '鎿嶄綔',
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index b12e6d0..66136ca 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,7 +1,7 @@
// export const WebSocketHost = "192.168.2.100";
// export const WebSocketHost = "192.168.0.39";
export const WebSocketHost = "10.153.19.150";
-// export const WebSocketHost = "10.153.19.207";
+// export const WebSocketHost = "10.153.19.218";
// export const WebSocketHost = "10.153.19.162";
// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index a679abc..0c80ceb 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -92,10 +92,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;"
@@ -114,8 +117,8 @@
<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>
@@ -992,6 +995,8 @@
const topRemove = ref('')
const filmsId = ref('')
const thickness = ref('')
+const productName = ref('')
+const customerName = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1026,6 +1031,7 @@
const currentRow = reactive({});
const formattedProcessType = ref([]);
const selectedFormulaName = ref('');
+const pairTotal = ref();
let selectedFormulaId = ref(null);
const formulaNameid = ref({ id: null });
const titleformulaName = ref({ formulaName: [] ,formulaId: []});
@@ -1377,6 +1383,7 @@
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');
}
@@ -1401,11 +1408,14 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ productName: productName.value,
+ customerName: customerName.value,
thickness: thickness.value
});
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');
}
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index 1f2454a..d6511c4 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.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,8 +91,8 @@
<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>
@@ -525,6 +528,9 @@
const topRemove = ref('')
const filmsId = ref('')
const flowCardId = ref('')
+const pairTotal = ref()
+const productName = ref('')
+const customerName = ref('')
const freethree = ref('#911005');
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
@@ -694,6 +700,7 @@
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');
}
@@ -723,6 +730,7 @@
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');
}
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index e7dca83..0618d55 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,8 +91,8 @@
<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>
@@ -513,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('')
@@ -524,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)
@@ -696,6 +702,7 @@
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');
}
@@ -725,6 +732,7 @@
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');
}
--
Gitblit v1.8.0