From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 152 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 128 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index e6c9858..d875780 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -49,7 +49,7 @@
tableData.value = response.data
console.log(response.data);
} else {
- ElMessage.warning(res.msg)
+ ElMessage.warning(response.message)
}
} catch (error) {
// console.error('Error fetching rects :', error);
@@ -82,7 +82,10 @@
dialogVisible.value = true;
tableData.value = response.data;
await nextTick();
- window.print();
+ // 寤舵椂 2 绉掑悗鎵撳嵃锛堟椂闂村彲浠ユ牴鎹渶瑕佽皟鏁达級
+ setTimeout(() => {
+ window.print();
+ }, 2000);
} else {
ElMessage.error(response.message);
}
@@ -149,13 +152,15 @@
adjustedRects2.value = []
}
// 杩涚倝涓乏
- if (data.intoGlass && data.intoGlass.length > 0) {
- const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
- const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
- const newRects = data.intoGlass[0].map(rect => {
- const scaleFactor = 810.89/5087;
- const scaleFactorY = 430/2800;
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
+ if (data.intoGlass && data.intoGlass.length > 0) {
+ console.log(data.intoGlass);
+
+ const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
+ const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
+ const newRects = data.intoGlass[0].map(rect => {
+ const scaleFactor = 810.89/5087;
+ const scaleFactorY = 430/2800;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
@@ -196,7 +201,7 @@
return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
}).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
}
- else if (data.overGlass == null) {
+ else {
adjustedRects1.value = []
}
if (data.waitingGlass && data.waitingGlass.length > 0) {
@@ -322,7 +327,21 @@
rect.state = 9;
}
});
-}
+}
+function updateoutColorsc() {
+ adjustedRects1.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 9;
+ }
+ });
+}
+function updateoutColorsd() {
+ adjustedRects2.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 9;
+ }
+ });
+}
function updateonColorsa() {
adjustedRectsa.value.forEach(rect => {
if (rect.glassId === glassId) {
@@ -364,8 +383,28 @@
rect.state = 8;
}
});
-}
-function getRectColora(state) {
+}
+function getRectColor1(state) {
+ switch (state) {
+ case 2:
+ return 'lightblue';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#4682B4';
+ }
+}
+function getRectColor2(state) {
+ switch (state) {
+ case 2:
+ return 'lightblue';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#4682B4';
+ }
+}
+function getRectColora(state) {
switch (state) {
case 0:
return '#7AC5CD';
@@ -405,6 +444,11 @@
} else if (currentRect.value.state !== 8) {
canSelectProject1.value = true;
}
+ if (currentRect.value.state == 9) {
+ cantakea.value = false;
+ } else if (currentRect.value.state !== 9) {
+ cantakea.value = true;
+ }
}
function showDialog2(rect) {
const index = adjustedRects2.value.findIndex(r => r.glassId === rect.glassId);
@@ -419,6 +463,11 @@
canSelectProject2.value = false;
} else if (currentRect.value.state !== 8) {
canSelectProject2.value = true;
+ }
+ if (currentRect.value.state == 9) {
+ cantakea.value = false;
+ } else if (currentRect.value.state !== 9) {
+ cantakea.value = true;
}
}
function showDialoga(rect) {
@@ -610,6 +659,52 @@
console.error(error);
}
}
+// 杩涚倝涓汉宸ユ嬁璧�
+const takeoutc = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 9,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ 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', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 9,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ blind2.value = false;
+ updateoutColorsd();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
// 宸插嚭鐐夌牬鎹�
const handleDamageb = async () => {
try {
@@ -692,7 +787,7 @@
<el-button id="searchButton" type="info" @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.print') }}</el-button>
<div v-if="dialogFormVisible" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
-<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
+<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects1.length > 0">
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
@@ -708,8 +803,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
- >
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
<div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
@@ -720,7 +814,7 @@
</el-scrollbar>
</div>
</div>
-<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
+<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects2.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
@@ -736,8 +830,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
- >
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }">
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
<div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
@@ -807,7 +900,7 @@
</div>
<div v-if="dialogFormVisiblec">
<!-- 鎵撳嵃 -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <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>
@@ -817,15 +910,18 @@
<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="350"
+ 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="workingProcedure" :label="$t('processCard.awayprocess')" align="center"/>
- <el-table-column prop="deviceName" :label="$t('processCard.awayequipment')" align="center"/>
- <el-table-column prop="teamsGroupsName" :label="$t('processCard.awayteam')" 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>
@@ -836,11 +932,19 @@
<el-button :disabled="!canSelectProject1" type="warning" plain :icon="Delete" @click="handleDamage1" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
+ <el-button :disabled="!cantakea" type="danger" plain @click="takeoutc" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ <el-icon class="el-icon--right"><Upload /></el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
</el-dialog>
<el-dialog v-model="blind2" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose2">
<el-button :disabled="!canSelectProject2" type="warning" plain :icon="Delete" @click="handleDamage2" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
+ <el-button :disabled="!cantakea" type="danger" plain @click="takeoutd" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ <el-icon class="el-icon--right"><Upload /></el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
</el-dialog>
<!-- 杩涚倝鍓� -->
<el-dialog v-model="blinda" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClosea">
--
Gitblit v1.8.0