From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突
---
Web/src/views/wcs/wcsPosition/index.vue | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Web/src/views/wcs/wcsPosition/index.vue b/Web/src/views/wcs/wcsPosition/index.vue
index a589b8c..50f0698 100644
--- a/Web/src/views/wcs/wcsPosition/index.vue
+++ b/Web/src/views/wcs/wcsPosition/index.vue
@@ -9,9 +9,20 @@
</el-form-item>
</el-col>
+ <!-- <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="PLC">
+ <el-select clearable="" filterable="" v-model="queryParams.plcId" placeholder="璇烽�夋嫨PLC">
+ <el-option v-for="(item, index) in wcsPLCList" :key="index" :value="item.value"
+ :label="item.label" />
+
+ </el-select>
+
+ </el-form-item>
+ </el-col> -->
+
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
- <el-form-item label="璁惧ID">
- <el-select clearable="" filterable="" v-model="queryParams.deviceId" placeholder="璇烽�夋嫨璁惧ID">
+ <el-form-item label="璁惧">
+ <el-select clearable="" filterable="" v-model="queryParams.deviceId" placeholder="璇烽�夋嫨璁惧">
<el-option v-for="(item, index) in wcsDeviceDeviceIdDropdownList" :key="index" :value="item.value"
:label="item.label" />
@@ -104,7 +115,7 @@
import ModifyRecord from '/@/components/table/modifyRecord.vue';
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsPosition/component/editDialog.vue'
-import { pageWcsPosition, deleteWcsPosition } from '/@/api/wcs/wcsPosition';
+import { pageWcsPosition, deleteWcsPosition,GetWcsPlcIdDropdown } from '/@/api/wcs/wcsPosition';
import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsPosition';
const showAdvanceQueryUI = ref(false);
@@ -194,6 +205,13 @@
};
getWcsDeviceDeviceIdDropdownList();
+const wcsPLCList = ref<any>([]);
+const getwcsPLCList = async () => {
+ let list = await GetWcsPlcIdDropdown();
+ wcsPLCList.value = list.data.result ?? [];
+};
+getwcsPLCList();
+
handleQuery();
</script>
<style scoped>
--
Gitblit v1.8.0