From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 352 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 265 insertions(+), 87 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 49db7d7..c917ca0 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)
@@ -17,14 +16,14 @@
const flakea = ref(false)
// const value = ref('')
import request from "@/utils/request"
-
+const ida = ref(null);
import { ref, onMounted } from "vue";
// import http from "@/http/index";
let ruleForm = ref({
- // engineeringId: '',
+ projectNo: '',
workstationId: '',
- patternHeigth: '',
+ patternHeight: '',
patternWidth: '',
filmsId: '',
patternThickness: '',
@@ -33,7 +32,7 @@
})
const tableDataa = ref([])
-
+
const tableData = reactive([]);
// let filterData = ref({
// damageDetails: {
@@ -61,27 +60,52 @@
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-request.get("/loadGlass/LoadGlass/list").then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- tableDataa.value = res.data
- window.localStorage.setItem('patternWidth', res.data.patternWidth)
- window.localStorage.setItem('workstationId', res.data.workstationId)
- let workstationIda = window.localStorage.getItem('workstationId')
- let patternWidth = window.localStorage.getItem('patternWidth')
- if (patternWidth !== '' || workstationIda == '1') {
- flake.value = true
- } else if (patternWidth !== '' || workstationIda == '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: [],
+
+})
+const titleSelectJsona = ref({
+ processTypea: [],
})
// const getBasicData = ref({
@@ -108,6 +132,7 @@
};
// 鍝嶅簲寮忔暟鎹�
const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
+const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
// 璋冪敤鎺ュ彛鑾峰彇閫夐」鏁版嵁鐨勫嚱鏁�
@@ -121,14 +146,8 @@
if (response.code == 200) {
titleSelectJson.value.processType = response.data;
-
- // titleSelectJson.value.processType = response.data(item => ({
- // // options.value = response.data.data.map(item => ({
- // value: item.projectNo,
- // // label: item.id // 鍋囪鍚庣杩斿洖鐨勬暟鎹腑鏈� 瀛楁浣滀负鏄剧ず鏍囩
- // }));
console.log(response.data);
-
+
} else {
ElMessage.warning(response.data);
}
@@ -136,7 +155,22 @@
console.error('Error fetching options:', error);
}
};
-
+ // 寮�濮嬩笂鐗囦笅鎷夐��
+const fetchOptionsa = async (queryString: string) => {
+ try {
+ // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
+ const response = await request.get('/loadGlass/engineering/engineering/selectTask');
+ if (response.code == 200) {
+ titleSelectJsona.value.processTypea = response.data;
+ console.log(response.data);
+
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
// 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
const handleInputChange = async (value: string) => {
if (value) {
@@ -145,13 +179,23 @@
options.value = []; // 娓呯┖閫夐」鍒楄〃
}
};
-
+ // 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
+const handleInputChangea = async (value: string) => {
+ if (value) {
+ await fetchOptionsa(value);
+ } else {
+ options.value = []; // 娓呯┖閫夐」鍒楄〃
+ }
+};
// 鍒濆鍖栧姞杞芥暟鎹紙濡傛灉闇�瑕侊級
onMounted(() => {
// 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
fetchOptions('');
});
-
+onMounted(() => {
+ // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
+ fetchOptionsa('');
+});
// const billall = () => {
// request.post("/loadGlass/optimizeProject/listByState", requestData)
// .then((res: any) => {
@@ -164,32 +208,43 @@
// }
const user = ref('');
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
-let titleUploadData = ref({
- projectNo:'',
-})
-// const engineeringId = ref('');
+// let titleUploadData = ref({
+// projectNo:'',
+// })
+const projectNo = ref('');
const workstationId = ref('');
-const patternHeigth = 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,
- patternHeigth: patternHeigth.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;
window.localStorage.setItem('workstationId', response.data.workstationId)
let workstationId = window.localStorage.getItem('workstationId')
@@ -202,17 +257,59 @@
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
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;
+ 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 {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
workstationId: workstationId.value,
- patternHeigth: 0,
+ patternHeight: 0,
patternWidth: 0,
filmsId: "",
patternThickness: 0,
@@ -239,30 +336,20 @@
console.error(error);
}
};
-// 寮�濮嬩笂鐗�
-const handle = async () => {
+// 閫夋嫨宸ョ▼纭
+const handleup = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
-console.log(engineeringId);
-if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- engineeringId: engineeringId,
- state: 1,
+ const response = await request.post('/loadGlass/up-patten-usage/saveUpPattenUsage', {
+ engineerId: selectedProjectNo.value,
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- blind.value = false;
+ window.location.reload()
+ dialogFormVisible.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
- }
- }
- else {
- ElMessage({
- type: 'info',
- message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
- })
}
}
catch (error) {
@@ -270,6 +357,58 @@
console.error(error);
}
}
+// 寮�濮嬩笂鐗�
+const handle = async () => {
+ try {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ engineerId: selectedProjectNoa.value,
+ state: 1,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ window.location.reload()
+ blind.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ 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 {
@@ -283,6 +422,7 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ window.location.reload()
blinda.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -301,7 +441,7 @@
console.error(error);
}
}
-// 寮�濮嬩笂鐗�
+// 鍋滄浠诲姟
const handleb = async () => {
try {
let engineeringId = window.localStorage.getItem('engineeringId')
@@ -314,6 +454,7 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ window.location.reload()
blindb.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -333,7 +474,24 @@
}
}
onMounted(fetchTableData);
-
+function getStatusText(state: number) {
+ switch (state) {
+ case 0:
+ return '绛夊緟涓�';
+ case 1:
+ case 2:
+ return '涓婄墖涓�';
+ case 100:
+ return '宸插畬鎴�';
+ default:
+ return '鏈煡鐘舵��';
+ }
+}
+
+function getStatusType(state: number) {
+ // 杩欓噷鍋囪鍙湁100鏃剁被鍨嬩笉鏄痵uccess锛屽叾浠栭兘鏄痵uccess
+ return state === 100 ? 'info' : 'success'; // 鏍规嵁闇�瑕佽皟鏁寸被鍨�
+}
// const open = () => {
// ElMessageBox.confirm(
// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -375,12 +533,7 @@
blindb.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
-// 娣诲姞
-const handleBindRack = (row) => {
- workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
-
- add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-};
+
// 鍒犻櫎
const handleBindRacka = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
@@ -462,15 +615,39 @@
min-width="80"
prop="state"
>
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.state==1?"灏辩华":"鏈氨缁�" }}</el-tag>
- </template>
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.state)">
+ {{ getStatusText(scope.row.state) }}
+ </el-tag>
+ </template>
+ <!-- <template #default="scope">
+ <el-tag type="success" >{{ scope.row.state==0?"绛夊緟涓�":"涓婄墖涓�" }}</el-tag>
+ </template> -->
</el-table-column>
</el-table>
</div>
</el-card>
- <el-dialog v-model="blind" top="30vh" width="25%" title="鏄惁寮�濮嬩笂鐗�?" >
+ <el-dialog v-model="blind" top="24vh" width="30%" title="鏄惁寮�濮嬩笂鐗囷紵" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item label="宸ョ▼鍙凤細" :required="true">
+ <el-select
+ v-model="selectedProjectNoa"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 220px"
+ @input="handleInputChangea"
+ >
+ <el-option
+ v-for="item in titleSelectJsona['processTypea']"
+ :key="item.id"
+ :label="item.engineerId"
+ :value="item.engineerId"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handle">
@@ -480,6 +657,16 @@
</div>
</template>
</el-dialog>
+ <!-- <el-dialog v-model="blind" top="30vh" width="25%" title="鏄惁寮�濮嬩笂鐗�?" >
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handle">
+ 纭
+ </el-button>
+ <el-button @click="blind = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
<el-dialog v-model="blinda" top="30vh" width="25%" title="鏄惁鏆傚仠?" >
<template #footer>
<div id="dialog-footer">
@@ -510,7 +697,7 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<el-table-column prop="patternWidth" align="center" label="瀹�" min-width="80" />
- <el-table-column prop="patternHeigth" 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">
@@ -531,7 +718,7 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input v-model="patternHeigth" autocomplete="off" />
+ <el-input v-model="patternHeight" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
@@ -611,20 +798,11 @@
:value="item.projectNo"
/>
</el-select>
- <!-- <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select> -->
</el-form-item>
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
+ <el-button type="primary" @click="handleup">
纭
</el-button>
<el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
--
Gitblit v1.8.0