From d7bbec21448ffb40fe36b295ea8c76028fdc5a15 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 26 Dec 2024 16:51:13 +0800
Subject: [PATCH] YT-1816  YT-1815  YT-1827

---
 src/api/system/role/index.ts                       |  2 +-
 .../wms/basicDataManage/itemManage/bom/bom.data.ts | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
index ac8b3e736..d23f776fe 100644
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@@ -55,7 +55,7 @@ export const deleteRole = async (id: number) => {
 // 导出角色
 export const exportRole = (params) => {
   return request.download({
-    url: '/system/role/export-excel',
+    url: '/system/role/export',
     params
   })
 }
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index dbe258708..8a1af267e 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -10,7 +10,7 @@ import { Process } from '../../factoryModeling/process/process.data'
 const { t } = useI18n() // 国际化
 
 /**
- * @returns {Array} 基础物料清单
+ * @returns {Array} 基础品番清单
 */
 export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -29,7 +29,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchTitle: '品番基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
         verificationParams: [{
@@ -103,7 +103,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '子物料计量单位',
+    label: '子品番计量单位',
     field: 'componentUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
@@ -120,7 +120,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '子物料数量',
+    label: '子品番数量',
     field: 'componentQty',
     isSearch: true,
     sort: 'custom',
@@ -174,7 +174,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'version',
     sort: 'custom',
     form: {
-      labelMessage: '子物料要和父物料版本相同',
+      labelMessage: '子品番要和父品番版本相同',
     }
   },
   {
@@ -341,10 +341,10 @@ export const BomRules = reactive({
     { required: true, message: '请输入子品番', trigger: 'change' }
   ],
   componentUom: [
-    { required: true, message: '请选择子物料计量单位', trigger: 'change' }
+    { required: true, message: '请选择子品番计量单位', trigger: 'change' }
   ],
   componentQty: [
-    { required: true, message: '请输入子物料数量', trigger: 'blur' }
+    { required: true, message: '请输入子品番数量', trigger: 'blur' }
   ],
   processCode: [
     { required: true, message: '请输入工序代码', trigger: 'blur' },