From 4687427f9a801b8999e8fa7eec48b4377bfe4fc1 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 17:00:57 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Web/src/views/wcs/wcsPosition/index.vue | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/Web/src/views/wcs/wcsStation/index.vue b/Web/src/views/wcs/wcsPosition/index.vue
similarity index 78%
rename from Web/src/views/wcs/wcsStation/index.vue
rename to Web/src/views/wcs/wcsPosition/index.vue
index a2e056e..343d80a 100644
--- a/Web/src/views/wcs/wcsStation/index.vue
+++ b/Web/src/views/wcs/wcsPosition/index.vue
@@ -1,5 +1,5 @@
锘�<template>
- <div class="wcsStation-container">
+ <div class="wcsPosition-container">
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row>
@@ -28,15 +28,15 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
<el-form-item>
<el-button-group style="display: flex; align-items: center;">
- <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsStation:page'"> 鏌ヨ
+ <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'wcsPosition:page'"> 鏌ヨ
</el-button>
<el-button icon="ele-Refresh" @click="() => queryParams = {}"> 閲嶇疆 </el-button>
<el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI"
style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
<el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI"
style="margin-left:5px;"> 闅愯棌 </el-button>
- <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsStation"
- v-auth="'wcsStation:add'"> 鏂板 </el-button>
+ <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddWcsPosition"
+ v-auth="'wcsPosition:add'"> 鏂板 </el-button>
</el-button-group>
</el-form-item>
@@ -57,8 +57,8 @@
</el-table-column>
<el-table-column prop="stationNum" label="宸ヤ綅鍙�" show-overflow-tooltip="" />
- <el-table-column prop="plcPos" label="鍋忕Щ閲�" show-overflow-tooltip="" /> <el-table-column prop="posType"
- label="娴佺▼瀛楃被鍨�" show-overflow-tooltip="">
+ <el-table-column prop="plcPos" label="鍋忕Щ閲�" show-overflow-tooltip="" />
+ <el-table-column prop="posType" label="娴佺▼瀛楃被鍨�" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('PLCDataTypeEnum', scope.row.posType)?.tagType"> {{ dv('PLCDataTypeEnum',
scope.row.posType)?.name}}</el-tag>
@@ -72,12 +72,12 @@
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="140" align="center" fixed="right" show-overflow-tooltip=""
- v-if="auth('wcsStation:update') || auth('wcsStation:delete')">
+ v-if="auth('wcsPosition:update') || auth('wcsPosition:delete')">
<template #default="scope">
- <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWcsStation(scope.row)"
- v-auth="'wcsStation:update'"> 缂栬緫 </el-button>
- <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWcsStation(scope.row)"
- v-auth="'wcsStation:delete'"> 鍒犻櫎 </el-button>
+ <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWcsPosition(scope.row)"
+ v-auth="'wcsPosition:update'"> 缂栬緫 </el-button>
+ <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWcsPosition(scope.row)"
+ v-auth="'wcsPosition:delete'"> 鍒犻櫎 </el-button>
</template>
</el-table-column>
</el-table>
@@ -85,23 +85,26 @@
:total="tableParams.total" :page-sizes="[10, 20, 50, 100, 200, 500]" size="small" background=""
@size-change="handleSizeChange" @current-change="handleCurrentChange"
layout="total, sizes, prev, pager, next, jumper" />
- <printDialog ref="printDialogRef" :title="printWcsStationTitle" @reloadTable="handleQuery" />
- <editDialog ref="editDialogRef" :title="editWcsStationTitle" @reloadTable="handleQuery" />
+ <printDialog ref="printDialogRef" :title="printWcsPositionTitle" @reloadTable="handleQuery" />
+ <editDialog ref="editDialogRef" :title="editWcsPositionTitle" @reloadTable="handleQuery" />
</el-card>
</div>
</template>
-<script lang="ts" setup="" name="wcsStation">
+<script lang="ts" setup="" name="wcsPosition">
import { ref } from "vue";
import { ElMessageBox, ElMessage } from "element-plus";
import { auth } from '/@/utils/authFunction';
-import { getDictLabelByVal as dv } from '/@/utils/dict-utils';
-import ModifyRecord from '/@/components/table/modifyRecord.vue';
+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 ModifyRecord from '/@/components/table/modifyRecord.vue';
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
-import editDialog from '/@/views/wcs/wcsStation/component/editDialog.vue'
-import { pageWcsStation, deleteWcsStation } from '/@/api/wcs/wcsStation';
-import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsStation';
+import editDialog from '/@/views/wcs/wcsPosition/component/editDialog.vue'
+import { pageWcsPosition, deleteWcsPosition } from '/@/api/wcs/wcsPosition';
+import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsPosition';
const showAdvanceQueryUI = ref(false);
const printDialogRef = ref();
@@ -115,8 +118,8 @@
total: 0,
});
-const printWcsStationTitle = ref("");
-const editWcsStationTitle = ref("");
+const printWcsPositionTitle = ref("");
+const editWcsPositionTitle = ref("");
// 鏀瑰彉楂樼骇鏌ヨ鐨勬帶浠舵樉绀虹姸鎬�
const changeAdvanceQueryUI = () => {
@@ -126,7 +129,7 @@
// 鏌ヨ鎿嶄綔
const handleQuery = async () => {
loading.value = true;
- var res = await pageWcsStation(Object.assign(queryParams.value, tableParams.value));
+ var res = await pageWcsPosition(Object.assign(queryParams.value, tableParams.value));
tableData.value = res.data.result?.items ?? [];
tableParams.value.total = res.data.result?.total;
loading.value = false;
@@ -140,31 +143,31 @@
};
// 鎵撳紑鏂板椤甸潰
-const openAddWcsStation = () => {
- editWcsStationTitle.value = '娣诲姞璁惧宸ヤ綅';
+const openAddWcsPosition = () => {
+ editWcsPositionTitle.value = '娣诲姞璁惧鐐逛綅绠＄悊';
editDialogRef.value.openDialog({});
};
// 鎵撳紑鎵撳嵃椤甸潰
-const openPrintWcsStation = async (row: any) => {
- printWcsStationTitle.value = '鎵撳嵃璁惧宸ヤ綅';
+const openPrintWcsPosition = async (row: any) => {
+ printWcsPositionTitle.value = '鎵撳嵃璁惧鐐逛綅绠＄悊';
}
// 鎵撳紑缂栬緫椤甸潰
-const openEditWcsStation = (row: any) => {
- editWcsStationTitle.value = '缂栬緫璁惧宸ヤ綅';
+const openEditWcsPosition = (row: any) => {
+ editWcsPositionTitle.value = '缂栬緫璁惧鐐逛綅绠＄悊';
editDialogRef.value.openDialog(row);
};
// 鍒犻櫎
-const delWcsStation = (row: any) => {
+const delWcsPosition = (row: any) => {
ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning",
})
.then(async () => {
- await deleteWcsStation(row);
+ await deleteWcsPosition(row);
handleQuery();
ElMessage.success("鍒犻櫎鎴愬姛");
})
--
Gitblit v1.8.0