From e64a7e608e72e6d5605f01126e6db564e3a81a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 21 Jul 2023 14:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Code/Fe/src/api/wms-api.js | 366 +-------- Code/Fe/src/api/wms-auth.js | 58 +- Code/Fe/src/api/wms-core.js | 56 -- Code/Fe/src/api/wms-job.js | 192 +---- Code/Fe/src/components/PanThumb/index.vue | 142 ---- .../components/StepsCountPlanForm/_index.vue | 654 ---------------- .../components/StepsCountPlanForm/index.vue | 723 ------------------ .../StepsCountPlanForm/style/index.scss | 86 --- Code/Fe/src/components/StepsForm/_index.vue | 459 ----------- Code/Fe/src/components/StepsForm/index.vue | 551 ------------- .../src/components/StepsForm/style/index.scss | 134 ---- Code/Fe/src/components/UploadExcel/index.vue | 57 +- .../commonTabel-drawer copy/index.vue | 720 ----------------- .../commonTabel-drawer copy/style/index.scss | 137 ---- .../components/commonTabel-drawer/index.vue | 21 - Code/Fe/src/components/handelFrom/index.vue | 206 ----- Code/Fe/src/filters/excelOrReportsOption.js | 53 -- Code/Fe/src/filters/options.js | 267 ------- Code/Fe/src/filters/statusType.js | 4 +- Code/Fe/src/layout/components/Navbar.vue | 6 +- Code/Fe/src/mixins/TableHeaderMixins.js | 24 - Code/Fe/src/mixins/TableMixins.js | 67 -- Code/Fe/src/router/index.js | 6 - Code/Fe/src/router/modules/baseConfig.js | 25 - Code/Fe/src/router/modules/interfaceBoard.js | 25 - Code/Fe/src/router/modules/systemManage.js | 44 -- Code/Fe/src/store/getters.js | 2 +- Code/Fe/src/utils/utils.js | 4 - 28 files changed, 17 insertions(+), 5072 deletions(-) delete mode 100644 Code/Fe/src/api/wms-core.js delete mode 100644 Code/Fe/src/components/PanThumb/index.vue delete mode 100644 Code/Fe/src/components/StepsCountPlanForm/_index.vue delete mode 100644 Code/Fe/src/components/StepsCountPlanForm/index.vue delete mode 100644 Code/Fe/src/components/StepsCountPlanForm/style/index.scss delete mode 100644 Code/Fe/src/components/StepsForm/_index.vue delete mode 100644 Code/Fe/src/components/StepsForm/index.vue delete mode 100644 Code/Fe/src/components/StepsForm/style/index.scss delete mode 100644 Code/Fe/src/components/commonTabel-drawer copy/index.vue delete mode 100644 Code/Fe/src/components/commonTabel-drawer copy/style/index.scss delete mode 100644 Code/Fe/src/components/handelFrom/index.vue delete mode 100644 Code/Fe/src/filters/excelOrReportsOption.js delete mode 100644 Code/Fe/src/filters/options.js delete mode 100644 Code/Fe/src/router/modules/baseConfig.js delete mode 100644 Code/Fe/src/router/modules/interfaceBoard.js delete mode 100644 Code/Fe/src/router/modules/systemManage.js diff --git a/Code/Fe/src/api/wms-api.js b/Code/Fe/src/api/wms-api.js index 4cd4c8c..0f1a718 100644 --- a/Code/Fe/src/api/wms-api.js +++ b/Code/Fe/src/api/wms-api.js @@ -162,81 +162,6 @@ export function postImportDown(url) { }) } -//开始计划 | 盘点计划 -export function planHandle(id, url, data) { - return request({ - url: baseURL + url + '/handle/' + id, - method: 'post', - params: data - }) -} -// 取消计划（生产计划为关闭） | 盘点计划 -export function postCancel(id, url) { - return request({ - url: baseURL + url + '/cancel/' + id, - method: 'post' - }) -} -// 中止 | 盘点计划 -export function postAbort(id, url) { - return request({ - url: baseURL + url + '/abort/' + id, - method: 'post' - }) -} -//完成 | 盘点计划 -export function postComplete(id,data,url) { - return request({ - url: baseURL + url + '/complete-by-type/' + id, - method: 'post', - params:data - }) -} -//阶段 - 校正库存 | 盘点计划 -export function ChangeStage(data, url) { - return request({ - url: baseURL + url + '/change-stage', - method: 'post', - params:data - }) -} -//拆分 | 盘点计划 -export function postCreateWithCondition(data, url) { - if (Object.keys(data).includes('company')) { - data.company = localStorage.getItem('company') - } - if (Object.keys(data).includes('warehouseCode')) { - data.warehouseCode =localStorage.getItem('warehouseCode') - } - return request({ - url: baseURL + url + '/create-with-condition', - method: 'post', - data - }) -} -//更新可用容量 -export function postUpdateAvailableCapacity(data, url) { - return request({ - url: baseURL + url + '/recalculate', - method: 'post', - params: data - }) -} -// 执行调整 | 盘点调整申请 -// export function ExecuteAdjusted(id) { -// return request({ -// url: baseURL + 'wms/store/count-adjust-note/ExecuteAdjusted/' + id, -// method: 'post', -// }) -// } -// 生成盘点调整申请 | 盘点记录 -export function StartAdjust(id) { - return request({ - // url: baseURL + 'wms/store/count-note/StartAdjust/' + id, - url: baseURL + 'wms/store/count-note/'+ id +'/generate-adjust-request', - method: 'post' - }) -} //---------------------------通用--------------------------- //获取详情 @@ -246,14 +171,6 @@ export function getDetailed(id, url) { method: 'get', }) } -//获取子表详情 -export function getDetailedSon(id, UrlData, url) { - return request({ - url: baseURL + url + '/detail/' + id, - method: 'get', - params: UrlData - }) -} //---------------------------只查询------------------------- //获取分页+筛选 export function getPage(data, url) { @@ -284,112 +201,6 @@ export function PrintServices(data) { data }) } -// 修改库存余额过期日期 | 库存余额 -export function updateExpireDate(data, url) { - return request({ - url: baseURL + url + '/update/expire-date', - method: 'post', - params: data - }) -} - -// 详情tabs页 通过code 获取列表 -export function getListByItemcode(data, url ){ - return request({ - url: baseURL + url + '/get-list-by-itemcode', - method: 'get', - params: data - }) -} - -// 详情tabs页 通过code 获取列表 -export function byItem(itemCode, url ){ - return request({ - url: baseURL + url + '/list/by-item/' + itemCode, - method: 'get' - }) -} - -// 详情tabs页 通过父物品号 获取列表 -export function byProduct(product, url ){ - return request({ - url: baseURL + url + '/get-list-by-product', - method: 'get', - params: product - }) -} - -// 详情tabs页 通过子物品号 获取列表 -export function byComponent(component, url ){ - return request({ - url: baseURL + url + '/get-list-by-component', - method: 'get', - params: component - }) -} - -// 详情tabs页 通过供应商 获取列表 -export function bySupplierCode(supplierCode, url ){ - return request({ - url: baseURL + url + '/get-list-by-supplier-code', - method: 'get', - params: supplierCode - }) -} - -// 详情tabs页 通过库位 获取列表 -export function byLocation(locationCode, url ){ - return request({ - url: baseURL + url + '/list/by-location/' + locationCode, - method: 'get', - }) -} - -// 详情tabs页 通过库位 获取列表 -export function byLocationCode(locationCode, url ){ - return request({ - url: baseURL + url + '/get-by-location-code', - method: 'get', - params: locationCode - }) -} - -// 详情tabs页 通过库位-零件关系 获取列表 -export function relationByLocationCode(locationCode, url ){ - return request({ - url: baseURL + url + '/by-location', - method: 'get', - params: locationCode - }) -} - -// 详情tabs页 通过子物品号 获取子层级列表 -export function byComponentCJ(component, url ){ - return request({ - url: baseURL + url + '/get-list-by-component-with-tree', - method: 'get', - params: component - }) -} - -//消息管理——用户消息类型关系——获取用户已有消息类型 -export function messageTypeSubscribe(id) { - return request({ - url: baseURL + 'message/message-type-subscribe/list/' + id, - method: 'get', - // params:id - }) -} - -//消息管理——用户消息类型关系——保存用户与消息类型关系 -export function messageTypeSubscribeCreateMany(data,id) { - return request({ - url: baseURL + 'message/message-type-subscribe/create-many', - method: 'post', - params:id, - data - }) -} //首页——获取当前用户未读消息 export function userNotifyNotReadList(userId) { @@ -424,185 +235,10 @@ export function notifyMessage(params, id) { }) } -// 库存-启用 | 库存余额 -// export function inventoryBalanceActive(id) { -// return request({ -// url: baseURL + 'wms/inventory/inventory-balance/active?id=' + id, -// method: 'post', -// }) -// } - -// 库存列表 -export function inventoryBalanceList(data) { - return request({ - url: baseURL + 'wms/inventory/Inventory-Balance/list', - method: 'post', - data - }) -} - -// 库存-启用 | 库存余额 改 -export function inventoryBalanceActive(params) { - return request({ - url: baseURL + 'wms/inventory/inventory-balance/' + params.id + '/active', - method: 'post', - params: params, - }) -} - -//库移——查询 | 库存转移日志 -export function byBalancesRequestManyParameter(data) { - return request({ - url: baseURL + 'wms/inventory/inventory-balance/by-balances-request-many-parameter', - method: 'post', - data - }) -} - -//库移——提交 | 库存转移日志 -export function inventoryTransferNote(data) { - return request({ - url: baseURL + 'wms/store/inventory-transfer-note', - method: 'post', - data - }) -} - -//库存管理——已占用库存——删除 -//库存管理——预填充库存——删除 -export function remove(id, url) { - return request({ - url: baseURL + url + '/remove/' + id, - method: 'post', - params: id - }) -} - -//发料任务——新增 | 自动发料任务 | 人工发料任务 -export function createAndHandle(data) { - return request({ - url: baseURL + 'wms/store/material-request/create-and-handle', - method: 'post', - data - }) -} - -// 人工叫料申请 | 人工发料任务 | 人工发料记录 | 自动叫料申请 | 自动发料任务 | 自动发料记录 | 直接发料记录 -// 完工收货缴库申请 | 线边仓缴库申请 | 线边仓缴库记录 | 线边仓报废申请 | 线边仓报废记录 | 原料报废记录 -export function materialRequestByType(data, url, params) { - let _type = params.type?params.type:params.requestType - return request({ - url: baseURL + url + '/' + _type, - method: 'post', - params: params, - data - }) -} - -// 采购收货——供应商发货通知——导入——确定（【批量创建】供应商发货通知） -export function supplierAsnCreateMany(data) { - return request({ - url: baseURL + 'wms/store/supplier-asn/create-many', - method: 'post', - data - }) -} - -// 调拨作废 -// export function transferRequestCancel(url, data ) { -// return request({ -// url: baseURL + url + '/cancel/' + data.id, -// method: 'post', -// params: data -// }) -// } - -// 打印之后调用 记录打印次数 | 原料直发客户记录 -export function sumPrint(number, url ) { - return request({ - url: baseURL + url + '/sum-print/' + number, - method: 'post' - }) -} - -// 线边仓调拨列表 | 上架前退货记录 | 采购上架记录 | 半成品上架记录 | 原料直发 -export function getPageListWip(data, url) { - return request({ - url: baseURL + url, - method: 'post', - data - }) -} - -// 线边仓调拨确认按钮 | 客户调拨确认按钮 | 自动发料记录 -export function confirm(id, url) { - return request({ - url: baseURL + url + '/confirm/' + id, - method: 'post', - }) -} - - // 采购收货记录-详情页TAB-不合格品收货明细/合格品收货明细/收货缺料明细 -export function purRecNoteCustomInfo( url,id ){ - return request({ - url: baseURL + 'wms/store/purchase-receipt-note/' + url + id, - method: 'get', - }) -} -// 质检-不合格转合格 -export function convertOk(data) { - return request({ - url: baseURL + 'wms/store/no-ok-convert-ok-notes', - method: 'post', - data - }) -} -// 获取全部供应商（codes）| 上架前退货记录 | 上架后退货记录 | 采购上架记录 -export function allSupplierByCodes(data) { - return request({ - url: baseURL + 'basedata/supplier/by-codes', - method: 'post', - data - }) -} - -// 根据code获取当前供应商信息 打印需要获取供应商信息（供应商简称等）相关位置 -export function getOneSupplierInfoByCode(code) { - return request({ - url: baseURL + 'basedata/supplier/by-code/' + code, - method: 'get' - }) -} - -// 根据code获取当前客户信息 打印需要获取供应商信息（客户地址等）相关位置 -export function getOneCustomerInfoByCode(code) { - return request({ - url: baseURL + 'basedata/customer/by-code/' + code, - method: 'get' - }) -} - // 获取版本编号 export function getVsersion() { return request({ url: window.SITE_CONFIG['versionUrl'] + `/version.json?t=${new Date().getTime()}`, method: 'get' }) -} - -// 安全库存预警 -export function getListPageSafety(data, url) { - return request({ - url: baseURL + url, - method: 'post', - data - }) -} - -// 根据编号获取字典信息 -// export function getDictByCode(code) { -// return request({ -// url: baseURL + 'basedata/dict/by-code/' + code, -// method: 'get', -// }) -// } \ No newline at end of file +} \ No newline at end of file diff --git a/Code/Fe/src/api/wms-auth.js b/Code/Fe/src/api/wms-auth.js index 5e8a635..7f88b9e 100644 --- a/Code/Fe/src/api/wms-auth.js +++ b/Code/Fe/src/api/wms-auth.js @@ -1,6 +1,5 @@ import request from '@/utils/request' let baseURL = localStorage.getItem('base') + '/api' -import axios from 'axios' export function login(data) { return request({ @@ -10,13 +9,6 @@ export function login(data) { }) } -export function getUsersByUserName(name) { - return request({ - url: baseURL + '/identity/users/by-username/'+name, - method: 'get', - }) -} - export function token(data) { return request({ // url: baseURL + '/token', @@ -39,15 +31,6 @@ export function logout() { }) } -//获取PC菜单 -export function getWebMenu(params) { - return request({ - url: baseURL + '/auth/user-menu/web-menu/' + params.userId, - method: 'get', - params: params - }) -} - //新建 export function postCreate(data) { return request({ @@ -228,39 +211,6 @@ export function getDetailed(id, url) { }) } -//新建 | 部门信息维护 -export function authCreate(data, url) { - if (Object.keys(data).includes('company')) { - data.company = localStorage.getItem('company') - } - if (Object.keys(data).includes('warehouseCode')) { - data.warehouseCode = localStorage.getItem('warehouseCode') - } - if(Object.keys(data).includes('worker')) { - data.worker = store.getters.name.userName - } - return request({ - url: baseURL + '/' + url, - method: 'post', - data - }) -} -//编辑 | 部门信息维护 -export function authUpdate(data, id, url) { - return request({ - url: baseURL + '/' + url + '/' + id, - method: 'put', - data - }) -} -//删除 | 部门信息维护 -export function authDelete(id, url) { - return request({ - url: baseURL + '/' + url + '/' + id, - method: 'delete', - }) -} - //------------------------------------- // 创建 | PC角色权限维护 export function postCreateRoles(data) { @@ -317,4 +267,12 @@ export function putpermissionsRoles(url, data) { method: 'put', data }) +} + +// faster-new +export function getUsersByUserName(name) { + return request({ + url: baseURL + '/identity/users/by-username/'+name, + method: 'get', + }) } \ No newline at end of file diff --git a/Code/Fe/src/api/wms-core.js b/Code/Fe/src/api/wms-core.js deleted file mode 100644 index d2e2a94..0000000 --- a/Code/Fe/src/api/wms-core.js +++ /dev/null @@ -1,56 +0,0 @@ -import request from '@/utils/request' -// let baseURL = localStorage.getItem('print') + '/api/' -let baseURL = localStorage.getItem('base') + '/api/' - -// 根据箱码获取标签相关信息 | 补打标签 -export function getOneInventoryLabelByCode(code) { - return request({ - url: baseURL + 'label/inventory-label/by-code/' + code, - method: 'get' - }) -} - -// 批量获取箱标签信息 | 到货请求 -export function getInventoryLabelByCodes(data) { - return request({ - url: baseURL + 'label/inventory-label/by-codes', - method: 'post', - data - }) -} - -//生产、采购生成标签（批量）| 标签管理模块 -export function postInventoryLabelCode(data) { - return request({ - url: baseURL + 'label/Inventory-label/generate-and-create/many', - method: 'post', - data - }) -} - -//生产、采购生成标签（一次多个）| 标签管理模块 -export function postInventoryLabelCode_count(params,data) { - return request({ - url: baseURL + 'label/inventory-label/generate-and-create/many/'+params.count, - method: 'post', - data - }) -} - -// 拆箱 | 标签管理-拆分箱标签 -export function postSplitPacking(data) { - return request({ - url: baseURL + 'wms/store/transfer-note/split-packing', - method: 'post', - data - }) -} - -// 拆箱记录列表 -export function splitPackingList(data) { - return request({ - url: baseURL + 'wms/store/transfer-note/get-split-packing-list', - method: 'post', - data - }) -} \ No newline at end of file diff --git a/Code/Fe/src/api/wms-job.js b/Code/Fe/src/api/wms-job.js index 249c750..0f5407a 100644 --- a/Code/Fe/src/api/wms-job.js +++ b/Code/Fe/src/api/wms-job.js @@ -1,24 +1,8 @@ import request from '@/utils/request' // let baseURL = process.env.VUE_APP_BASE_API + '/' let baseURL = localStorage.getItem('base') + '/api/' -//分页+筛选 -export function getPageList(data, url) { - return request({ - url: baseURL + url + '/list', - method: 'post', - data - }) -} -//分页+筛选 -export function getPage(data, url) { - return request({ - url: baseURL + url + '/count', - method: 'post', - data - }) -} -//---------------------------通用--------------------------- +//---------------------------通用--------------------------- //任务流程——承接 export function accept(url, data) { return request({ @@ -55,16 +39,6 @@ export function cancelAccept(url, data) { }) } -//任务流程——执行 -export function handle(data, params, url) { - return request({ - url: baseURL + url + '/handle/'+params.id, - method: 'post', - // params: params, - data - }) -} - //任务流程——打开 export function open(url, data) { return request({ @@ -72,166 +46,4 @@ export function open(url, data) { method: 'post', // params: data }) -} - - -//获取详情 -export function getDetailed(id, url) { - return request({ - url: baseURL + url + '/' + id, - method: 'get', - }) -} -//获取子表详情 -export function getDetailedSon(id, UrlData, url) { - return request({ - url: baseURL + url + '/detail/' + id, - method: 'get', - params: UrlData - }) -} - -//收货任务-执行 - 目检 -export function visualInspection( params,data) { - return request({ - url: baseURL + 'wms/job/purchase-receipt-job/save-detail-inspect/' + params.id, - method: 'post', - data - }) -} -// 收货任务-执行-待处理全部转合格 -export function AllPendingToQualified( id,params) { - return request({ - // url: baseURL + 'wms/job/purchase-receipt-job/set-inspect-status-with-not-inspect/' + id, - url: baseURL + 'wms/job/purchase-receipt-job/set-inspect-status-ok-by-inspect/' + id, - method: 'post', - params: params, - }) -} -// 收货任务-执行-重置目检状态 -export function resetSelectToInspect( id,data) { - return request({ - url: baseURL + 'wms/job/purchase-receipt-job/reset-many-detail-inspect/' + id, - method: 'post', - data: data, - }) -} - -//作废任务 -export function Invalid(url, id) { - return request({ - url: baseURL + url + '/invalid', - method: 'post', - params: id, - }) -} -//检查任务 -export function Check(url, id, data) { - return request({ - url: baseURL + url + '/check', - method: 'post', - params: id, - data - }) -} - - -//上架任务——执行 -export function HandleJob(data, id, url) { - return request({ - url: baseURL + url + '/handle-job', - method: 'post', - params: id, - data - }) -} - -//质检执行任务 -export function InspectJobHandle(data, params, url) { - return request({ - url: baseURL + url + '/handle', - method: 'post', - params: params, - data - }) -} - -// //发料任务——执行 -// export function issueJobHandle(data, params, url) { -// return request({ -// url: baseURL + url + '/handle', -// method: 'post', -// params: params, -// data -// }) -// } - -//人工发料任务 | 自动发料任务 -export function materialRequestByType(data, url, params,includeDetails) { - let _type = params.type?params.type:params.requestType - return request({ - url: baseURL + url + '/' + _type + '?includeDetails=' + (includeDetails || false), - method: 'post', - params: params, - data - }) -} - -//生产计划——更新备料计划 -export function productionPlanUpdate(data, detailId, id) { - return request({ - url: baseURL + 'wms/store/preparation-plan/details/' + id, - method: 'put', - params: detailId, - data - }) -} - -//生产计划——生产备料计划后查询乐观锁 -export function preparationPlanByNumber(params) { - return request({ - url: baseURL + 'wms/store/preparation-plan/by-number', - method: 'get', - params: params, - }) -} - -//质检——完成质检 -export function completeSummaryDetailStatus(params, data) { - return request({ - url: baseURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id, - method: 'post', - params: params, - data - }) -} - -//质检——设置默认状态（清除质检） -export function setDetailDefaultOkStatus(params, id, data) { - return request({ - url: baseURL + 'wms/store/inspect-job/set-detail-default-ok-status/' + id, - method: 'post', - params: params, - data - }) -} - -//质检——设置详情为合格 -export function setDetailOkStatus(params, id, data) { - return request({ - url: baseURL + 'wms/store/inspect-job/set-detail-ok-status/' + id, - method: 'post', - params: params, - data - }) -} - -//质检——设置详情为不合格 -export function setDetailNookStatus(params, id, data) { - return request({ - url: baseURL + 'wms/store/inspect-job/set-detail-nook-status/' + id, - method: 'post', - params: params, - data - }) -} +} \ No newline at end of file diff --git a/Code/Fe/src/components/PanThumb/index.vue b/Code/Fe/src/components/PanThumb/index.vue deleted file mode 100644 index 1bcf417..0000000 --- a/Code/Fe/src/components/PanThumb/index.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - diff --git a/Code/Fe/src/components/StepsCountPlanForm/_index.vue b/Code/Fe/src/components/StepsCountPlanForm/_index.vue deleted file mode 100644 index bf21d38..0000000 --- a/Code/Fe/src/components/StepsCountPlanForm/_index.vue +++ /dev/null @@ -1,654 +0,0 @@ - - - - \ No newline at end of file diff --git a/Code/Fe/src/components/StepsCountPlanForm/index.vue b/Code/Fe/src/components/StepsCountPlanForm/index.vue deleted file mode 100644 index 26990ac..0000000 --- a/Code/Fe/src/components/StepsCountPlanForm/index.vue +++ /dev/null @@ -1,723 +0,0 @@ - - - - \ No newline at end of file diff --git a/Code/Fe/src/components/StepsCountPlanForm/style/index.scss b/Code/Fe/src/components/StepsCountPlanForm/style/index.scss deleted file mode 100644 index 9901959..0000000 --- a/Code/Fe/src/components/StepsCountPlanForm/style/index.scss +++ /dev/null @@ -1,86 +0,0 @@ -#stepsForm { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - - ::v-deep .el-steps { - padding-bottom: 15px; - - .el-step__main { - .el-step__title { - line-height: 24px; - font-size: 14px; - } - } - } - - .page1 { - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - } - - .page2 { - flex: 1; - overflow: hidden; - position: relative; - - ::v-deep & >.el-dialog { - width: 100%; - height: 100%; - - & >.el-dialog__header { - padding: 0 !important; - } - - & > .el-dialog__body { - padding-top: 0; - } - } - } - - .page3 { - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - padding-bottom: 54px; - overflow: hidden; - overflow-y: auto; - - ::v-deep .el-form { - flex: 1; - display: flex; - flex-direction: column; - - .el-row { - flex: 1; - flex-wrap: wrap; - overflow: hidden; - overflow-y: auto; - } - - .formTable-box { - flex: 1; - overflow: hidden; - overflow-y: auto; - - .el-form-item__content { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - margin: 0 !important; - } - } - } - ::v-deep .formButton { - position: absolute; - bottom: 0; - right: 0; - z-index: 3; - } - } -} \ No newline at end of file diff --git a/Code/Fe/src/components/StepsForm/_index.vue b/Code/Fe/src/components/StepsForm/_index.vue deleted file mode 100644 index 1c1ebee..0000000 --- a/Code/Fe/src/components/StepsForm/_index.vue +++ /dev/null @@ -1,459 +0,0 @@ - - - \ No newline at end of file diff --git a/Code/Fe/src/components/StepsForm/index.vue b/Code/Fe/src/components/StepsForm/index.vue deleted file mode 100644 index 1465b64..0000000 --- a/Code/Fe/src/components/StepsForm/index.vue +++ /dev/null @@ -1,551 +0,0 @@ - - - \ No newline at end of file diff --git a/Code/Fe/src/components/StepsForm/style/index.scss b/Code/Fe/src/components/StepsForm/style/index.scss deleted file mode 100644 index 5169c0c..0000000 --- a/Code/Fe/src/components/StepsForm/style/index.scss +++ /dev/null @@ -1,134 +0,0 @@ -#stepsForm { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - - ::v-deep .el-steps { - padding-bottom: 15px; - - .el-step__main { - .el-step__title { - line-height: 24px; - font-size: 14px; - } - } - } - - .page1 { - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - overflow: hidden; - overflow-y: auto; - } - - .page2 { - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - padding-bottom: 54px; - overflow: hidden; - overflow-y: auto; - - ::v-deep .el-form { - flex: 1; - display: flex; - .el-row { - display: none; - } - - .formTable-box { - flex: 1; - overflow: hidden; - overflow-y: auto; - - .el-form-item__content { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - margin: 0 !important; - - .heder { - padding: 5px 0; - text-align: center; - font-size: 18px; - - button{ - margin: 0 10px; - } - } - - .el-table { - flex: 1; - - .childTable { - display: flex; - justify-content: space-around; - - span { - cursor: pointer; - - &:nth-child(1) { - color: red; - } - - &:nth-child(2) { - color: green; - } - } - } - } - } - } - } - - ::v-deep .formButton { - position: absolute; - bottom: 0; - right: 0; - z-index: 3; - } - } - - .page3 { - flex: 1; - display: flex; - flex-direction: column; - padding-bottom: 54px; - overflow: hidden; - overflow-y: auto; - - ::v-deep .el-form { - flex: 1; - display: flex; - flex-direction: column; - - .el-row { - flex: 1; - flex-wrap: wrap; - } - - .formTable-box { - flex: 1; - - .el-form-item__content { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - margin: 0 !important; - } - } - } - ::v-deep .formButton { - position: absolute; - bottom: 0; - right: 0; - z-index: 3; - } - } -} diff --git a/Code/Fe/src/components/UploadExcel/index.vue b/Code/Fe/src/components/UploadExcel/index.vue index e242060..bd1a0af 100644 --- a/Code/Fe/src/components/UploadExcel/index.vue +++ b/Code/Fe/src/components/UploadExcel/index.vue @@ -97,8 +97,6 @@ - \ No newline at end of file diff --git a/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss b/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss deleted file mode 100644 index 4451c6f..0000000 --- a/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss +++ /dev/null @@ -1,137 +0,0 @@ -.el-drawer__wrapper { - z-index: 10 !important; - position: absolute; - left: 32%; - overflow: visible; - // height:calc(100% - 28px); - // top: 14px; - // right:14px - - ::v-deep .el-drawer { - height: 100%; - overflow: visible; - box-shadow: 0 8px 10px -5px rgb(0 0 0 / 15%), 0 16px 24px 2px rgb(0 0 0 / 9%), 0 6px 30px 5px rgb(0 0 0 / 7%); - - .el-drawer__body { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - - .drawer-heder { - display: flex; - padding: 15px 10px; - justify-content: space-between; - align-items: center; - - .heder-left { - display: flex; - justify-content: space-between; - - .heder-img { - width: 40px; - height: 40px; - margin-right: 10px; - } - - .header-text { - padding:0 20px; - display: flex; - flex-direction: column; - justify-content: space-between; - - span:nth-child(1) { - color: #333; - font-size: 22px; - } - - span:nth-child(2) { - color: #999; - font-size: 16px; - } - } - } - } - - .Descriptions { - padding: 0 10px; - } - - .drawer-main { - // padding-top: 20px; - flex: 1; - overflow: hidden; - // background-color: #efefef; - padding: 10px 20px 20px 30px; - border-top: solid 5px #f6f6f6; - - .el-tabs { - height: 100%; - display: flex; - flex-direction: column; - .el-tabs__header{ - // padding-bottom: 5px ; - .el-tabs__nav{ - z-index: auto !important; - } - } - - .el-tabs__content { - flex: 1; - - .el-tab-pane { - width: 100%; - height: 100%; - overflow-y: auto; - } - - .el-descriptions-item__label { - padding-right: 40px; - } - } - } - } - - .drawer-Shut { - width: 35px; - height: 100px; - position: absolute; - top: 200px; - left: -35px; - - .el-button { - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; - - ::v-deep span { - font-size: 12px; - letter-spacing: 10px; - writing-mode: tb-rl; - } - } - } - } - } -} - -::v-deep .el-tabs__nav-wrap::after{ - content: unset !important; -} - -.currenTabel-drawer-mx-header{ - text-align: right; - padding: 0 10px 10px 0; -} - -.detailFiltersPopPage{ - position: absolute; - right: 0; - left: 0; - height: 240px; - .fullPageCover{ - height: calc(100vh - 300px) !important; - } -} \ No newline at end of file diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue index d93c568..ab4e34b 100644 --- a/Code/Fe/src/components/commonTabel-drawer/index.vue +++ b/Code/Fe/src/components/commonTabel-drawer/index.vue @@ -125,27 +125,6 @@ - - - - diff --git a/Code/Fe/src/components/handelFrom/index.vue b/Code/Fe/src/components/handelFrom/index.vue deleted file mode 100644 index 9d98b48..0000000 --- a/Code/Fe/src/components/handelFrom/index.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - \ No newline at end of file diff --git a/Code/Fe/src/filters/excelOrReportsOption.js b/Code/Fe/src/filters/excelOrReportsOption.js deleted file mode 100644 index b0c92cb..0000000 --- a/Code/Fe/src/filters/excelOrReportsOption.js +++ /dev/null @@ -1,53 +0,0 @@ -/** - * - * @returns {Array} '导入表格模板字段' - */ -// 供货商导入表格 -export const supplierAsnExcel = { - // poNumber:"订单号", - // number:"发货单号", - supplierCode:"供应商代码", - planUserCode:"筹措员代码", - planArriveDate:"要求到货时间", - shipDate:"发货日期", - details:{ - projectCode:"明细-项目编号", - itemCode:"明细-物品代码", - ctype:"明细-类型", - recommendErpCode:"明细-指定ERP储位", - qty:"明细-发货数量", - uom:"明细-物品单位", - lot:"明细-生产批次", - produceDate:"明细-生产时间", - expireDate:"明细-过期时间", - packingCode:"明细-箱标签", - }, - remark:"订单备注", -} - -// 报表地址 -// const reportsUrl = "http://10.164.1.39:59088/#/reports/"; -const reportsUrl = localStorage.getItem('reportsUrl') -// 报表文件地址 -export const reportsAddress = { - PurchaseReceiptSummary:reportsUrl + '202211300914188516.rdlx',//采购收货汇总表 - Inventory_Detail:reportsUrl + '202211291142233052.rdlx',//库存账龄明细 - InventoryAccountingPeriodDetails:reportsUrl + '202211300913580741.rdlx',//库存单据明细报表 - FinishedProductDeliverySummary:reportsUrl + '202211300920074461.rdlx',//成品发货汇总表 - CompletionReceiptSummary:reportsUrl + '202211300919413598.rdlx',//完工收货汇总表 - UnPlannedReceiptSummary:reportsUrl + '202211300921294414.rdlx',//非生产退料汇总（原计划外入库汇总） - UnplannedDeliverSummary:reportsUrl + '202211300921505958.rdlx',//非生产领料汇总（原计划外出库汇总） - Scrap_Detail:reportsUrl + '202211300912414755.rdlx',//报废明细表 - PurchaseSum:reportsUrl + '202211300913268367.rdlx',//订单汇总查询 - PurchaseReturnSummary:reportsUrl + '202211300925599696.rdlx',//采购退货汇总 - ProductionReturnSummary:reportsUrl + '202211300918259711.rdlx',//生产退料汇总表 - ProductionIssueSummary_dy:reportsUrl + '202211300917169689.rdlx',//生产发料汇总表 - InventoryBlanace:reportsUrl + '202211300922434081.rdlx',//库存余额报表 - InventorySummary:reportsUrl + '202211300921065163.rdlx',//盘点记录汇总表 - InventoryAgingSegmentSummary:reportsUrl + '202211300912101560.rdlx',//库存账龄分段汇总表 - InventoryBookDetail:reportsUrl + '202212162111466911.rdlx',//库存流水帐明细 - InventoryBookSummary:reportsUrl + '202212162112124488.rdlx',//库存流水帐汇总 - inventoryBalanceReportLocationCode:reportsUrl + '202211300922434082.rdlx',//库存余额报表按库位 - inventoryBalanceReportLocationErpCode:reportsUrl + '202211300922434083.rdlx',//库存余额报表按ERP库位 - InventoryBookSummaryLocation:reportsUrl + '202212162112124489.rdlx',//库存流水帐汇总(库位) -} diff --git a/Code/Fe/src/filters/options.js b/Code/Fe/src/filters/options.js deleted file mode 100644 index 2c27566..0000000 --- a/Code/Fe/src/filters/options.js +++ /dev/null @@ -1,267 +0,0 @@ -/** - * - * @returns {Array} '权限' - */ - -export function Roles(val){ - const role={ - // 通用 - "Create": "创建", - // "Edit": "修改", - "Update": "修改", - "Delete": "删除", - - // 身份标识管理（AbpIdentity） - "AbpIdentity": "身份标识管理", - - // 特性管理（FeatureManagement） - "FeatureManagement": "特性管理", - - // 设置管理（SettingManagement） - "SettingManagement": "设置管理", - - // 租户管理（AbpTenantManagement） - "AbpTenantManagement": "租户管理", - - // 认证（Auth） - "Auth": "认证", - //Auth-子集 - "Department": "部门", - /**/ - - // 基础数据（Basedata） - "Basedata": "基础数据", - //Basedata-子集 - "Currency": "货币", - "CurrencyExchange": "货币兑换", - "CustomerBom": "用户清单", - "InventoryRoute": "库存路径", - "TransactionType": "交易类型", - "ProductionLineItem": "产品类项目", - "Machine": "生产线", - "Param": "参数", - "PurchasePriceSheet": "采购价格表", - "Rule": "规则", - "Strategy": "战略", - "StrategyRule": "战略规则", - "Route": "路线", - "SalePriceSheet": "销售价格表", - "StdCostPriceSheet": "标准价格表", - "WorkShop": "车间", - "WorkGroup": "工作组", - "ItemGuideBook": "指导书", - /**/ - - // 库存（Inventory） - "Inventory": "库存", - //Inventory-子集 - "Container": "库存容量", - "LocationCapacity": "库存可用容量", - /**/ - - // 任务（Job） - "Job": "任务", - //Job-子集 - "CheckJob": "校验任务", - "UnplannedIssueJob":"计划外出库任务", - "UnplannedReceiptJob":"计划外入库任务", - "ProductionReturnJob":"生产退库任务", - /**/ - - // 仓库（Store） - "Store": "仓库", - //Store-子集 - "WorkOrder": "工作订单", - "ProductionReturnNote":"生产退库记录", - "InventoryTransferNote": "调拨发货", - "Print":"打印", - "Shipments": "发货任务（天津）", - "Instruments": "器具查询（天津）", - "ReceivingRecords": "收货记录（天津）", - "DeliveryRecord": "发货记录（天津）", - "CountAdjust": "库存调整", - "UnplannedIssueRequest":"非生产退料申请", - "UnplannedReceiptRequest":"非生产领料申请", - "ProductionReturnRequest":"生产退库申请", - "PurchaseReturnRequest": "采购退货申请", - "ProductRecycleRequest": "成品回收申请", - "NoOkConvertOkNote":"不合格转合格", - "PutawayRequest": "上架申请", - /**/ - - // 标签（Label） - "labelsList":"标签查询", - "Label": "标签", - //Label-子集 - "PalletLabel":"托盘标签", - "ProductionLabel":"生产标签", - "PurchaseLabel":"采购标签", - "SaleLabel":"销售标签", - "PalletCode":"托盘编码", - "SerialCode":"序列代码", - "CountLabel":"盘点标签", - /**/ - - // 消息通知（Message） - "Message": "消息通知", - //Message-子集 - "Announcement":"公告", - "NotifyMessage":"通知", - "PrivateMessage":"私人消息", - "MessageType":"消息类型", - "MessageTypeSubscribe":"消息订阅类型", - "UserNotifyMessage":"用户通知消息", - /**/ - - // 文件存储（FileStorage） - "FileStorage":"文件存储", - //FileStorage-子集 - "DataImportTask":"数据导入任务", - "DataExportTask":"数据导出任务", - /**/ - - // 以下数据为接口已翻译20221103 - /**/ - //Basedata基础数据-子集 - // "Warehouse": "仓库", - // "Area": "区域", - // "AreaItem": "区域零件", - // "Bom": "物品清单", - // "InterfaceCalendar": "日历接口", - // "Calendar": "日历", - // "Company": "公司", - // "Customer": "客户", - // "CustomerItem": "客户物品", - // "WorkStation": "工作中心", - // "Team": "班组", - // "Supplier": "供应商", - // "SupplierItem": "供应商物品", - // "Project": "项目", - // "Shift": "班次", - // "Uom": "计量单位", - // "ItemBasic": "物品基础信息", - // "ItemCategory": "物品分类信息", - // "ItemPack": "物品包装信息", - // "Category": "分类", - // "Dock": "收货口", - // "LocationGroup": "库位组", - // "Location": "库位", - // "ProductionLine": "生产线", - // "Configuration": "配置", - // "ItemQuality": "物品质量信息", - // "AQL": "物品质检标准", - // "SupplierTimeWindow": "供应商时间窗口", - // "ItemStoreRelation": "库位零件关系维护", - // "CustomerAddress": "客户地址", - /**/ - //Inventory库存-子集 - // "Balance": "库存余额", - // "Snapshot": "库存快照", - // "Transaction": "库存事务", - // "TransferLog": "库存转移日志", - /**/ - //Job任务-子集 - // "PurchaseReceiptJob": "采购收货任务", - // "InspectJob": "检验任务", - // "PutawayJob": "上架任务", - // "IssueJob": "发料任务", - // "DeliverJob": "发货任务", - // "PurchaseReturnJob": "采购退货任务", - // "ProductReceiveJob": "完工收货任务", - // "CountJob": "盘点任务", - /**/ - //Store仓库-子集 - // "PurchaseOrder": "采购订单", - // "SaleOrder": "销售订单", - // "SupplierAsn": "供应商ASN", - // "CustomerAsn": "客户发货通知", - // "ProductionPlan": "生产计划", - // "PreparationPlan": "备料计划", - // "ProductReceiptNote": "完工收货记录", - // "OfflineSettlementNote": "下线结算记录", - // "PurchaseReceiptRequest": "到货请求", - // "PurchaseReceiptNote": "采购收货记录", - // "ReceiptAbnormalNote": "收货异常记录", - // "PurchaseReturnNote": "采购退货记录", - // "PutawayNote": "上架记录", - // "MaterialRequest": "要料申请", - // "IssueNote": "发料记录", - // "UnplannedReceiptNote": "计划外入库记录", - // "UnplannedIssueNote": "计划外出库记录", - // "IsolationNote": "隔离记录", - // "ScrapNote": "报废记录", - // "DeliverPlan": "发货计划", - // "DeliverRequest": "发货申请", - // "DeliverNote": "发货记录", - // "CountPlan": "盘点计划", - // "CountNote": "盘点记录", - // "CountAdjustNote": "盘点差异调整记录", - // "InspectRequest": "报检单", - // "InspectNote": "检验记录", - // "InspectAbnormalNote": "质量异常记录", - // "ProductRecycleNote": "成品回收记录", - // "CustomerReturnNote": "客户退库记录", - /**/ - - // 以下数据接口数据不存在20221103 - /**/ - // "InventoryLocationCapacity": "库位可用容量", - // "Workshop": "车间", - // "FISDeliverRequest":"FIS发货申请", - // "FISDeliverNote":"FIS发货记录", - // "Occupied": "已占用库存", - // "Predictable": "预填充库存", - // "TracebackNote": "追溯记录", - // "StockReturnNote": "退库记录", - // "UserManage": "用户", - // "RoleManage": "权限控制", - // "Identity": "身份", - // "management": "管理", - // "Role management": "角色", - // // "Change": "修改", - // "Change permissions": "修改权限", - // "User management": "用户", - // "Manage Host features": "管理主机功能", - // "Tenant management": "租户", - // "Manage features": "管理功能", - // "Manage connection strings": "管理连接", - // "Permission": "权限", - // "PdaUserManage": "PDA控制", - // "Param": "参数", - // "Rule ": "规则", - // "DocumentSetting": "文档设置", - // "ItemSafetyStock": "物品安全库存", - // // "UserDepartment": "用户部门对应关系", - // "accountPeriodNote": "账期信息", - // "UserNotifyMessage":"用户消息类型关系", - // //调拨-线边仓 - // "lineSideWarehouseAllocationRequest":"线边仓调拨申请", - // "lineSideWarehouseAllocationConfirm":"线边仓调拨确认", - // "lineSideWarehouseAllocationNote":"线边仓调拨记录", - // //调拨-储位间 - // "interStorageAllocationApply":"储位间调拨申请", - // "interStorageAllocationConfirm":"储位间调拨确认", - // "interStorageAllocationNote":"储位间调拨记录", - // //调拨-客户储位 - // "customerStorageAllocationRequest":"客户储位调拨申请", - // "customerStorageAllocationConfirm":"客户储位调拨确认", - // "customerStorageAllocationNote":"客户储位调拨记录", - // //东阳-追溯记录 - // "backFlushNote":"追溯记录", - // //东阳-退拆 - // "customerDismantle":"退拆申请", - // "customerDismantleNote":"退拆记录", - // //回收料 - // "materialsAdjustment":"回收料调整记录", - // "recycledMaterialsAdjustmentApply":"回收料调整申请", - // "recycledMaterialsReceipt":"回收料收货记录", - // // 自定义 - // "beforeGroundingReturnNote": "上架前退货记录", - // // 非生产领料 - // "pickingRequest":"非生产领料申请", - // // 非生产退料 - // "materialReturnRequest":"非生产退料申请" - } - return role[val] -} - diff --git a/Code/Fe/src/filters/statusType.js b/Code/Fe/src/filters/statusType.js index 255e975..95abfe2 100644 --- a/Code/Fe/src/filters/statusType.js +++ b/Code/Fe/src/filters/statusType.js @@ -1,7 +1,5 @@ import * as status from "./status" -import * as options from "./options" const filters = { - ...status, - ...options + ...status } export default filters diff --git a/Code/Fe/src/layout/components/Navbar.vue b/Code/Fe/src/layout/components/Navbar.vue index 4fed093..5a4f586 100644 --- a/Code/Fe/src/layout/components/Navbar.vue +++ b/Code/Fe/src/layout/components/Navbar.vue @@ -38,10 +38,10 @@ 系统首页 - + + 退出登录 diff --git a/Code/Fe/src/mixins/TableHeaderMixins.js b/Code/Fe/src/mixins/TableHeaderMixins.js index d1c9a9f..6814364 100644 --- a/Code/Fe/src/mixins/TableHeaderMixins.js +++ b/Code/Fe/src/mixins/TableHeaderMixins.js @@ -1,8 +1,6 @@ import { getPageList, postExport, - postUpdateAvailableCapacity, - fileStorage } from "@/api/wms-api" import * as allUrlOption from '@/utils/baseData/urlOption' @@ -99,28 +97,6 @@ export const TableHeaderMixins = { else if (val == 'filterForDetail'){ this.changeFilterForDetailShow(true) } - //更新可用容量 - else if (val == 'refresh-capacity') { - this.Loading.appMainLoading = true - let count = 0 - this.tableData.forEach(element => { - postUpdateAvailableCapacity({ - locationCode: element.locationCode - }, this.URLOption_base).then(res => { - count += 1 - if (count == this.tableData.length) { - this.Loading.appMainLoading = false - this.paging() - } - }).catch(err => { - count += 1 - if (count == this.tableData.length) { - this.Loading.appMainLoading = false - this.paging() - } - }) - }) - } // 自定义按钮 // 批量打印 ； 不合格转合格 else if(val == 'custom'){ item.customHandle() diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js index a4618d6..89ac45e 100644 --- a/Code/Fe/src/mixins/TableMixins.js +++ b/Code/Fe/src/mixins/TableMixins.js @@ -1,7 +1,6 @@ import { getPageList, getDetailed, - allSupplierByCodes, postDelete } from '@/api/wms-api' import * as allUrlOption from '@/utils/baseData/urlOption' @@ -169,70 +168,6 @@ export const tableMixins = { handleSelectionChange(val) { this.multipleSelection = val; }, - // 获取供应商信息过滤tableData - getSupplierByCodesHandle_table() { - for(let i=0;i{ - if(item.supplierCode && item.supplierCode.length > 0 && _allSuCode.indexOf(item.supplierCode) < 0){ - _allSuCode.push(item.supplierCode) - } - }) - if(_allSuCode.length <= 0){ - this.Loading.tableLoading = false - return - } - allSupplierByCodes(_allSuCode).then(res => { - let _all = [] - res.forEach(item=>{ - _all[item.code] = item - }) - this.tableData.forEach(item=>{ - if(_all[item.supplierCode]){ - this.$set(item,"supplierName", _all[item.supplierCode].name) - this.$set(item,"supplierAddress", _all[item.supplierCode].address) - this.$set(item,"supplierShortName", _all[item.supplierCode].shortName) - } - }) - this.Loading.tableLoading = false - }).catch(err => { - console.log(err) - this.Loading.tableLoading = false - }) - return - }else{ - this.Loading.tableLoading = false - } - } - }, - // 获取供应商信息过滤propsData - getSupplierByCodesHandle_props() { - for(let i=0;i { - this.Loading.DrawerLoading = false - if(res.length > 0){ - this.$set(this.propsData,"supplierName", res[0].name) - this.$set(this.propsData,"supplierAddress", res[0].address) - this.$set(this.propsData,"supplierShortName", res[0].shortName) - } - }).catch(err => { - console.log(err) - this.Loading.DrawerLoading = false - }) - return - }else{ - this.Loading.DrawerLoading = false - } - } - }, // 主列表操作列按钮执行方法 /** * @@ -289,7 +224,6 @@ export const tableMixins = { pagingCallback(callback){ this.Loading.tableLoading = false if(callback)callback() - // this.getSupplierByCodesHandle_table() }, // 筛选前端查询 // detailFiltersSearch(options){ @@ -331,7 +265,6 @@ export const tableMixins = { // 点击抽屉，获取明细后全局通用操作 inlineDialogCallback(){ this.Loading.DrawerLoading = false - // this.getSupplierByCodesHandle_props() } } } diff --git a/Code/Fe/src/router/index.js b/Code/Fe/src/router/index.js index 04dc6d3..f94fb44 100644 --- a/Code/Fe/src/router/index.js +++ b/Code/Fe/src/router/index.js @@ -8,9 +8,6 @@ Vue.use(Router) import Layout from '@/layout' /* Router Modules */ -import baseConfig from './modules/baseConfig' -import interfaceBoardRouter from './modules/interfaceBoard' -import systemManage from './modules/systemManage' /** * Note: sub-menu only appear when route children.length >= 1 @@ -107,9 +104,6 @@ export let constantRoutes = [ export let asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ // 404 page must be placed at the end !!! - // baseConfig, - // interfaceBoardRouter, - // systemManage, // { // path: '*', // redirect: '/404', diff --git a/Code/Fe/src/router/modules/baseConfig.js b/Code/Fe/src/router/modules/baseConfig.js deleted file mode 100644 index 0106f56..0000000 --- a/Code/Fe/src/router/modules/baseConfig.js +++ /dev/null @@ -1,25 +0,0 @@ -import Layout from '@/layout' -import { initFromApiColumnsLable } from '@/utils/index' -const interfaceBoardRouter = { - path: '/basicConfig', - alwaysShow:true, - component: Layout, - redirect: 'noRedirect', - meta: { - title: '基础数据管理', - icon: '基础数据管理', - roles:'skip' - }, - children: [{ - path: 'ExportCustomUserSetting', - name: 'ExportCustomUserSetting', - component: () => import('@/views/basicConfig/ExportCustomUserSetting'), - meta: { - title: initFromApiColumnsLable('ExportCustomUserSetting'),//导出配置 - icon: '用户', - roles: 'skip' - } - }, - ] -} -export default interfaceBoardRouter diff --git a/Code/Fe/src/router/modules/interfaceBoard.js b/Code/Fe/src/router/modules/interfaceBoard.js deleted file mode 100644 index 536c1db..0000000 --- a/Code/Fe/src/router/modules/interfaceBoard.js +++ /dev/null @@ -1,25 +0,0 @@ -import Layout from '@/layout' -import { initFromApiColumnsLable } from '@/utils/index' -const interfaceBoardRouter = { - path: '/interfaceBoard', - alwaysShow:true, - component: Layout, - redirect: 'noRedirect', - meta: { - title: '接口看板管理', - icon: '报表查看', - roles:'skip' - }, - children: [{ - path: 'TestSchool', - name: 'TestSchool', - component: () => import('@/views/interfaceBoard/TestSchool'), - meta: { - title: initFromApiColumnsLable('TestSchool'), - icon: '用户', - roles: 'skip' - } - }, - ] -} -export default interfaceBoardRouter diff --git a/Code/Fe/src/router/modules/systemManage.js b/Code/Fe/src/router/modules/systemManage.js deleted file mode 100644 index a91c2fc..0000000 --- a/Code/Fe/src/router/modules/systemManage.js +++ /dev/null @@ -1,44 +0,0 @@ -import Layout from '@/layout' -const systemManageRouter = { - path: '/systemManage', - component: Layout, - redirect: 'noRedirect', - meta: { - title: '系统权限管理', - icon: '系统权限控制', - roles:'skip' - }, - children: [{ - path: 'UserManage', - name: 'userManage', - component: () => import('@/views/systemManage/userManage'), - meta: { - title: '用户信息维护', - icon: '用户', - roles: 'AbpIdentity.Users' - } - }, - { - path: 'RoleManage', - name: 'roleManage', - component: () => import('@/views/systemManage/roleManage'), - meta: { - title: '权限信息维护', - icon: '权限控制', - roles: 'AbpIdentity.Roles' - } - }, - // { - // path: 'pcMenu', - // name: 'pcMenu', - // // hidden: true, - // component: () => import('@/views/systemManage/pcMenu'), - // meta: { - // title: 'PC权限菜单', - // icon: 'PDA权限菜单', - // roles: 'Auth.Menu' - // } - // }, - ] -} -export default systemManageRouter diff --git a/Code/Fe/src/store/getters.js b/Code/Fe/src/store/getters.js index a0588a6..48b96d8 100644 --- a/Code/Fe/src/store/getters.js +++ b/Code/Fe/src/store/getters.js @@ -10,9 +10,9 @@ const getters = { name: state => state.user.name, introduction: state => state.user.introduction, roles: state => state.user.roles, + currentUserInfo: state => state.user.userInfo, permission_routes: state => state.permission.routes, errorLogs: state => state.errorLog.logs, dictionaries: state => state.dictionaries.dict, - currentUserInfo: state => state.user.userInfo, } export default getters diff --git a/Code/Fe/src/utils/utils.js b/Code/Fe/src/utils/utils.js index 5493136..43be3e5 100644 --- a/Code/Fe/src/utils/utils.js +++ b/Code/Fe/src/utils/utils.js @@ -60,8 +60,6 @@ import pagination from "@/components/Pagination" //分页器 import conditionFilters from "@/components/conditionFilters" //高级筛选 import searchPage from '@/components/searchPage' //autocomplete拉取数据探弹窗 import newAndEdiDialog from '@/components/newAndEdiDialog' //普通新增与编辑 -import stepsForm from '@/components/StepsForm' //步骤新增 -import handelFrom from '@/components/handelFrom' //执行表单 import umyTable from '@/components/umyTable' // 用于数据量过大table import filterForDetailPage from '@/components/filterForDetailPage' //明细查询 import newAndEdiDialogForDetail from '@/components/newAndEdiDialogForDetail' //普通新增与编辑(带明细) @@ -115,8 +113,6 @@ Vue.component('conditionFilters', conditionFilters) Vue.component('searchPage', searchPage) Vue.component('newAndEdiDialog', newAndEdiDialog) Vue.component('newAndEdiDialogForDetail', newAndEdiDialogForDetail) -Vue.component('stepsForm', stepsForm) -Vue.component('handelFrom', handelFrom) Vue.component('umyTable', umyTable) Vue.component('filterForDetailPage', filterForDetailPage) Vue.prototype.$echarts = eCharts