From 41ca2b65f055b9c7b8f3ce68418423bac15c8e46 Mon Sep 17 00:00:00 2001 From: hwh <332078369@qq.com> Date: 星期二, 27 八月 2024 17:00:45 +0800 Subject: [PATCH] plc基础信息优化;堆垛机出库逻辑 --- Web/src/views/wcs/wcsPosition/component/editDialog.vue | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Web/src/views/wcs/wcsStation/component/editDialog.vue b/Web/src/views/wcs/wcsPosition/component/editDialog.vue similarity index 86% rename from Web/src/views/wcs/wcsStation/component/editDialog.vue rename to Web/src/views/wcs/wcsPosition/component/editDialog.vue index d82c3cc..c9f7574 100644 --- a/Web/src/views/wcs/wcsStation/component/editDialog.vue +++ b/Web/src/views/wcs/wcsPosition/component/editDialog.vue @@ -1,5 +1,5 @@ 锘�<template> - <div class="wcsStation-container"> + <div class="wcsPosition-container"> <el-dialog v-model="isShowDialog" :width="800" draggable="" :close-on-click-modal="false"> <template #header> <div style="color: #fff"> @@ -81,9 +81,14 @@ import { ref,onMounted } from "vue"; import { ElMessage } from "element-plus"; import type { FormRules } from "element-plus"; - import { addWcsStation, updateWcsStation, detailWcsStation } from "/@/api/wcs/wcsStation"; - import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsStation'; import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils'; + import { getDictLabelByVal as dv } from '/@/utils/dict-utils'; + import { formatDate } from '/@/utils/formatTime'; + import { addWcsPosition, updateWcsPosition, detailWcsPosition } from "/@/api/wcs/wcsPosition"; + import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsPosition'; + import { getAPI } from '/@/utils/axios-utils'; + import { SysEnumApi } from '/@/api-services/api'; + //鐖剁骇浼犻�掓潵鐨勫弬鏁� var props = defineProps({ title: { @@ -98,6 +103,8 @@ const ruleForm = ref<any>({}); //鑷娣诲姞鍏朵粬瑙勫垯 const rules = ref<FormRules>({ + stationNum: [{required: true, message: '璇疯緭鍏ュ伐浣嶅彿锛�', trigger: 'blur',},], + plcPos: [{required: true, message: '璇疯緭鍏ュ亸绉婚噺锛�', trigger: 'blur',},], }); // 椤甸潰鍔犺浇鏃� @@ -111,7 +118,7 @@ // 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫 let rowData = JSON.parse(JSON.stringify(row)); if (rowData.id) - ruleForm.value = (await detailWcsStation(rowData.id)).data.result; + ruleForm.value = (await detailWcsPosition(rowData.id)).data.result; else ruleForm.value = rowData; isShowDialog.value = true; @@ -134,9 +141,9 @@ if (isValid) { let values = ruleForm.value; if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) { - await addWcsStation(values); + await addWcsPosition(values); } else { - await updateWcsStation(values); + await updateWcsPosition(values); } closeDialog(); } else { -- Gitblit v1.8.0