From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/workorder/components/select-dialog.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/mes/pro/workorder/components/select-dialog.vue b/src/views/mes/pro/workorder/components/select-dialog.vue
index 649873c..2f000dc 100644
--- a/src/views/mes/pro/workorder/components/select-dialog.vue
+++ b/src/views/mes/pro/workorder/components/select-dialog.vue
@@ -1,11 +1,11 @@
-<script lang="ts" setup>
+锘�<script lang="ts" setup>
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
import { computed, nextTick, ref } from 'vue';
-import { DICT_TYPE } from '..\..\..\..\..\packages\constants\src';
-import { getDictLabel } from '..\..\..\..\..\packages\effects\hooks\src';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
import { Alert, Button, message, Modal } from 'ant-design-vue';
@@ -33,14 +33,14 @@
const open = ref(false); // 寮圭獥鏄惁鎵撳紑
const multiple = ref(false); // 鏄惁澶氶�夛紱榛樿鎸夊崟閫夐�夋嫨鍣ㄤ娇鐢�
-const selectedRows = ref<MesProWorkOrderApi.WorkOrder[]>([]); // 宸查�夊伐鍗曞垪琛�
-const preSelectedIds = ref<number[]>([]); // 棰勯�夊伐鍗曠紪鍙峰垪琛�
+const selectedRows = ref<MesProWorkOrderApi.WorkOrder[]>([]); // 宸查�夎鍗曞垪琛�
+const preSelectedIds = ref<number[]>([]); // 棰勯�夎鍗曠紪鍙峰垪琛�
const typeTip = computed(() => {
if (props.type === undefined) {
return '';
}
- return `浠呭睍绀恒��${getDictLabel(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, props.type)}銆戠被鍨嬬殑宸ュ崟`;
+ return `浠呭睍绀恒��${getDictLabel(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE, props.type)}銆戠被鍨嬬殑璁㈠崟`;
});
/** 鑾峰彇澶氶�夎褰曪紝鍖呭惈 VXE reserve 璺ㄩ〉璁板綍 */
@@ -94,7 +94,7 @@
handleConfirm();
}
-/** 鍥炴樉棰勯�夊伐鍗� */
+/** 鍥炴樉棰勯�夎鍗� */
async function applyPreSelection() {
if (preSelectedIds.value.length === 0) {
return;
@@ -182,7 +182,7 @@
}
}
-/** 鎵撳紑宸ュ崟閫夋嫨寮圭獥 */
+/** 鎵撳紑璁㈠崟閫夋嫨寮圭獥 */
async function openModal(
selectedIds?: number[],
options?: { multiple?: boolean },
@@ -200,12 +200,12 @@
await applyPreSelection();
}
-/** 鍏抽棴宸ュ崟閫夋嫨寮圭獥 */
+/** 鍏抽棴璁㈠崟閫夋嫨寮圭獥 */
function closeModal() {
open.value = false;
}
-/** 纭閫夋嫨宸ュ崟 */
+/** 纭閫夋嫨璁㈠崟 */
function handleConfirm() {
const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
if (rows.length === 0) {
@@ -222,7 +222,7 @@
<template>
<Modal
v-model:open="open"
- title="鐢熶骇宸ュ崟閫夋嫨"
+ title="鐢熶骇璁㈠崟閫夋嫨"
width="80%"
:destroy-on-close="true"
@ok="handleConfirm"
@@ -235,7 +235,7 @@
show-icon
class="!mb-3"
/>
- <Grid table-title="鐢熶骇宸ュ崟鍒楄〃" />
+ <Grid table-title="鐢熶骇璁㈠崟鍒楄〃" />
<template #footer>
<Button @click="closeModal">鍙栨秷</Button>
<Button type="primary" @click="handleConfirm">纭畾</Button>
--
Gitblit v1.9.3