From fce2fec004bb460a68af6e0ba416090afce5ec9f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 21 五月 2024 14:25:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 166 ++++++++++++++++++------------------------------------
1 files changed, 56 insertions(+), 110 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index efba1a1..cdeb549 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -13,9 +13,13 @@
const tableData = ref([])
const slot = ref('')
-
+const requestData = {
+ line: 2001
+};
+request.post("/cacheGlass/taskCache/selectEdgTask",{
+ ...requestData,
-request.post("/cacheGlass/taskCache/selectEdgTask").then((res) => {
+}).then((res) => {
if (res.code == 200) {
console.log(res.data);
@@ -26,36 +30,11 @@
}
});
-
-// const getTableRow = (row,type) =>{
-// switch (type) {
-// case 'delete':{
-// let flowData = ref({
-// id:0,
-// slot:row.slot
-// })
-// request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass",flowData.value).then((res) => {
-// if(res.code==200){
-// ElMessage.success(t('searchOrder.msgDeleteSuccess'))
-// router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
-// }else{
-// ElMessage.warning(res.msg)
-// router.push("/login")
-// }
-// })
-
-// return
-// }
-// }
-// }
-// let slots = ref({
-// id:0,
-// slot: slot.value
-// })
-const open = async(row) => {
+// 鐮存崯
+ const open = async(row) => {
try {
const confirmResult = await ElMessageBox.confirm(
- '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
+ '鏄惁鐮存崯璇ユ潯淇℃伅?',
'鎻愮ず',
{
confirmButtonText: '鏄�',
@@ -65,16 +44,16 @@
);
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- const deleteResponse = await request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass", {
- id:0,
- slot: row.slot
+ const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
+ glassId: row.GlassId,
+ controlsId: 300
})
- if (response.code == 200) {
- // 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
- alert('鍒犻櫎鎴愬姛锛�');
+ if (response.code === 200) {
+ ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ ElMessage.error(response.msg);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
@@ -82,56 +61,37 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// const open = () => {
-// ElMessageBox.confirm(
-// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
-// '鎻愮ず',
-// {
-// confirmButtonText: '鏄�',
-// cancelButtonText: '鍙栨秷',
-// type: 'warning',
-// }
-// )
-// .then(() => {
-// ElMessage({
-// type: 'success',
-// message: '鍒犻櫎鎴愬姛锛�',
-// })
-// })
-// .catch(() => {
-// ElMessage({
-// type: 'info',
-// message: '鍒犻櫎澶辫触',
-// })
-// })
-// }
-// 鍒犻櫎
-// const handleBindRacka = (row) => {
-// adda.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
-// // 鍒犻櫎
-// const handleConfirma = async () => {
-// try {
-// window.localStorage.setItem('slot', res.data.slot)
-// let slot = window.localStorage.getItem('slot')
-// const response = await request.post('/cacheGlass/edgStorageCage/edgStorageCageGlass', {
-// slot: slot.value,
-// id: 0
-// });
-
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// adda.value = false;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// };
+// 鎷胯蛋
+ const opena = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ '鏄惁鎷胯蛋璇ユ潯淇℃伅?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
+ const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
+ glassId: row.GlassId,
+ controlsId: 301
+ })
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ ElMessage.error(response.msg);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
+ }
+ } catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -171,9 +131,6 @@
]
})
-
-
-
</script>
<template>
@@ -183,28 +140,17 @@
<el-table height="240" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="slot" align="center" label="id" min-width="80" />
- <el-table-column prop="glass_id" align="center" label="闀�" min-width="80" />
- <el-table-column prop="width" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="height" align="center" label="鍘氬害" min-width="120" />
- <el-table-column prop="height" align="center" label="鑶滅郴" min-width="120" />
- <el-table-column prop="height" align="center" label="鍑虹墖椤哄簭" min-width="120" />
- <el-table-column prop="height" align="center" label="娴佺▼鍗″彿" min-width="120" />
- <el-table-column prop="height" align="center" label="鍏朵粬" min-width="120" />
- <el-table-column
- align="center"
- label="鍚敤鐘舵��"
- min-width="80"
- prop="enable_state"
- >
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.enable_state==1?"鍚敤":"鏈惎鐢�" }}</el-tag>
- </template>
- </el-table-column>
+ <el-table-column prop="GlassId" align="center" label="鐜荤拑id" min-width="180" />
+ <el-table-column prop="Height" align="center" label="楂�" min-width="80" />
+ <el-table-column prop="Width" align="center" label="瀹�" min-width="120" />
+ <el-table-column prop="Thickness" align="center" label="鍘氬害" min-width="120" />
+ <el-table-column prop="FilmsId" align="center" label="鑶滅郴" min-width="120" />
+ <el-table-column prop="SerialNumber" align="center" label="鍑虹墖椤哄簭" min-width="120" />
+ <el-table-column prop="FlowCardId" align="center" label="娴佺▼鍗″彿" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">鐮存崯</el-button>
- <el-button size="mini" type="text" plain @click="open(scope.row)">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" plain @click="open(scope.row)">鐮存崯</el-button>
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">鎷胯蛋</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0