From f7e1fb87573dcaaa3ee1f3d90d84bfec88a44be9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 08:51:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/returns.vue | 120 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 48 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index d757769..a8e0996 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -5,34 +5,50 @@
const router = useRouter()
import type { TableColumnCtx } from 'element-plus'
-import { ref } from 'vue'
+// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
const dialogFormVisible = ref(false)
const add = ref(false)
const adda = ref(false)
-const value = ref('')
+// const value = ref('')
import request from "@/utils/request"
-request.post(`/LoadGlass/SelectAll`).then((res) => {
- console.log(555555555555);
- if (res.code == 200) {
- console.log(1111);
- // console.log(res.data);
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
-});
-
-// request.get("/LoadGlass/SelectAll").then((res) => {
+import { ref, onMounted } from "vue";
+// import http from "@/http/index";
+const tableData = ref([])
+// request.post(`/LoadGlass/list`).then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// router.push("/login")
+// }
+// });
+// request.get("/LoadGlass/list").then((res) => {
// if (res.code == 200) {
// console.log(res.data);
+// tableData.value = res
// } else {
// ElMessage.warning(res.msg)
// router.push("/login")
// }
// });
-
+onMounted(() => {
+ request
+ .get("/LoadGlass/list")
+ .then((res: any) => {
+ tableData.value = res.data;
+ })
+ .catch((err: any) => {});
+});
+onMounted(() => {
+ request
+ .post("/LoadGlass/selectPriority")
+ .then((res: any) => {
+ tableData.value = res.data;
+ })
+ .catch((err: any) => {});
+});
interface User {
id: string
name: string
@@ -91,21 +107,21 @@
label: 'P202561456',
},
]
-const tableData: User[] = [
+// const tableData: User[] = [
- {
- id: 'P202561456',
- long: '1005',
- wide: '183.6',
- thick: '1991',
- },
- {
- id: 'P202561456',
- long: '105',
- wide: '183',
- thick: '191',
- }
-]
+// {
+// id: 'P202561456',
+// long: '1005',
+// wide: '183.6',
+// thick: '1991',
+// },
+// {
+// id: 'P202561456',
+// long: '105',
+// wide: '183',
+// thick: '191',
+// }
+// ]
const tableDataa = [
{
long: '1005',
@@ -235,19 +251,20 @@
:data="tableData"
:span-method="objectSpanMethod"
>
- <el-table-column prop="id" label="宸ョ▼鍙�" width="200" align="center"/>
- <el-table-column prop="long" label="鍘熺墖瀹�" align="center"/>
- <el-table-column prop="wide" label="鍘熺墖闀�" align="center"/>
- <el-table-column prop="thick" label="鑶滅郴" align="center"/>
- <el-table-column prop="thick" label="鏁伴噺" align="center"/>
- <el-table-column prop="wide" label="鍘氬害" 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"/>
+ <el-table-column prop="number" label="鏁伴噺" align="center"/>
+ <el-table-column prop="patternThickness" label="鍘氬害" align="center"/>
<el-table-column
align="center"
label="鐘舵��"
min-width="80"
+ prop="enableState"
>
<el-tag type="success">灏辩华</el-tag>
- <!-- <el-tag type="danger">鏈氨缁�</el-tag> -->
+ <!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
</el-table-column>
</el-table>
</div>
@@ -266,18 +283,25 @@
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
<el-select
- v-model="value"
- clearable
- placeholder="璇烽�夋嫨宸ョ▼"
- style="width: 300px"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
+ v-model="form.workstationId"
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 300px"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </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