From add613567296124356cf870be07d7e105f48afb6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 26 二月 2025 14:45:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 168 +++++++++++---------------------------------------------
1 files changed, 33 insertions(+), 135 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index bc70c0a..344292b 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -6,13 +6,11 @@
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
import {useRouter} from 'vue-router'
-
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const dialogFormVisible = ref(false)
const dialogFormVisiblea = ref(true)
const dialogFormVisibleb = ref(false)
-const dialogFormVisiblec = ref(false)
const blind1 = ref(false)
const blind2 = ref(false)
const blinda = ref(false)
@@ -52,54 +50,11 @@
ElMessage.warning(response.message)
}
} catch (error) {
- // console.error('Error fetching rects :', error);
}
});
-const selectReportData = async () => {
- let postData = {
- type: 9,
- workingProcedure: '閽㈠寲',
- ...(engineerId.value !== '' && { engineerId: engineerId.value }),
- };
- const response = await request.post("/loadGlass/damage/selectDamagePrint", postData)
- if (response.code === 200) {
- tableData.value = response.data;
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.message);
- }
-};
-const printing = async () => {
- let postData = {
- type: 9,
- workingProcedure: '閽㈠寲',
- ...(engineerId.value !== '' && { engineerId: engineerId.value }),
- };
- console.log(engineerId.value);
-
- const response = await request.post("/loadGlass/damage/selectDamagePrintDetails", postData)
- if (response.code === 200) {
- dialogVisible.value = true;
- tableData.value = response.data;
- await nextTick();
- // 寤舵椂 2 绉掑悗鎵撳嵃锛堟椂闂村彲浠ユ牴鎹渶瑕佽皟鏁达級
- setTimeout(() => {
- window.print();
- }, 2000);
-} else {
- ElMessage.error(response.message);
- }
-};
-const printTable = () => {
- // 杩欓噷鍙互娣诲姞涓�浜汣SS鏍峰紡鏉ヤ紭鍖栨墦鍗版晥鏋�
- // 渚嬪锛屽彲浠ユ坊鍔犱竴涓殣钘忕殑鎵撳嵃鏍峰紡琛�
- window.print();
-};
// 鏂规硶瀹氫箟
function handlePageChange(page: number) {
currentPage.value = page;
- console.log(page);
-
}
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
@@ -400,7 +355,7 @@
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ return oldRect;
}).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
}
// if (data.outGlass && data.outGlass.length > 0) {
@@ -708,12 +663,10 @@
blind1.value = false;
updateRectColors1();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -730,12 +683,10 @@
blind2.value = false;
updateRectColors2();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -753,12 +704,10 @@
blinda.value = false;
updateRectColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -776,12 +725,10 @@
blinda.value = false;
updateoutColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -799,12 +746,10 @@
blinda.value = false;
updateonColorsa();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -822,16 +767,14 @@
blind1.value = false;
updateoutColorsc();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
-// 杩涚倝zhong浜哄伐鎷胯蛋
+// 杩涚倝涓汉宸ユ嬁璧�
const takeoutd = async () => {
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
@@ -845,12 +788,10 @@
blind2.value = false;
updateoutColorsd();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
console.error(error);
}
}
@@ -868,13 +809,10 @@
blindb.value = false;
updateRectColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
// 宸插嚭鐐変汉宸ユ嬁璧�
@@ -891,13 +829,10 @@
blindb.value = false;
updateoutColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
// 宸插嚭鐐夋斁鍥�
@@ -914,13 +849,10 @@
blindb.value = false;
updateonColorsb();
} else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
}
catch (error) {
- // 澶勭悊閿欒
- // console.error(error);
}
}
onBeforeUnmount(() => {
@@ -932,20 +864,16 @@
<div style="height: 500px;">
<div style="margin-top: 10px;">
<el-button style="margin-left: 15px;" id="searchButton" type="primary"
- @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;dialogFormVisiblec = false;">
+ @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;">
{{ $t('processCard.beforefurnace') }}
</el-button>
<el-button style="margin-left: 15px;" id="searchButton" type="primary"
- @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;dialogFormVisiblec = false;">
+ @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">
{{ $t('processCard.intofurnace') }}
</el-button>
<el-button id="searchButton" type="success"
- @click="dialogFormVisibleb = true;dialogFormVisible = false;dialogFormVisiblea = false;dialogFormVisiblec = false;">
+ @click="dialogFormVisibleb = true;dialogFormVisible = false;dialogFormVisiblea = false;">
{{ $t('processCard.outfurnace') }}
- </el-button>
- <el-button id="searchButton" type="info"
- @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">
- {{ $t('processCard.print') }}
</el-button>
<div v-if="dialogFormVisible">
<!-- 杩涚倝涓彸 -->
@@ -1075,35 +1003,6 @@
</div>
</el-card>
</div>
-<div v-if="dialogFormVisiblec">
- <!-- 鎵撳嵃 -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
- <div style="display: flex; flex-direction: row; align-items: center; margin-top: 5px;margin-left: 10px;">
- <el-input :placeholder="$t('processCard.projectnumber')" v-model="engineerId" autocomplete="off" style="width: 300px;"/>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('processCard.inquire') }}</el-button>
- <el-button type="info" style="margin-left: 10px;" @click="printing()">{{ $t('processCard.printing') }}</el-button>
- </div>
-
- <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
- <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table
- height="600"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
- >
- <el-table-column prop="engineerId" :label="$t('processCard.project')" width="200" align="center"/>
- <el-table-column prop="temperingLayoutId" :label="$t('processCard.layoutID')" align="center"/>
- <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center"/>
- <el-table-column prop="glassId" :label="$t('processCard.glassID')" align="center"/>
- <el-table-column prop="width" :label="$t('processCard.width')" align="center"/>
- <el-table-column prop="height" :label="$t('processCard.height')" align="center"/>
- <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center"/>
- </el-table>
- </div>
- </el-card>
- </el-card>
-</div>
<!-- 杩涚倝涓� -->
<el-dialog v-model="blind1" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose1">
<el-button :disabled="!canSelectProject1" type="warning" plain :icon="Delete" @click="handleDamage1" style="width: 150px;margin-left: 10px;">
@@ -1166,8 +1065,7 @@
<el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="52"/>
<el-table-column prop="engineerId" :label="$t('processCard.project')" align="center" width="110"/>
<el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="52"/>
- <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center"
- width="52"/>
+ <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="52"/>
<el-table-column prop="width" :label="$t('processCard.width')" align="center" width="80"/>
<el-table-column prop="height" :label="$t('processCard.height')" align="center" width="80"/>
<el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="52"/>
@@ -1192,42 +1090,42 @@
/* display:flex; */
text-align: center;
display: inline-block;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
margin-left: 20px;
}
#box{
border: 1px solid black;
background-color: #337ecc;
display:flex;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
}
#home-card {
- width: 100%;
- overflow: hidden;
- padding: 10px 0px;
+ width: 100%;
+ overflow: hidden;
+ padding: 10px 0px;
+ display: flex;
+ flex-wrap: wrap;
+ #home-item {
+ border-style: solid;
+ border-width: 1px;
+ border-color: #E4E4E4;
+ width: calc(34% - 20px);
+ padding: 20px 0px 20px 20px;
+ margin-right: 10px;
+ margin-bottom: 10px;
display: flex;
- flex-wrap: wrap;
- #home-item {
- border-style: solid;
- border-width: 1px;
- border-color: #E4E4E4;
- width: calc(34% - 20px);
- padding: 20px 0px 20px 20px;
- margin-right: 10px;
- margin-bottom: 10px;
- display: flex;
- justify-content: center;
- /* align-items: center; */
- background: #fff;
- #home-img {
- display: inline-block;
- width: 160px;
- height: 60px;
- margin: 0;
- padding: 0;
- }
+ justify-content: center;
+ /* align-items: center; */
+ background: #fff;
+ #home-img {
+ display: inline-block;
+ width: 160px;
+ height: 60px;
+ margin: 0;
+ padding: 0;
+ }
#home-right {
display: flex;
flex-direction: column;
--
Gitblit v1.8.0