From e783ebafa49de5c5ee96a11554625b02b72b8eb9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 11 Oct 2023 10:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=89=8D=E7=AB=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BB=A3=E7=A0=81demo=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/workstation/index.ts              |  5 +++++
 src/views/wms/workstation/WorkstationForm.vue |  4 ++--
 src/views/wms/workstation/index.vue           | 20 +++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts
index 4def6a030..24f034794 100644
--- a/src/api/wms/workstation/index.ts
+++ b/src/api/wms/workstation/index.ts
@@ -44,3 +44,8 @@ export const deleteWorkstation = async (id: number) => {
 export const exportWorkstation = async (params) => {
   return await request.download({ url: `/wms/workstation/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importWorkstationTemplate = () => {
+  return request.download({ url: '/wms/workstation/get-import-template' })
+}
diff --git a/src/views/wms/workstation/WorkstationForm.vue b/src/views/wms/workstation/WorkstationForm.vue
index 2f3d30d97..6450d9cf0 100644
--- a/src/views/wms/workstation/WorkstationForm.vue
+++ b/src/views/wms/workstation/WorkstationForm.vue
@@ -66,7 +66,7 @@
       <el-form-item label="是否可用" prop="available">
         <el-select v-model="formData.available" placeholder="请选择是否可用">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.TRUE_FALSE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -110,7 +110,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as WorkstationApi from '@/api/wms/workstation'
 
 const { t } = useI18n() // 国际化
diff --git a/src/views/wms/workstation/index.vue b/src/views/wms/workstation/index.vue
index 4196bb7fd..2155e11d0 100644
--- a/src/views/wms/workstation/index.vue
+++ b/src/views/wms/workstation/index.vue
@@ -80,7 +80,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.TRUE_FALSE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -148,6 +148,12 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
+        <el-button
+          type="warning" 
+          @click="handleImport" 
+          v-hasPermi="['wms:workstation:import']">
+              <Icon icon="ep:upload" /> 导入
+            </el-button>
         <el-button
           type="success"
           @click="handleExport"
@@ -235,14 +241,18 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <WorkstationForm ref="formRef" @success="getList" />
+
+  <!-- 用户导入对话框 -->
+  <WorkstationImportForm ref="importFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as WorkstationApi from '@/api/wms/workstation'
 import WorkstationForm from './WorkstationForm.vue'
+import WorkstationImportForm from './WorkstationImportForm.vue'
 
 defineOptions({ name: 'Workstation' })
 
@@ -297,6 +307,12 @@ const resetQuery = () => {
   handleQuery()
 }
 
+/** 用户导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+
+}
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {