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/PurchaseReturn/purchaseReturn.vue | 107 +++++++++++------------------------------------------
1 files changed, 23 insertions(+), 84 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 0b01439..673c709 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -11,7 +11,6 @@
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)
@@ -53,42 +52,6 @@
} catch (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 }),
- };
- 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 = () => {
- window.print();
-};
// 鏂规硶瀹氫箟
function handlePageChange(page: number) {
currentPage.value = page;
@@ -533,16 +496,20 @@
return '#911005';
case 9:
return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
function getRectColor2(state) {
switch (state) {
- case 2:
+ case 2:
return 'lightblue';
case 8:
return '#911005';
case 9:
return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
function getRectColora(state) {
@@ -552,11 +519,13 @@
case 1:
return '#95d475';
case -1:
- return '#CDAF95';
+ return '#99BBFF';
case 8:
return '#911005';
case 9:
return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
function getRectColorb(state) {
@@ -569,6 +538,8 @@
return '#911005';
case 9:
return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
function showDialog1(rect) {
@@ -692,7 +663,7 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -712,7 +683,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -733,7 +704,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -754,7 +725,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -775,7 +746,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 1,
+ state: 1,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -796,7 +767,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -817,7 +788,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -838,7 +809,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -858,7 +829,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -878,7 +849,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 3,
+ state: 3,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -901,20 +872,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">
<!-- 杩涚倝涓彸 -->
@@ -1042,34 +1009,6 @@
</div>
</el-scrollbar>
</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>
<!-- 杩涚倝涓� -->
--
Gitblit v1.8.0