From ad28331c1e3ed456b72765874b41b83b49dc279f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:44:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 174 +++++++++++++++++++++++++++-------------------------------
1 files changed, 81 insertions(+), 93 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index a8e0996..97d7b27 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -15,7 +15,23 @@
import { ref, onMounted } from "vue";
// import http from "@/http/index";
-const tableData = ref([])
+// const tableData = ref([])
+// let app = ref({
+// data(){
+// return {
+// enableState:'',
+// }
+// },
+// })
+// const tableData = ref({
+// workstationId:'',
+// patternWidth :'',
+// patternHeigth :'',
+// filmsId :'',
+// number :'',
+// patternThickness :'',
+// enableState:'',
+// })
// request.post(`/LoadGlass/list`).then((res) => {
// if (res.code == 200) {
// console.log(res.data);
@@ -33,22 +49,66 @@
// router.push("/login")
// }
// });
-onMounted(() => {
- request
- .get("/LoadGlass/list")
+
+ // request
+ // const requestData = {
+ // projectNo:"P24030805",
+ // state:0
+ // };
+
+
+ const requestData = {
+ // projectNo:"P24030805",
+ state:100
+ };
+
+ const tableData = reactive([]);
+
+// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
+const fetchTableData = async () => {
+ try {
+ // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
+ // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
+ const response = await request.get("/loadGlass/LoadGlass/list");
+
+ // 妫�鏌ュ搷搴旂姸鎬�
+ if (response.code === 200) {
+ // 鏇存柊琛ㄦ牸鏁版嵁
+ console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
+ tableData.splice(0, tableData.length, ...response.data);
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+ ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+ }
+};
+const user = ref('');
+const remoteMethod = () => {
+ request.post("/loadGlass/optimizeProject/listByState", requestData)
.then((res: any) => {
+ // if (res.code == 200) {
tableData.value = res.data;
+ // let self = this
+ // }
})
.catch((err: any) => {});
-});
-onMounted(() => {
- request
- .post("/LoadGlass/selectPriority")
- .then((res: any) => {
- tableData.value = res.data;
- })
- .catch((err: any) => {});
-});
+}
+
+
+onMounted(fetchTableData);
+
+
+// onMounted(() => {
+// request
+// .post("/loadGlass/LoadGlass/selectPriority")
+// .then((res: any) => {
+// tableData.value = res.data;
+// })
+// .catch((err: any) => {});
+// });
interface User {
id: string
name: string
@@ -83,59 +143,7 @@
}
}
}
-}
-
-const options = [
- {
- value: 'Option1',
- label: 'P202561456',
- },
- {
- value: 'Option2',
- label: 'P202561456',
- },
- {
- value: 'Option3',
- label: 'P202561456',
- },
- {
- value: 'Option4',
- label: 'P202561456',
- },
- {
- value: 'Option5',
- label: 'P202561456',
- },
-]
-// const tableData: User[] = [
-
-// {
-// id: 'P202561456',
-// long: '1005',
-// wide: '183.6',
-// thick: '1991',
-// },
-// {
-// id: 'P202561456',
-// long: '105',
-// wide: '183',
-// thick: '191',
-// }
-// ]
-const tableDataa = [
- {
- long: '1005',
- wide: '183.6',
- thick: '1991',
- station: '1'
- },
- {
- long: '105',
- wide: '183',
- thick: '191',
- station: '1'
- }
-]
+}
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -230,20 +238,6 @@
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" >鍋滄浠诲姟</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto">
- <!-- <el-table height="100%" ref="table" :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" label="宸ョ▼鍙�" min-width="80" />
- <el-table-column prop="long" align="center" label="鍘熺墖瀹�" min-width="120" />
- <el-table-column prop="wide" align="center" label="鍘熺墖闀�" min-width="120" />
- <el-table-column prop="thick" align="center" label="鑶滅郴" min-width="120" />
- <el-table-column prop="thick" align="center" label="鏁伴噺" min-width="120" />
- <el-table-column
- align="center"
- label="鐘舵��"
- min-width="80"
- >
- <el-tag type="success">灏辩华</el-tag>
- </el-table-column>
- </el-table> -->
<el-table
height="100%"
ref="table"
@@ -251,7 +245,7 @@
:data="tableData"
:span-method="objectSpanMethod"
>
- <el-table-column prop="workstationId" label="宸ョ▼鍙�" width="200" align="center"/>
+ <el-table-column prop="workstationId" label="宸ョ▼鍙�" width="200" align="center"/>
<el-table-column prop="patternWidth" label="鍘熺墖瀹�" align="center"/>
<el-table-column prop="patternHeigth" label="鍘熺墖闀�" align="center"/>
<el-table-column prop="filmsId" label="鑶滅郴" align="center"/>
@@ -283,25 +277,19 @@
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
<el-select
- v-model="form.workstationId"
clearable
placeholder="璇烽�夋嫨宸ョ▼"
style="width: 300px"
+ filterable
+ :remote-method="remoteMethod"
>
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in remoteMethod"
+ :key="item.projectNo"
+ :label="item.projectNo"
+ :value="item.projectNo"
/>
</el-select>
- <!-- <el-select clearable filterable size="mini" v-model="form.fvId"
- style="margin-right: 50px;width: 200px" placeholder="璇烽�夋嫨鏋滆敩绉嶇被">
- <el-option v-for="item in billall"
- :key="item.id"
- :label="item.fruitVagetableCate"
- :value="item.id"></el-option>
- </el-select> -->
</el-form-item>
</div>
<template #footer>
--
Gitblit v1.8.0