From ab227c1e2e770e6ba1fe98e219af579c3cbe7650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 17 May 2024 12:39:38 +0800 Subject: [PATCH 01/23] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-17-002-001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b955cfeb8..b6f060c49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-17-002 +## dev发布2024-05-17-002-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 3172f9f9d44c50c6997f9ad197c362e8f418bdd2 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 17 May 2024 13:05:58 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts index d5dc1c983..3377cf393 100644 --- a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts +++ b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts @@ -54,6 +54,7 @@ export const InterfaceInfo = useCrudSchemas(reactive([ label: '业务编号', field: 'businessNumber', sort: 'custom', + isSearch: true, table: { width: 180, }, @@ -62,6 +63,7 @@ export const InterfaceInfo = useCrudSchemas(reactive([ label: '业务ID', field: 'businessId', sort: 'custom', + isSearch: true, table: { width: 180, }, From 52ae9cbba972e239997e98f52cc81a06a97bc2ad Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 17 May 2024 13:43:56 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=AB=E6=96=99?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E6=96=99=20=E7=9A=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 2 +- src/views/mes/itemRequestMain/index.vue | 8 +++--- .../itemRequestMain/itemRequestMain.data.ts | 28 +++++++++++++++---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 92d89451e..731adaa35 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -322,7 +322,7 @@ export enum DICT_TYPE { DISMANTLING_BILL_TYPE = 'dismantling_bill_type',//工单类型 DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status',//报废拆解物料状态 DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status',//报废拆解处理状态 - + MES_REQUEST_TYPE = 'mes_request_type',//生产物料申请类型 SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态 SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态 diff --git a/src/views/mes/itemRequestMain/index.vue b/src/views/mes/itemRequestMain/index.vue index ec23d1d99..291647ef1 100644 --- a/src/views/mes/itemRequestMain/index.vue +++ b/src/views/mes/itemRequestMain/index.vue @@ -61,9 +61,9 @@ :apiCreate="ItemRequestDetailApi.createItemRequestDetail" :apiUpdate="ItemRequestDetailApi.updateItemRequestDetail" :apiDelete="ItemRequestDetailApi.deleteItemRequestDetail" - :detailButtonIsShowAdd="true" - :detailButtonIsShowEdit="true" - :detailButtonIsShowDelete="true" + :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" @handleMainFefresh="handleMainFefresh" @searchTableSuccessDetail="searchTableSuccessDetail" :key="count" @@ -150,7 +150,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), // 编辑 + //defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), // 编辑 defaultButtons.mainListDeleteBtn({hasPermi:'mes:itemRequestMain:delete'}), // 删除 ] diff --git a/src/views/mes/itemRequestMain/itemRequestMain.data.ts b/src/views/mes/itemRequestMain/itemRequestMain.data.ts index 32e25a10e..19bfee525 100644 --- a/src/views/mes/itemRequestMain/itemRequestMain.data.ts +++ b/src/views/mes/itemRequestMain/itemRequestMain.data.ts @@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const ItemRequestMainRules = reactive({ - concurrencyStamp: [required], + requestBillNo:[{required : true, message: '请输入删除时间', trigger: 'blur' }] }) export const ItemRequestMain = useCrudSchemas(reactive([ @@ -24,6 +24,9 @@ export const ItemRequestMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -37,6 +40,7 @@ export const ItemRequestMain = useCrudSchemas(reactive([ field: 'requestBillNo', sort: 'custom', isSearch: true, + disabled: true, }, { label: '主键', @@ -132,13 +136,20 @@ export const ItemRequestMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '类型（1:叫料、2:补料）', + label: '类型', field: 'requestType', sort: 'custom', isSearch: true, - form: { - component: 'SelectV2' - }, + dictType: DICT_TYPE.MES_REQUEST_TYPE, + dictClass: 'string', + form: { + component: 'Select', + // componentProps:{ + // options:[{label:'叫料',value:'1'},{label:'补料',value:'2'}] + // }, + value:'1' + }, + }, { label: '创建时间', @@ -154,6 +165,9 @@ export const ItemRequestMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, isForm: false, }, { @@ -275,6 +289,9 @@ export const ItemRequestDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, isForm: false, }, { @@ -287,6 +304,7 @@ export const ItemRequestDetail = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isTable: false, table: { width: 150, fixed: 'right' From 80bcb77bff4ef58905aaed0a74a0ec398a93732e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 17 May 2024 13:53:43 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 2 +- src/components/BasicForm/src/BasicForm.vue | 11 +++++ src/components/TableForm/src/TableForm.vue | 43 +++++++++++++++++-- src/locales/en-US.ts | 3 +- src/locales/zh-CN.ts | 3 +- .../itemManage/itemarea/index.vue | 6 ++- .../countManage/count/countPlanMain/index.vue | 6 ++- .../count/countRequestMain/index.vue | 6 ++- .../countadjustRequestMain/index.vue | 6 ++- .../customerreceiptRequestMain/index.vue | 6 ++- .../customerreturnRequestMain/index.vue | 5 +++ .../customersettleRequestMain/index.vue | 6 ++- .../deliver/deliverRequestMain/index.vue | 6 ++- .../deliverplan/deliverPlanMain/index.vue | 6 ++- .../deliverplan/saleMain/index.vue | 6 ++- .../saleShipmentMainRequest/index.vue | 6 ++- .../stockup/stockupMainRequest/index.vue | 6 ++- .../containerBindRecord/index.vue | 6 ++- .../containerinit/containerRepair/index.vue | 6 ++- .../containerUnbindRecord/index.vue | 6 ++- .../containerMainRequest/index.vue | 6 ++- .../initialContainerMainRequest/index.vue | 6 ++- .../scrapContainerMainRequest/index.vue | 6 ++- .../inventoryinitRequestMain/index.vue | 6 ++- .../scrap/scrapRequestMain/index.vue | 6 ++- .../index.vue | 6 ++- .../transferissueRequestMain/index.vue | 6 ++- .../transferreceiptRequestMain/index.vue | 6 ++- .../unplannedissueRequestMain/index.vue | 6 ++- .../unplannedreceiptRequestMain/index.vue | 6 ++- .../issue/issueRequestMain/index.vue | 6 ++- .../onlinesettlementRequestMain/index.vue | 6 ++- .../pick/pickRequestMain/index.vue | 6 ++- .../preparetoissueMain/index.vue | 6 ++- .../productionreturnRequestMain/index.vue | 5 +++ .../repleinsh/repleinshRequestMain/index.vue | 6 ++- .../inventorychangeRequestMain/index.vue | 5 +++ .../inventorymoveRequestMain/index.vue | 6 ++- .../offlinesettlementRequestMain/index.vue | 5 +++ .../productdismantleRequestMain/index.vue | 6 ++- .../productionplan/productionMain/index.vue | 5 +++ .../productionMainAssemble/index.vue | 5 +++ .../productionMainAssembleSparePart/index.vue | 6 ++- .../productionMainPredictSparePart/index.vue | 5 +++ .../productionplan/workMain/index.vue | 5 +++ .../productputawayRequestMain/index.vue | 5 +++ .../index.vue | 6 ++- .../productreceiptRequestMain/index.vue | 6 ++- .../index.vue | 5 +++ .../productreceiptscrapRequestMain/index.vue | 5 +++ .../productredressRequestMain/index.vue | 5 +++ .../productscrapRequestMain/index.vue | 5 +++ .../inspect/inspectRequestMain/index.vue | 6 ++- .../purchasereturnRequestMain/index.vue | 19 ++++++++ .../putaway/putawayRequestMain/index.vue | 5 +++ .../sparereceiptRequestMain/index.vue | 5 +++ .../demandforecastingMain/index.vue | 5 +++ .../supplierdeliver/purchaseMain/index.vue | 10 ++++- .../purchasePlanMain/index.vue | 5 +++ .../supplierdeliverBasicForm.vue | 23 ++++++---- .../purchaseclaimRequestMain/index.vue | 7 ++- .../supplierinvoiceRequestMain/index.vue | 7 ++- 62 files changed, 369 insertions(+), 54 deletions(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index 5f5f144d6..812be654f 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -8,7 +8,7 @@
- +
{{ item.name }}
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 28f77a0cc..4157195f5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -79,9 +79,11 @@ :tableFormRules="tableFormRules" :isShowButton="isShowButton" :isShowReduceButton="isShowReduceButton" + :isShowReduceButtonSelection="isShowReduceButtonSelection" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @tableSelectionChange="tableSelectionChange" + @tableSelectionDelete="tableSelectionDelete" @extendedButtonsClick="extendedButtonsClick" @formSelectChange="formSelectChange" @formSelectvVisibleChange="formSelectvVisibleChange" @@ -139,6 +141,11 @@ const props = defineProps({ type: Boolean, default: true }, + // 是否显示删除按钮--多选 + isShowReduceButtonSelection:{ + type: Boolean, + default: false, + }, // 是否显示tableForm 删除按钮 isShowReduceButton: { type: Boolean, @@ -612,6 +619,7 @@ const resetForm = () => { const emit = defineEmits([ 'success', 'tableSelectionChange', + 'tableSelectionDelete', 'tableFormSelectOnBlur', 'extendedButtonsClick', 'formSelectChange', @@ -653,6 +661,9 @@ const formSelectvVisibleChange = (field, val, row) => { const tableSelectionChange = (val) => { emit('tableSelectionChange', val) } +const tableSelectionDelete = (val) => { + emit('tableSelectionDelete', val) +} // tableform select bulr const tableFormSelectOnBlur = (field, val, row, index) => { emit('tableFormSelectOnBlur', field, val, row, index) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 1cfc8ba01..2ac2fb922 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -12,11 +12,13 @@ @sort-change="tableSortChange" @row-click="handleTableSelect" > + + @@ -299,18 +301,34 @@ + + + + -
-
+
+
{{t('ts.添加明细')}}
+
+ +
{{t('ts.批量删除')}}
+
diff --git a/src/views/eam/inspectionItemSelectSet/inspectionItemSelectSet.data.ts b/src/views/eam/inspectionItemSelectSet/inspectionItemSelectSet.data.ts new file mode 100644 index 000000000..67508f157 --- /dev/null +++ b/src/views/eam/inspectionItemSelectSet/inspectionItemSelectSet.data.ts @@ -0,0 +1,141 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const InspectionItemSelectSetRules = reactive({ + name: [required], + itemCode: [required], + concurrencyStamp: [required], +}) + +export const InspectionItemSelectSet = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '选择集名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '项编号', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue b/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue new file mode 100644 index 000000000..f7aa42b20 --- /dev/null +++ b/src/views/eam/inspectionItemSelectSet/itemSelectSetForm.vue @@ -0,0 +1,283 @@ + + + + From 32957e4f590b065fe5bde5beded1656f7f4e53f1 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 17 May 2024 14:05:42 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.ts | 28 +- src/api/wms/relegateRequestMain/index.ts | 68 +++ src/views/system/user/UserForm.vue | 4 +- .../itemManage/relegateRequest/index.vue | 181 ++++-- .../relegateRequestMain.data.ts | 539 ++++++++++++++++++ .../relegateRequestDetail/index.vue | 233 ++++++++ .../relegateRequest.data.ts | 2 +- 7 files changed, 1001 insertions(+), 54 deletions(-) rename src/api/wms/{relegateRequest => relegateRequestDetail}/index.ts (50%) create mode 100644 src/api/wms/relegateRequestMain/index.ts create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequestMain.data.ts create mode 100644 src/views/wms/basicDataManage/itemManage/relegateRequestDetail/index.vue rename src/views/wms/basicDataManage/itemManage/{relegateRequest => relegateRequestDetail}/relegateRequest.data.ts (98%) diff --git a/src/api/wms/relegateRequest/index.ts b/src/api/wms/relegateRequestDetail/index.ts similarity index 50% rename from src/api/wms/relegateRequest/index.ts rename to src/api/wms/relegateRequestDetail/index.ts index a26e8c360..98aa10e73 100644 --- a/src/api/wms/relegateRequest/index.ts +++ b/src/api/wms/relegateRequestDetail/index.ts @@ -1,6 +1,6 @@ import request from '@/config/axios' -export interface RelegateRequestVO { +export interface RelegateRequestDetailVO { id: number itemCode: string downItemCode: string @@ -32,39 +32,39 @@ export interface RelegateRequestVO { } // 查询物料降级信息列表 -export const getRelegateRequestPage = async (params) => { +export const getRelegateRequestDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/relegate-request/senior', data }) + return await request.post({ url: '/wms/relegate-request-detail/senior', data }) } else { - return await request.get({ url: `/wms/relegate-request/page`, params }) + return await request.get({ url: `/wms/relegate-request-detail/page`, params }) } } // 查询物料降级信息详情 -export const getRelegateRequest = async (id: number) => { - return await request.get({ url: `/wms/relegate-request/get?id=` + id }) +export const getRelegateRequestDetail = async (id: number) => { + return await request.get({ url: `/wms/relegate-request-detail/get?id=` + id }) } // 新增物料降级信息 -export const createRelegateRequest = async (data: RelegateRequestVO) => { - return await request.post({ url: `/wms/relegate-request/create`, data }) +export const createRelegateRequestDetail = async (data: RelegateRequestDetailVO) => { + return await request.post({ url: `/wms/relegate-request-detail/create`, data }) } // 修改物料降级信息 -export const updateRelegateRequest = async (data: RelegateRequestVO) => { - return await request.put({ url: `/wms/relegate-request/update`, data }) +export const updateRelegateRequestDetail = async (data: RelegateRequestDetailVO) => { + return await request.put({ url: `/wms/relegate-request-detail/update`, data }) } // 删除物料降级信息 -export const deleteRelegateRequest = async (id: number) => { - return await request.delete({ url: `/wms/relegate-request/delete?id=` + id }) +export const deleteRelegateRequestDetail = async (id: number) => { + return await request.delete({ url: `/wms/relegate-request-detail/delete?id=` + id }) } // 导出物料降级信息 Excel -export const exportRelegateRequest = async (params) => { - return await request.download({ url: `/wms/relegate-request/export-excel`, params }) +export const exportRelegateRequestDetail = async (params) => { + return await request.download({ url: `/wms/relegate-request-detail/export-excel`, params }) } // 下载用户导入模板 diff --git a/src/api/wms/relegateRequestMain/index.ts b/src/api/wms/relegateRequestMain/index.ts new file mode 100644 index 000000000..1b3ca3018 --- /dev/null +++ b/src/api/wms/relegateRequestMain/index.ts @@ -0,0 +1,68 @@ +import request from '@/config/axios' + +export interface RelegateRequestMainVO { + id: number + fromWarehouseCode: string + number: string + businessType: string + remark: string + extraProperties: string + siteId: string + requestTime: Date + dueTime: Date + departmentCode: string + status: string + autoCommit: string + autoAgree: string + autoExecute: string + directCreateRecord: string + concurrencyStamp: number + ruleUserId: number + fromAreaTypes: string + fromAreaCodes: string + serialNumber: string + inInventoryStatuses: string + outInventoryStatuses: string + reason: string +} + +// 查询物料降级申请主列表 +export const getRelegateRequestMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/relegate-request-main/senior', data }) + } else { + return await request.get({ url: `/wms/relegate-request-main/page`, params }) + } +} + +// 查询物料降级申请主详情 +export const getRelegateRequestMain = async (id: number) => { + return await request.get({ url: `/wms/relegate-request-main/get?id=` + id }) +} + +// 新增物料降级申请主 +export const createRelegateRequestMain = async (data: RelegateRequestMainVO) => { + return await request.post({ url: `/wms/relegate-request-main/create`, data }) +} + +// 修改物料降级申请主 +export const updateRelegateRequestMain = async (data: RelegateRequestMainVO) => { + return await request.put({ url: `/wms/relegate-request-main/update`, data }) +} + +// 删除物料降级申请主 +export const deleteRelegateRequestMain = async (id: number) => { + return await request.delete({ url: `/wms/relegate-request-main/delete?id=` + id }) +} + +// 导出物料降级申请主 Excel +export const exportRelegateRequestMain = async (params) => { + return await request.download({ url: `/wms/relegate-request-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/relegate-request-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index 60583b826..5a605d49d 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -40,8 +40,8 @@ - - + + diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue index e60621efe..637efc95c 100644 --- a/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/index.vue @@ -1,7 +1,7 @@