From 23a04f3d4ddc6d1144f30c6d3e71f8a2ea6edf49 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 22 五月 2024 15:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 218 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 139 insertions(+), 79 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 3c5e868..bbd6c52 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -5,7 +5,6 @@
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
const blind = ref(false)
@@ -15,9 +14,18 @@
const adda = ref(false)
const flake = ref(false)
const flakea = ref(false)
-// const value = ref('')
+// const patternHeight = ref('');
+// const patternWidth = ref('');
+// const filmsId = ref('');
+// const patternThickness = ref('');
+// const number = ref('');
+// patternHeight.value = '';
+ // patternWidth.value = '';
+ // filmsId.value = '';
+ // patternThickness.value = '';
+ // number.value = '';
import request from "@/utils/request"
-
+const ida = ref(null);
import { ref, onMounted } from "vue";
// import http from "@/http/index";
@@ -33,7 +41,7 @@
})
const tableDataa = ref([])
-
+
const tableData = reactive([]);
// let filterData = ref({
// damageDetails: {
@@ -58,29 +66,48 @@
}
} catch (error) {
// 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
- ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+ // ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-request.get("/loadGlass/LoadGlass/list").then((res) => {
- window.localStorage.setItem('patternWidth', res.data.patternWidth)
- window.localStorage.setItem('workstationId', res.data.workstationId)
- if (res.code == 200) {
- console.log(res.data);
- tableDataa.value = res.data
- console.log(res.data.patternWidth);
-
- let workstationId = window.localStorage.getItem('workstationId')
- let patternWidth = window.localStorage.getItem('patternWidth')
- if (patternWidth !== '' || workstationId == '1') {
- flake.value = true
- } else if (patternWidth !== '' || workstationId == '2') {
- flakea.value = true
+ request.get("/loadGlass/LoadGlass/list").then((res) => {
+ if (res.code === 200) {
+ console.log(res.data);
+ tableDataa.value = res.data;
+
+ if (tableDataa.value.length === 2) {
+ if (tableDataa.value[0].patternWidth > 0) {
+ flake.value = true;
+ }
+
+ if (tableDataa.value[1].patternWidth > 0) {
+ flakea.value = true;
}
- } else {
- ElMessage.warning(res.msg)
- // router.push("/login")
- }
- });
+ }
+ } else {
+ ElMessage.warning(res.msg);
+ // router.push("/login");
+ }
+ });
+// request.get("/loadGlass/LoadGlass/list").then((res) => {
+// window.localStorage.setItem('patternWidth', res.data.patternWidth)
+// window.localStorage.setItem('workstationId', res.data.workstationId)
+// if (res.code == 200) {
+// console.log(res.data);
+// tableDataa.value = res.data
+// console.log(res.data.patternWidth);
+
+// let workstationId = window.localStorage.getItem('workstationId')
+// let patternWidth = window.localStorage.getItem('patternWidth')
+// if (patternWidth !== '' || workstationId == '1') {
+// flake.value = true
+// } else if (patternWidth !== '' || workstationId == '2') {
+// flakea.value = true
+// }
+// } else {
+// ElMessage.warning(res.msg)
+// // router.push("/login")
+// }
+// });
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
@@ -129,7 +156,7 @@
if (response.code == 200) {
titleSelectJson.value.processType = response.data;
console.log(response.data);
-
+
} else {
ElMessage.warning(response.data);
}
@@ -145,7 +172,7 @@
if (response.code == 200) {
titleSelectJsona.value.processTypea = response.data;
console.log(response.data);
-
+
} else {
ElMessage.warning(response.data);
}
@@ -195,14 +222,25 @@
// })
const projectNo = ref('');
const workstationId = ref('');
+const id = ref('');
const patternHeight = ref('');
const patternWidth = ref('');
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
// 娣诲姞
+const handleBindRack = (row) => {
+ workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
+ ida.value = row.id;
+ console.log(ida.value);
+ add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+// 娣诲姞
const handleConfirm = async () => {
- try {
+ console.log(ida.value);
+ // console.log('id.value:', id.value);
+ if ((ida.value === 2 || ida.value === 4) && (parseInt(patternHeight.value, 10) >= 2700 )) {
+ try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
id: workstationId.value,
workstationId: workstationId.value,
@@ -212,12 +250,17 @@
patternThickness: patternThickness.value,
number: number.value
});
-
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- window.location.reload()
+ // window.location.reload()
add.value = false;
+ tableDataa.value = response.data;
+ // patternHeight = '';
+ // patternWidth.value = '';
+ // filmsId.value = '';
+ // patternThickness.value = '';
+ // number.value = '';
window.localStorage.setItem('workstationId', response.data.workstationId)
let workstationId = window.localStorage.getItem('workstationId')
if (workstationId == '1') {
@@ -229,11 +272,54 @@
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
- } catch (error) {
- // 澶勭悊閿欒
- console.error(error);
- }
-};
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else if( ida.value === 1 || ida.value === 3){
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
+ workstationId: workstationId.value,
+ patternHeight: patternHeight.value,
+ patternWidth: patternWidth.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ number: number.value
+ });
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ // window.location.reload()
+ add.value = false;
+ tableDataa.value = response.data;
+ window.localStorage.setItem('workstationId', response.data.workstationId)
+ let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId == '1') {
+ flake.value = true
+ } else if (workstationId == '2'){
+ flakea.value = true
+ }
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰閿欒
+ console.error(error);
+ alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
+ }
+ }
+ else {
+ ElMessage({
+ type: 'info',
+ message: '绗簩琛屽拰绗洓琛岀殑楂樺繀椤诲ぇ浜�2700鎵嶈兘淇濆瓨锛�',
+ })
+ }
+
+};
// 鍒犻櫎
const handleConfirma = async () => {
try {
@@ -250,6 +336,7 @@
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
adda.value = false;
+ tableDataa.value = response.data;
window.localStorage.setItem('workstationId', response.data.workstationId)
let workstationId = window.localStorage.getItem('workstationId')
if (workstationId == '1') {
@@ -275,8 +362,9 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- window.location.reload()
+ // window.location.reload()
dialogFormVisible.value = false;
+ selectedProjectNo.value = ''
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -297,8 +385,10 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- window.location.reload()
+ // window.location.reload()
blind.value = false;
+ tableData.splice(0, tableData.length, ...response.data);
+ selectedProjectNoa.value = ''
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -309,36 +399,6 @@
console.error(error);
}
}
-// const handle = async () => {
-// try {
-// let engineeringId = window.localStorage.getItem('engineeringId')
-// console.log(engineeringId);
-// if (engineeringId !== '') {
-// const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
-// engineeringId: engineerId.va,
-// state: 1,
-// })
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// blind.value = false;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// }
-// else {
-// ElMessage({
-// type: 'info',
-// message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
-// })
-// }
-// }
-// catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// }
// 鏆傚仠
const handlea = async () => {
try {
@@ -352,8 +412,11 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- window.location.reload()
+ // window.location.reload()
blinda.value = false;
+ // tableData.value = response.data
+ // tableData.value = [];
+ tableData.splice([]);
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -384,9 +447,10 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- window.location.reload()
+ // window.location.reload()
blindb.value = false;
- } else {
+ tableData.splice([]);
+
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -404,11 +468,12 @@
}
}
onMounted(fetchTableData);
-function getStatusText(state: number) {
- switch (state) {
+function getStatusText(state: number) {
+ switch (state) {
case 0:
return '绛夊緟涓�';
case 1:
+ return '涓婄墖涓�';
case 2:
return '涓婄墖涓�';
case 100:
@@ -463,12 +528,7 @@
blindb.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-// 娣诲姞
-const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
+
// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
@@ -632,7 +692,7 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<el-table-column prop="patternWidth" align="center" label="瀹�" min-width="80" />
- <el-table-column prop="patternHeight" align="center" label="闀�" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" label="楂�" min-width="80" />
<el-table-column prop="filmsId" align="center" label="鑶滅郴" min-width="80" />
<el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
@@ -652,7 +712,7 @@
<el-col :span="6">
<div id="dt" style="font-size: 15px;">
<div>
- <el-form-item label="闀匡細" :required="true" style="width: 14vw">
+ <el-form-item label="楂橈細" :required="true" style="width: 14vw">
<el-input v-model="patternHeight" autocomplete="off" />
</el-form-item></div></div>
</el-col>
--
Gitblit v1.8.0