diff --git a/.env.development b/.env.development index e561048..b2220f6 100644 --- a/.env.development +++ b/.env.development @@ -5,13 +5,6 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" -## wms -VUE_APP_URL = "http://127.0.0.1:4523/m1/4061550-0-default" -## 安瑞 -##VUE_APP_URL = "http://127.0.0.1:4523/m1/613533-0-default" -##VUE_APP_URL = "http://192.168.2.117:7301" -##VUE_APP_REPORT_URL = "https://lpk.yyundong.com" -##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/wms" -##VUE_APP_URL = "https://supervise.yxtsoft.com" +##VUE_APP_URL = "http://192.168.1.47:8111" +VUE_APP_URL = "https://wms.yxtsoft.com" diff --git a/package.json b/package.json index 4fd5f68..08a3dc6 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "core-js": "^3.8.3", "echarts": "^5.4.3", "ejs": "^2.7.4", + "element-china-area-data": "^6.1.0", "element-ui": "^2.15.14", "js-cookie": "2.2.0", "moment": "^2.29.1", diff --git a/src/api/baseinfo/brands/brand.js b/src/api/baseinfo/brands/brand.js deleted file mode 100644 index b8d23d5..0000000 --- a/src/api/baseinfo/brands/brand.js +++ /dev/null @@ -1,49 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodsbrand/listPage', - method: 'post', - data: params, - }) - }, - - // 类别查询 - getAllBrand: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodsbrand/listAll', - method: 'get' - }) - }, - - - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable - }); - }, - - - // 新增、保存 - saveBrands: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodsbrand/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 初始化 - initBrands: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodsbrand/initialization/' + data, - method: 'get' - }); - }, - - -} diff --git a/src/api/baseinfo/category/category.js b/src/api/baseinfo/category/category.js deleted file mode 100644 index 4523584..0000000 --- a/src/api/baseinfo/category/category.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/listPage', - method: 'post', - data: params, - }) - }, - - // 类别查询 - getAllType: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/listAll', - method: 'get' - }) - }, - - - // 修改是否可用状态 - updateIsEnable: function(sid, isEnable) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable - }); - }, - - // 修改是否一品一码 - updateIsGoodsID: function(sid, isGoodsID) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID - }); - }, - - // 新增、保存 - saveTypes: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 初始化 - initTypes: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodstype/initialization/' + data, - method: 'get' - }); - }, - - -} diff --git a/src/api/baseinfo/factory/factory.js b/src/api/baseinfo/factory/factory.js deleted file mode 100644 index df6af06..0000000 --- a/src/api/baseinfo/factory/factory.js +++ /dev/null @@ -1,48 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/listPage', - method: 'post', - data: params, - }) - }, - - // 厂家查询 - getAllFacturer: function(params) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/listAll', - method: 'get' - }) - }, - - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable - }); - }, - - - // 新增、保存 - saveFacturer: function(data) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 初始化 - initFacturer: function(data) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/initialization/' + data, - method: 'get' - }); - }, - - -} diff --git a/src/api/baseinfo/goods/goods.js b/src/api/baseinfo/goods/goods.js deleted file mode 100644 index 0fd74e5..0000000 --- a/src/api/baseinfo/goods/goods.js +++ /dev/null @@ -1,39 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodsspu/listPage', - method: 'post', - data: params, - }) - }, - - // 修改是否可用状态 - updateIsEnable: function(sid, isEnable) { - return request({ - url: '/wms/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable - }); - }, - - // 新增、保存 - saveGoods: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 初始化 - initGoods: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data, - method: 'get' - }); - }, - - -} diff --git a/src/api/baseinfo/supplier/supplier.js b/src/api/baseinfo/supplier/supplier.js new file mode 100644 index 0000000..1f9738d --- /dev/null +++ b/src/api/baseinfo/supplier/supplier.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +export default { + // 列表查询 + listPage: function(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存 + saveOrUpdate: function(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 回显 + fetchDetailsBySid: function(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + // 删除 + delBySids: function(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 获取供应商类型 + selSupplierType: function(data) { + return request({ + url: '/pms/v1/pmssuppliertype/selSupplierType', + method: 'post', + params: data + }) + } +} diff --git a/src/api/baseinfo/suppliertype/suppliertype.js b/src/api/baseinfo/suppliertype/suppliertype.js new file mode 100644 index 0000000..695f942 --- /dev/null +++ b/src/api/baseinfo/suppliertype/suppliertype.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export default { + // 列表查询 + listPage: function(data) { + return request({ + url: '/pms/v1/pmssuppliertype/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存 + saveOrUpdate: function(data) { + return request({ + url: '/pms/v1/pmssuppliertype/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 删除 + delBySids: function(data) { + return request({ + url: '/pms/v1/pmssuppliertype/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/src/api/baseinfo/unit/unit.js b/src/api/baseinfo/unit/unit.js deleted file mode 100644 index eb42b6d..0000000 --- a/src/api/baseinfo/unit/unit.js +++ /dev/null @@ -1,49 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodsunit/listPage', - method: 'post', - data: params, - }) - }, - - // 单位查询 - getAllUnit: function(params) { - return request({ - url: '/wms/apiadmin/base/basegoodsunit/listAll', - method: 'get' - }) - }, - - - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/wms/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable - }); - }, - - - // 新增、保存 - saveUnits: function(data) { - return request({ - url: '/wms/apiadmin/base/basegoodsunit/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 初始化 - initUnits: function(data) { - return request({ - url: '/base/basegoodsunit/initialization/' + data, - method: 'get' - }); - }, - - -} diff --git a/src/api/carryover/carryover.js b/src/api/carryover/carryover.js deleted file mode 100644 index 4c9ab57..0000000 --- a/src/api/carryover/carryover.js +++ /dev/null @@ -1,41 +0,0 @@ -import request from '@/utils/request' - -export default { - // 查询分页列表 -- 结转记录查询 - carryForwardList: function(params) { - return request({ - url: '/inventory/wmsinventorysettlebill/carryForwardList', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 结转记录查询 -- 删除 - deleteBySids: function(data) { - return request({ - url: '/inventory/wmsinventorysettlebill/delBySids', - method: 'DELETE', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 查询分页列表 -- 结转库存查询 - listPage: function(params) { - return request({ - url: '/inventory/wmsinventorysettlebilldetail/listPage', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 结转库存查询 -- 导出 - exportExcel: function(data) { - return request({ - url: '/inventory/wmsinventorysettlebilldetail/exportExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { 'Content-Type': 'application/json' } - }) - } -} diff --git a/src/api/deliveryNotice/deliveryNotice.js b/src/api/deliveryNotice/deliveryNotice.js deleted file mode 100644 index b0ff73d..0000000 --- a/src/api/deliveryNotice/deliveryNotice.js +++ /dev/null @@ -1,51 +0,0 @@ -import request from '@/utils/request' - -export default { - -// 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsAnsBill/listPage', - method: 'post', - data: params, - }) - }, - - // 详情初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsAnsBill/details', - method: 'get', - data:data - }); - }, - - // 收货初始化 - getInitDetails: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails', - method: 'get', - data:data - }); - }, - - - // 新增收货单 - save: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate', - method: 'post', - data: data - }); - }, - - // 确认收货单 - submit: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm', - method: 'post', - data: data - }); - }, - -} diff --git a/src/api/inventory/inventory.js b/src/api/inventory/inventory.js deleted file mode 100644 index 0d699f1..0000000 --- a/src/api/inventory/inventory.js +++ /dev/null @@ -1,69 +0,0 @@ -import request from '@/utils/request' - -export default { - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/inventory/wmsinventory/listPage', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - saveOrUpdate: function(data) { - return request({ - url: '/inventory/wmsinventory/updateWmsInventory', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - init: function(data) { - return request({ - url: '/riskcenter/v1/loancaseappealapply/details', - method: 'post', - params: data - }) - }, - fetchBySid: function(data) { - return request({ - url: '/inventory/wmsinventory/init', - method: 'get', - params: data - }) - }, - // 导出 - exportExcel: function(data) { - return request({ - url: '/inventory/wmsinventory/exportExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - deleteBySids: function(data) { - return request({ - url: '/inventory/wmsinventory/delBySids', - method: 'DELETE', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - saveSettlebill: function(data) { - return request({ - url: '/inventory/wmsinventorysettlebill/saveSettlebill', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - getBillList: function(data) { - return request({ - url: '/inventory/wmsinventory/getBillList', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - } -} diff --git a/src/api/receivingGoods/receivingGoods.js b/src/api/receivingGoods/receivingGoods.js deleted file mode 100644 index 73a48bf..0000000 --- a/src/api/receivingGoods/receivingGoods.js +++ /dev/null @@ -1,84 +0,0 @@ -import request from '@/utils/request' - -export default { - -// 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - - // 初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit', - method: 'get', - data:data - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }); - }, - - - // 确认 - submit: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }); - }, - - // 保存 上架单 - saveUpShelf: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate', - method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } - }); - }, - - - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids', - method: 'DELETE', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - - // 查询所有商品 - getGoodsListPage: function(params) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage', - method: 'post', - data: params - }) - }, - - - // 选择供应商 - choiceSupplier: function(params) { - return request({ - url: '/wms/apiadmin/base/basesupplierinfo/choiceSupplierInfo', - method: 'post', - data: params, - }) - }, -} diff --git a/src/api/storageage/storageage.js b/src/api/storageage/storageage.js deleted file mode 100644 index 75d951e..0000000 --- a/src/api/storageage/storageage.js +++ /dev/null @@ -1,23 +0,0 @@ -import request from '@/utils/request' - -export default { - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/inventory/wmsinventory/inventoryAgeList', - method: 'post', - data: params, - headers: { 'Content-Type': 'application/json' } - }) - }, - // 导出 - exportExcel: function(data) { - return request({ - url: '/inventory/wmsinventory/ageExportExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { 'Content-Type': 'application/json' } - }) - } -} diff --git a/src/api/system/Role/role.js b/src/api/system/Role/role.js index 7eb16f3..bd1c18f 100644 --- a/src/api/system/Role/role.js +++ b/src/api/system/Role/role.js @@ -13,11 +13,8 @@ export function rolemenus(data) { // 获取左侧菜单 export function getrolemenus(data) { return request({ - baseURL: '/api', - url: '/portal/v1/sysmenu/sourcemenutree', + url: '/wms/apiadmin/sysmenu/sourcemenutree', method: 'POST', - async: false, -// data: {userSid: data.userSid, sourceSid: '000011'}, data: data, headers: { 'Content-Type': 'application/json', 'token': tokens } diff --git a/src/api/system/dataDict/dataDict.js b/src/api/system/dataDict/dataDict.js new file mode 100644 index 0000000..15df050 --- /dev/null +++ b/src/api/system/dataDict/dataDict.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' +import qs from 'qs' +//获取单位级别 +export function getDwJb(data) { + return request({ + url: '/system/dictCommon/getDwJb', + method: 'GET', + }) +} +// 获取机构单位类别 +export function getDwType(data) { + return request({ + url: '/system/dictCommon/getDwType', + method: 'get', + params: data + }) +} +//获取机构人员类别 +export function getRylb(data) { + return request({ + url: '/system/dictCommon/getRylb', + method: 'get' + }) +} + +// 根据Type值获取数据对象 +export function getDicts(typeCode) { + return request({ + url: '/system/dictCommon/dicts/'+typeCode, + method: 'get' + }) +} diff --git a/src/api/system/departments/departments.js b/src/api/system/departments/departments.js new file mode 100644 index 0000000..35d8ef5 --- /dev/null +++ b/src/api/system/departments/departments.js @@ -0,0 +1,125 @@ +import request from '@/utils/request' +import qs from 'qs' + +// let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY' +let tokens = window.sessionStorage.getItem('token') +// 获取菜单 分页列表 +export function pageList(data) { + return request({ + url: '/wms/apiadmin/sysorganization/listPage', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 查询左侧部门列表 +export function orgList(data) { + return request({ + url: '/wms/apiadmin/sysorganization/list', + method: 'get', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 编辑部门信息 +export function postOrgtree(data) { + return request({ + url: '/wms/apiadmin/sysorganization/update/' + data.sid, + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 获取 机构分页列表（编辑部门信息） +export function putOrgtree(data) { + return request({ + url: '/wms/apiadmin/sysorganization/update/' + data.sid, + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} + +// 新增部门信息 +export function addOrgTree(data) { + return request({ + url: '/wms/apiadmin/sysorganization/save', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 回显 +export function selectBySid(data) { + return request({ + url: 'portal/v1/sysorganization/fetchBySid/' + data, + method: 'get', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 树 节点名称 删除 +export function delOrgtree(data) { + return request({ + url: `/wms/apiadmin/sysorganization/delBySid/` + data.sid, + method: 'get', + data: qs.stringify(data), + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 查询主管人员 旧的:/wms/apiadmin/sysstafforg/staffinfoList +export function getStaff(data) { + return request({ + url: '/wms/apiadmin/sysstaffinfo/getStaffNameByDeptSid', + method: 'get', + params: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 查询分管人员 +export function getStaffName(params) { + return request({ + url: '/wms/apiadmin/sysstaffinfo/getStaffName', + method: 'get', + params: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} +// 查看二维码 +export function getQrCode(data) { + return request({ + url: '/wms/apiadmin/sysorganization/getQrCode/' + data.sid, + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/src/api/system/dictType/dictCommon.js b/src/api/system/dictType/dictCommon.js new file mode 100644 index 0000000..8c0c095 --- /dev/null +++ b/src/api/system/dictType/dictCommon.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' +import qs from 'qs' +let tokens = window.sessionStorage.getItem('token'); + +//获取字典子集 分页列表 +export function dictCommonList(data) { + return request({ + url: '/wms/apiadmin/dictcommons/pageList', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +//保存 字典子级 +export function savedictCommon(data) { + return request({ + url: '/wms/apiadmin/dictcommons/save', + method: 'POST', + data: data , + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +//根据sid 获取单个菜单 信息 +export function getRoleInfo(data) { + return request({ + url: '/system/v1/menus/' + data.sid, + method: 'GET', + data: qs.stringify(data) + }) +} + +//根据sid 修改 数据字典 +export function putdictCommon(data) { + return request({ + url: '/wms/apiadmin/dictcommons/update/' + data.sid, + method: 'POST', + data: data , + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +//根据sid 删除菜单 信息 +export function deldictCommon(data) { + return request({ + url: '/wms/apiadmin/dictcommons/delete/' + data.sid, + method: 'DELETE', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} diff --git a/src/api/system/dictType/index.js b/src/api/system/dictType/index.js new file mode 100644 index 0000000..253e8e1 --- /dev/null +++ b/src/api/system/dictType/index.js @@ -0,0 +1,74 @@ +import request from '@/utils/request' +import qs from 'qs' +let tokens = window.sessionStorage.getItem('token') + +// 获取菜单 分页列表 +export function pageList(data) { + return request({ + url: '/wms/apiadmin/dicttypes/pageList', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} + +// 根据sid 修改 +export function putDictType(data) { + return request({ + url: '/wms/apiadmin/dicttypes/update/' + data.sid, + method: 'POST', + data: qs.stringify(data) + }) +} + +// 保存 角色信息 +export function saveDictType(data) { + return request({ + url: '/wms/apiadmin/dicttypes/save', + method: 'POST', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} + +// 根据sid 获取单个菜单 信息 +export function getRoleInfo(data) { + return request({ + url: '/system/v1/menus/' + data.sid, + method: 'GET', + data: qs.stringify(data) + }) +} + +// 数据字段--映射管理保存 +export function saveMappingList(data) { + return request({ + url: '/wms/apiadmin/sysmapping/saveMappingList', + method: 'POST', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} + +// 数据字段--映射管理保存 +export function selectMappingListInfo(data) { + return request({ + url: '/wms/apiadmin/sysmapping/selectMappingListInfo', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} + +// 根据sid 删除菜单 信息 +export function delDictType(data) { + return request({ + url: '/wms/apiadmin/dicttypes/delete/' + data.sid, + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} diff --git a/src/api/system/log/index.js b/src/api/system/log/index.js new file mode 100644 index 0000000..66b4334 --- /dev/null +++ b/src/api/system/log/index.js @@ -0,0 +1,16 @@ +import request from '@/utils/request' +import qs from 'qs' +//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY' +let tokens = window.sessionStorage.getItem('token'); +//获取菜单 分页列表 +export function logPageList(data) { + return request({ + url: '/wms/apiadmin/systemlog/listPage', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + diff --git a/src/api/system/menu/index.js b/src/api/system/menu/index.js new file mode 100644 index 0000000..5aef650 --- /dev/null +++ b/src/api/system/menu/index.js @@ -0,0 +1,109 @@ +import request from '@/utils/request' +import qs from 'qs' +//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY' + +let tokens = window.sessionStorage.getItem('token'); + +//获取菜单 分页列表 +export function pageList(data) { + return request({ + url: '/wms/apiadmin/sysmenu/listAllVoForSource', + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} + +// 新增保存 菜单信息 +export function saveMenusInfo(data) { + return request({ + url: '/wms/apiadmin/sysmenu/save', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +// 修改保存 菜单信息 +export function putMenusInfo(data) { + return request({ + url: '/wms/apiadmin/sysmenu/update/' + data.sid, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +//根据sid 删除单个 资源信息 +export function delMenus(data) { + return request({ + url: '/wms/apiadmin/sysmenu/delBySids/' + data.sid, + method: 'get', + data: qs.stringify(data), + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} + +// 修改状态 +export function IsEnable(data) { + return request({ + url: '/wms/apiadmin/sysmenu/updateIsEnable/' + data.sid + '/' + data.isEnable, + method: 'POST', + /* data: qs.stringify(data),*/ + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) +} + + +// 获取菜单 不分页列表 +export function roleList(data) { + return request({ + url: '/system/v1/menus/list', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +//获取菜单 分页列表 +export function menusPageList(data) { + return request({ + url: '/system/v1/menus/pagelist', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +//获取菜单 树形分页列表 +export function menusTreelist(data) { + return request({ + url: '/system/v1/menus/treelist', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + + +//根据sid 获取单个菜单 信息 +export function getRoleInfo(data) { + return request({ + url: '/system/v1/menus/' + data.sid, + method: 'GET', + data: qs.stringify(data) + }) +} + + + + diff --git a/src/api/system/organization/organization.js b/src/api/system/organization/organization.js new file mode 100644 index 0000000..1cf938e --- /dev/null +++ b/src/api/system/organization/organization.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' +import qs from 'qs' +let tokens = window.sessionStorage.getItem('token'); +class user{ + verifyList(data){ // 获取列表 + return request({ + url: '/system/organization/verifyList', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) + } + orgRegisterDetails(data){ // 单位注册信息详情 + return request({ + url: '/system/organization/organizationRegisterDetails/'+data.organizationSid, + method: 'get', + params: data + }) + } + verify(data){ // 审核 + return request({ + url: '/system/organization/verify', + method: 'post', + data: qs.stringify(data) + }) + } + // 删除机构信息 + del(data) { + return request({ + url: '/system/organization/delete/'+data.sid, + method: 'DELETE', + data + }) + } +} +export default new user() diff --git a/src/api/system/postManage/index.js b/src/api/system/postManage/index.js new file mode 100644 index 0000000..ab22a72 --- /dev/null +++ b/src/api/system/postManage/index.js @@ -0,0 +1,87 @@ +import request from '@/utils/request' +import qs from 'qs' +//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMTE1MjUwfQ.gtn_mVsbwH6ztl835rWmIY4DxeNmRe_TOt-Q0TdldIE' +let tokens = window.sessionStorage.getItem('token'); +//获取菜单 分页列表 +export function pageList(data) { + return request({ + url: '/wms/apiadmin/syspost/listPage', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 查询部门列表 +export function orgList(data){ + return request({ + url: '/wms/apiadmin/sysorganization/list', + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 新增 +export function savePost(data){ + return request({ + url: '/wms/apiadmin/syspost/save', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 修改 +export function putOrgroles(data){ + return request({ + url: '/wms/apiadmin/syspost/update/' +data.sid, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 删除 +export function delOrgroles(data){ + return request({ + url: '/wms/apiadmin/syspost/delBySids/' + data.sids, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +export function pullDown(data){ + return request({ + url: '/wms/apiadmin/dictcommons/typeValues', + method: 'get', + params: data + }) +} + +// 查询岗位列表 +export function selectList(data){ + return request({ + url: '/wms/apiadmin/syspost/selectList', + method: 'get', + params: data + }) +} + +// 查询所有流程名称 +export function selectFlowList(){ + return request({ + url: '/flowable/v1/flow/selectFlowList', + method: 'get' + }) +} + diff --git a/src/api/system/roleAdminister/index.js b/src/api/system/roleAdminister/index.js new file mode 100644 index 0000000..c10cbd5 --- /dev/null +++ b/src/api/system/roleAdminister/index.js @@ -0,0 +1,198 @@ +import request from '@/utils/request' +import qs from 'qs' +//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g' +let tokens = window.sessionStorage.getItem('token'); +// 业务角色 列表 +export function roleOrgList(data){ + return request({ + url: '/wms/apiadmin/sysrole/listPage', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +export function postList(data){ + return request({ + url: '/wms/apiadmin/syspost/list', + method: 'get', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +// 获取数据字典下拉列表 +export function typeValues(data) { + return request({ + url: '/wms/apiadmin/dictcommons/typeValues', + method: 'get', + params: data + }) +} + +// 设置是否可用：isEnable：1可用，0不可用 +export function setRoleEnable(data) { + return request({ + url: '/wms/apiadmin/sysrole/setIsEnable/' + data.sid + '/' + data.isEnable, + method: 'POST', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +/** + * <新增 保存角色> + * @orgSid 机构SID + * @remarks 备注 + * @roleName 角色名称 + * */ +export function saveOrgroles(data) { + return request({ + url: '/wms/apiadmin/sysrole/save', + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +/** + * <根据SID 修改角色> + * @sid 角色SID + * @orgSid 机构SID + * @remarks 备注 + * @roleName 角色名称 + * */ +export function putOrgroles(data) { + return request({ + url: `/wms/apiadmin/sysrole/update/${data.sid}`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +/** + * <根据SID 删除角色> + * @sid 角色SID + * */ +export function delOrgroles(data) { + return request({ + url: `/wms/apiadmin/sysrole/delBySids/${data.sid}`, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 移动端授权 +export function getRoleMenuList(data) { + return request({ + url: '/wms/apiadmin/sysmobilemenurole/getRoleMenuList', + method: 'post', + params: { roleSid: data } + }) +} + +// 菜单授权保存 +export function saveRoleMenuList(data) { + return request({ + url: `/wms/apiadmin/sysmobilemenurole/saveRoleMenuList`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 菜单授权 +export function roleMenuTree(data) { + return request({ + url: `/wms/apiadmin/sysmenu/listAllByRoleSid`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 菜单授权保存 +export function saveorgrolemenus(data) { + return request({ + url: `/wms/apiadmin/sysrikeauthorize/updateRoleAndMenu`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 资源授权 +export function sourceMenuTree(data) { + return request({ + url: `/wms/apiadmin/syssource/listAllByRoleSid`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 资源授权保存 +export function saveSource(data) { + return request({ + url: `/wms/apiadmin/syssourcerole/updateRoleAndSource`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 功能授权 +export function funMenuTree(data) { + return request({ + url: `/wms/apiadmin/sysfunction/getFunctionAuthorization/` + data.roleSid, + method: 'get' + }) +} +// 功能授权保存 +export function savefunMenu(data) { + return request({ + url: `/wms/apiadmin/sysrolefunction/updateRoleAndFunction`, + method: 'POST', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 角色授权 +export function selMenuByRole(data) { + return request({ + url: `/wms/apiadmin/sysmenurole/selMenuByRole`, + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} + +// 角色授权保存 +export function updateDataByRoleMenu(data) { + return request({ + url: `/wms/apiadmin/sysmenurole/updateDataByRoleMenu`, + method: 'POST', + data: data, + headers: { 'Content-Type': 'application/json', 'token': tokens } + }) +} diff --git a/src/api/system/roleAdminister/rolemenus.js b/src/api/system/roleAdminister/rolemenus.js new file mode 100644 index 0000000..54ffe28 --- /dev/null +++ b/src/api/system/roleAdminister/rolemenus.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' +import qs from 'qs' + +/** + * < 业务角色授权时菜单列表（拥有的菜单选中）> + * @orgTypeKeys 单位性质（类别 + * @roleSid 业务角色sid + * @userType 用户类型只能为1或2 + * */ +export function roleMenuTree(data){ + return request({ + url: '/wms/apiadmin/orgrolemenus/menutree', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} + +/** + * < 保存角色授权的菜单项 > + * @roleMenus[] 角色权限列表 {menuSid 菜单sid} {orgSid 单位sid} {roleSid 角色sid} + * @roleSid 业务角色sid + * */ +export function saveorgrolemenus(data){ + return request({ + url: '/wms/apiadmin/orgrolemenus', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json'} + }) +} diff --git a/src/api/system/userManage/index.js b/src/api/system/userManage/index.js new file mode 100644 index 0000000..4fda1b1 --- /dev/null +++ b/src/api/system/userManage/index.js @@ -0,0 +1,150 @@ +import request from '@/utils/request' +import qs from 'qs' +// 用户列表 +//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjI5OTQxNjI1fQ.aOFOz0h7c8YQs-ti2GLpqeWu4AE9mifx_043hLJQf8g' +let tokens = window.sessionStorage.getItem('token'); +export function userList(data){ + return request({ + url: '/wms/apiadmin/sysuser/listPage', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 新增 +export function userAdd(data){ + return request({ + url: '/wms/apiadmin/sysuser/save', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 更新 +export function userUpdata(data){ + return request({ + url: '/wms/apiadmin/sysuser/update/' +data.sid, + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 删除 +export function delUser(data){ + return request({ + url: '/wms/apiadmin/sysuser/delBySid/' +data.sid, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 初始化密码 +export function initPwd(data){ + return request({ + url: '/wms/apiadmin/sysuser/initPwd/' +data.sid, + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 根据sid查询一条信息 +export function userSingle(data){ + return request({ + url: '/wms/apiadmin/sysuser/fetchBySid/' +data.sid, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 单条用户的角色列表 +export function setRole(data){ + return request({ + url: '/wms/apiadmin/sysrole/listAllByUserSid/' +data.sid, + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 角色列表 +export function saveOrgRole(data){ + return request({ + url: '/wms/apiadmin/sysuserrole/update', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 查询角色列表 +export function roleList(data){ + return request({ + url: '/wms/apiadmin/sysrole/listAll', + method: 'post', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 查询部门列表 +export function orgList(data){ + return request({ + url: '/wms/apiadmin/sysorganization/list', + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} +// 查询岗位列表 +export function postList(data){ + return request({ + url: '/wms/apiadmin/syspost/fetchByOrgSid/'+data.sid, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 获取验证码 +export function getCode(data){ + return request({ + url: '/wms/apiadmin/sysuser/sendMessageCode/'+data.phone, + method: 'get', + data: data, + headers: {'Content-Type': 'application/json', + 'token':tokens + } + }) +} + +// 设置是否可用：isEnable：1可用，0不可用 +export function setRoleEnable(data) { + return request({ + url: '/wms/apiadmin/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable, + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} diff --git a/src/api/upShelf/upShelf.js b/src/api/upShelf/upShelf.js deleted file mode 100644 index f80679a..0000000 --- a/src/api/upShelf/upShelf.js +++ /dev/null @@ -1,43 +0,0 @@ -import request from '@/utils/request' - -export default { - -// 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/listPage', - method: 'post', - data: params, - }) - }, - - // 初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/details', - method: 'get', - data:data - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate', - method: 'post', - data: data - }); - }, - - - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/delBySids', - method: 'DELETE', - data: data, - headers: { 'Content-Type': 'application/json' } - }) - }, - -} diff --git a/src/api/user.js b/src/api/user.js index 8a31f59..0bbed7b 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -8,36 +8,72 @@ export function doLogin(data) { url: '/wms/apiadmin/sysuser/login', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) } -// 获取登录人员信息 - export function getUserById(sid) { - return request({ - url: '/cyf/sys/getUserById/' + sid - }) - } -// 登录 -export function login(data) { +// 注册发送验证码 +export function registerSendMessageCode(code) { return request({ - url: '/portal/v1/sysuser/login', + url: '/wms/apiadmin/sysuser/sendMessageCode/?mobile=' + code, method: 'post', - data: data, - headers: { 'Content-Type': 'application/json' } + headers: { + 'Content-Type': 'application/json' + } }) + } // 用户注册 export function registUser(data) { return request({ - url: '/system/user/save', + url: '/wms/apiadmin/sysuser/register', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + + +// 绑定企业/组织 +export function bindOrganization(data) { + return request({ + url: '/wms/apiadmin/sysuser/bindOrganization', method: 'post', - data, - headers: { 'Content-Type': 'application/x-www-form-urlencoded;' } + data: data, + headers: { + 'Content-Type': 'application/json' + } }) } + +// 选择企业/组织sid +export function selOrganization(data) { + return request({ + url: '/wms/apiadmin/sysuser/selOrganization', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + + +// 获取登录人员信息 +export function getUserById(sid) { + return request({ + url: '/cyf/sys/getUserById/' + sid + }) + +} + + // 获取手机验证码 export function getVerificationCode(data) { return request({ diff --git a/src/api/warehouse/allocation/allocation.js b/src/api/warehouse/allocation/allocation.js deleted file mode 100644 index 3d7e2c3..0000000 --- a/src/api/warehouse/allocation/allocation.js +++ /dev/null @@ -1,59 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage', - method: 'post', - data: params, - }) - }, - - // 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save', - method: 'post', - data: data - }); - }, - - // 初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/' + data, - method: 'get' - }); - }, - - - // 查询所有商品 - getGoods: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage', - method: 'post', - data: params - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', - method: 'get' - }) - }, - - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - data: data, - }); - }, - -} diff --git a/src/api/warehouse/distribution/distribution.js b/src/api/warehouse/distribution/distribution.js deleted file mode 100644 index f85cff9..0000000 --- a/src/api/warehouse/distribution/distribution.js +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/details', - method: 'get', - data: data - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/saveOrUpdateBill', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 确认 - submit: function(data) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/confirm', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - -} diff --git a/src/api/warehouse/inOutStorage/inOutStorage.js b/src/api/warehouse/inOutStorage/inOutStorage.js deleted file mode 100644 index 403bc2f..0000000 --- a/src/api/warehouse/inOutStorage/inOutStorage.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryrecord/pageList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 导出报表 - exportExcel: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryrecord/exportExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 选择供应商 - choiceSupplier: function(params) { - return request({ - url: '/wms/apiadmin/base/basesupplierinfo/choiceSupplierInfo', - method: 'post', - data: params, - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', - method: 'get' - }) - }, - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - data: data, - }); - }, -} diff --git a/src/api/warehouse/inStorage/inStorage.js b/src/api/warehouse/inStorage/inStorage.js deleted file mode 100644 index f77ed8c..0000000 --- a/src/api/warehouse/inStorage/inStorage.js +++ /dev/null @@ -1,22 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/inventory/wmsinventorybill/listPage', - method: 'post', - data: params, - }) - }, - - - // 选择商品列表 - getAllGoods: function(params) { - return request({ - url: '/base/basegoodssku/getSelectList', - method: 'get' - }) - }, -} diff --git a/src/api/warehouse/inventory/inventory.js b/src/api/warehouse/inventory/inventory.js deleted file mode 100644 index 70efa6a..0000000 --- a/src/api/warehouse/inventory/inventory.js +++ /dev/null @@ -1,63 +0,0 @@ -import request from '@/utils/request' - -export default { - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/apiadmin/inventory/wmsinventory/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - init: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventoryrecord/getWmsInventoryRecordList', - method: 'get', - params: data - }) - }, - // 导出 - exportExcel: function(data) { - return request({ - url: '/inventory/wmsinventory/exportExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 选择供应商 - choiceSupplier: function(params) { - return request({ - url: '/wms/apiadmin/base/basesupplierinfo/choiceSupplierInfo', - method: 'post', - data: params, - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', - method: 'get' - }) - }, - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - data: data, - }); - }, - - -} diff --git a/src/api/warehouse/oldPartsCope/oldPartsCope.js b/src/api/warehouse/oldPartsCope/oldPartsCope.js deleted file mode 100644 index 4ec665b..0000000 --- a/src/api/warehouse/oldPartsCope/oldPartsCope.js +++ /dev/null @@ -1,72 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/as/v1/asoldparthandleapply/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 初始化 - init: function(data) { - return request({ - url: '/as/v1/asoldparthandleapply/fetchDetailsBySid/' + data, - method: 'get' - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/as/v1/asoldparthandleapply/save', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 提交 - submit: function(data) { - return request({ - url: '/as/v1/asoldparthandleapply/submit', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - deleteBySids: function(data) { - return request({ - url: '/as/v1/asoldparthandleapply/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 查询旧件分页列表 - handleGoodsListPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventory/handleGoodsListPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, -} diff --git a/src/api/warehouse/oldPartsFactory/oldPartsFactory.js b/src/api/warehouse/oldPartsFactory/oldPartsFactory.js deleted file mode 100644 index 03be80c..0000000 --- a/src/api/warehouse/oldPartsFactory/oldPartsFactory.js +++ /dev/null @@ -1,83 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/as/v1/asoldpartreturnapply/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 获取确认结果详情 - fetchDetailsByMainSid: function(data) { - return request({ - url: '/as/v1/asoldpartreturnconfirm/fetchDetailsByMainSid/' + data, - method: 'get' - }); - }, - - - // 初始化 - init: function(data) { - return request({ - url: '/as/v1/asoldpartreturnapply/fetchDetailsBySid/' + data, - method: 'get' - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/as/v1/asoldpartreturnapply/save', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 提交 - submit: function(data) { - return request({ - url: '/as/v1/asoldpartreturnapply/submit', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - deleteBySids: function(data) { - return request({ - url: '/as/v1/asoldpartreturnapply/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 下载模板 - downloadExcel: function() { - return request({ - url: '/as/v1/asoldpartreturnapply/downloadModPriceExcel', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - headers: { - 'Content-Type': 'application/json' - } - }) - }, - -} diff --git a/src/api/warehouse/oldPartsInAndOutStorage/oldPartsInAndOutStorage.js b/src/api/warehouse/oldPartsInAndOutStorage/oldPartsInAndOutStorage.js deleted file mode 100644 index de10722..0000000 --- a/src/api/warehouse/oldPartsInAndOutStorage/oldPartsInAndOutStorage.js +++ /dev/null @@ -1,58 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/recordList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - // 导出报表 - exportExcel: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/excelRecordList', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - // 选择厂家 - choiceManufacturer: function(params) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/listAll', - method: 'get', - data: params, - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', - method: 'get' - }) - }, - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - data: data, - }); - }, - - - -} diff --git a/src/api/warehouse/oldPartsInStorage/oldPartsInStorage.js b/src/api/warehouse/oldPartsInStorage/oldPartsInStorage.js deleted file mode 100644 index f9ec99e..0000000 --- a/src/api/warehouse/oldPartsInStorage/oldPartsInStorage.js +++ /dev/null @@ -1,38 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 获取旧件入库详情 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/getInit', - method: 'get', - data: data, - }); - }, - - // 保存旧件入库 - save: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/saveInventory', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - -} diff --git a/src/api/warehouse/oldPartsInvertory/oldPartsInvertory.js b/src/api/warehouse/oldPartsInvertory/oldPartsInvertory.js deleted file mode 100644 index 1d55dac..0000000 --- a/src/api/warehouse/oldPartsInvertory/oldPartsInvertory.js +++ /dev/null @@ -1,80 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/oldPageList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 获取旧件出入库记录详情 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/getDetailsList', - method: 'get', - data: data, - }); - }, - - - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 导出报表 - exportExcel: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldInventory/excelList', - method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - // 选择厂家 - choiceManufacturer: function(params) { - return request({ - url: '/wms/apiadmin/base/basemanufacturer/listAll', - method: 'get', - data: params, - }) - }, - - // 查询所有仓库 - getWarehouses: function(params) { - return request({ - url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', - method: 'get' - }) - }, - - // 根据仓库查询库位 - getWarehouseareas: function(data) { - return request({ - url: '/wms/apiadmin/base/wmswarehousearea/selectAll', - method: 'get', - data: data, - }); - }, - - - -} diff --git a/src/api/warehouse/oldPartsRecovery/oldPartsRecovery.js b/src/api/warehouse/oldPartsRecovery/oldPartsRecovery.js deleted file mode 100644 index 4e19766..0000000 --- a/src/api/warehouse/oldPartsRecovery/oldPartsRecovery.js +++ /dev/null @@ -1,39 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/as/v1/AsBusrepairBill/pageBillList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 获取维修工单详情 - getOneByBillNo: function(data) { - return request({ - url: '/as/v1/AsBusrepairBill/getOneByBillNo', - method: 'get', - data: data, - }); - }, - - - // 保存旧件回收登记 - save: function(data) { - return request({ - url: '/wms/apiadmin/WmsOldRegister/saveorUpdateOldRegister', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - -} diff --git a/src/api/warehouse/outStorage/outStorage.js b/src/api/warehouse/outStorage/outStorage.js deleted file mode 100644 index 1ef43dd..0000000 --- a/src/api/warehouse/outStorage/outStorage.js +++ /dev/null @@ -1,99 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOutBill/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 详情初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/WmsOutBill/details', - method: 'get', - data: data - }); - }, - - // 初始配货单 - initDistribution: function(data) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/getInit', - method: 'get', - data: data - }); - }, - - - // 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/WmsOutBill/saveOrUpdateOutBill', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 确认 - submit: function(data) { - return request({ - url: '/wms/apiadmin/WmsOutBill/confirm', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - - - // 新增、保存 配货单 - saveDistribution: function(data) { - return request({ - url: '/wms/apiadmin/WmsDistributeBill/saveOrUpdateBill', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - - deleteBySids: function(data) { - return request({ - url: '/wms/apiadmin/WmsShelfBill/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 查询分页列表 - getGoodsListPage: function(params) { - return request({ - url: '/wms/apiadmin/WmsOutBill/getInventoryList', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - -} diff --git a/src/api/warehouse/reservationInStorage/reservationInStorage.js b/src/api/warehouse/reservationInStorage/reservationInStorage.js deleted file mode 100644 index 3df3596..0000000 --- a/src/api/warehouse/reservationInStorage/reservationInStorage.js +++ /dev/null @@ -1,22 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/warereservation/listPage', - method: 'post', - data: params, - }) - }, - - // 查询分页列表 - selByReservationSid: function(sid) { - return request({ - url: '/wms/apiadmin/inventory/warereservadetail/selByReservationSid/'+sid, - method: 'get' - }) - }, - -} diff --git a/src/api/warehouse/stocktaking/stocktaking.js b/src/api/warehouse/stocktaking/stocktaking.js deleted file mode 100644 index 7b00291..0000000 --- a/src/api/warehouse/stocktaking/stocktaking.js +++ /dev/null @@ -1,47 +0,0 @@ -import request from '@/utils/request' - -export default { - - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventorycheckbill/listPage', - method: 'post', - data: params, - }) - }, -// 新增、保存 - save: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventorycheckbill/save', - method: 'post', - data: data - }); - }, - - // 初始化 - init: function(data) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventorycheckbill/' + data, - method: 'get' - }); - }, - -// 查询所有商品 - getWarehousesGoods: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage', - method: 'post', - data: params - }) - }, - - // 盘点 - inven: function(params) { - return request({ - url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage', - method: 'post', - data: params - }) - }, -} diff --git a/src/assets/images/company_icon.png b/src/assets/images/company_icon.png new file mode 100644 index 0000000..d655f49 Binary files /dev/null and b/src/assets/images/company_icon.png differ diff --git a/src/assets/images/experience.png b/src/assets/images/experience.png new file mode 100644 index 0000000..342fa74 Binary files /dev/null and b/src/assets/images/experience.png differ diff --git a/src/assets/images/formal.png b/src/assets/images/formal.png new file mode 100644 index 0000000..5e982a9 Binary files /dev/null and b/src/assets/images/formal.png differ diff --git a/src/assets/images/overdue.png b/src/assets/images/overdue.png new file mode 100644 index 0000000..1359a90 Binary files /dev/null and b/src/assets/images/overdue.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d02ff62..9314041 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,15 +1,18 @@ @@ -17,12 +20,18 @@ export default { data() { return { + Orgname: '', + departmentName: '', name: '', - year:'', + year: '', + pNameAndDepartmentNameAndPostName: '' } }, mounted() { + this.Orgname = window.sessionStorage.getItem('orgName') + this.departmentName = window.sessionStorage.getItem('departmentName') this.name = window.sessionStorage.getItem('userName') + this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('defaultOrgPathName') var nowDate = new Date() this.year = nowDate.getFullYear() }, @@ -33,11 +42,14 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - // this.$store.commit('user/SET_UESRINFO', '') - this.$router.push({ - path: '/login' - }) - }) + window.sessionStorage.clear() + this.$router.push({ + path: '/login' + }) + location.reload() + // this.$store.commit('user/SET_UESRINFO', '') + + }) }, } } @@ -67,15 +79,15 @@ } } - .breadcrumb-container { - display: flex; - align-items: center; - color: #fff; - font-size: 26px; - line-height: 60px; - margin: 0; - float: left; - } + .breadcrumb-container { + display: flex; + align-items: center; + color: #fff; + font-size: 26px; + line-height: 60px; + margin: 0; + float: left; + } .right-menu { float: right; diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 40388ee..baae4f4 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,8 +1,8 @@ @@ -55,19 +72,30 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import req from '@/api/carryover/carryover' +import req from '@/api/baseinfo/supplier/supplier.js' +import supplierAdd from './supplierAdd' +import supplierInfo from './supplierInfo' export default { - name: 'CarryForwardRecord', + name: 'Supplier', components: { Pagination, pageye, - ButtonBar + ButtonBar, + supplierAdd, + supplierInfo }, data() { return { btndisabled: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: 'plus', + btnKey: 'toAdd', + btnLabel: '新增' + }, { type: 'danger', size: 'small', @@ -97,10 +125,10 @@ export default { size: 10, total: 0, params: { - startDate: '', - endDate: '', - useOrgName: '', - useOrgSid: '' + supplierName: '', + supplierTypeName: '', + contactTelePhone: '', + contactName: '' } } } @@ -125,6 +153,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toAdd': + this.toAdd() + break case 'doDel': this.doDel() break @@ -135,12 +166,6 @@ export default { break } }, - // 表中序号 - indexMethod(index) { - var pagestart = (this.listQuery.current - 1) * this.listQuery.size - var pageindex = index + 1 + pagestart - return pageindex - }, // 信息条数 获取点击时当前的sid handleSelectionChange(row) { const aa = [] @@ -149,10 +174,16 @@ export default { }) this.sids = aa }, + // 表中序号 + indexMethod(index) { + var pagestart = (this.listQuery.current - 1) * this.listQuery.size + var pageindex = index + 1 + pagestart + return pageindex + }, // 查询列表信息 getList() { this.listLoading = true - req.carryForwardList(this.listQuery).then(response => { + req.listPage(this.listQuery).then((response) => { this.listLoading = false if (response.success) { this.list = response.data.records @@ -175,14 +206,26 @@ export default { size: 10, total: 0, params: { - startDate: '', - endDate: '', - useOrgName: '', - useOrgSid: '' + supplierName: '', + supplierTypeName: '', + contactTelePhone: '', + contactName: '' } } this.getList() }, + toAdd() { + this.viewState = 2 + this.$refs['divAdd'].showAdd() + }, + toEdit(row) { + this.viewState = 3 + this.$refs['divAdd'].showEdit(row) + }, + toInfo(row) { + this.viewState = 4 + this.$refs['divInfo'].showInfo(row) + }, doDel() { if (this.sids.length === 0) { this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) @@ -200,7 +243,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - req.deleteBySids(this.sids).then(resp => { + req.delBySids(this.sids).then(resp => { if (resp.success) { this.$message({ type: 'success', message: resp.msg, showClose: true }) } @@ -212,6 +255,10 @@ export default { }).catch(() => { }) }, + // 修改、编辑、详情返回列表页面 + resetState() { + this.viewState = 1 + }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) diff --git a/src/views/baseInfo/supplier/supplier/supplierAdd.vue b/src/views/baseInfo/supplier/supplier/supplierAdd.vue new file mode 100644 index 0000000..c2cb219 --- /dev/null +++ b/src/views/baseInfo/supplier/supplier/supplierAdd.vue @@ -0,0 +1,475 @@ + + + + + diff --git a/src/views/baseInfo/supplier/supplier/supplierInfo.vue b/src/views/baseInfo/supplier/supplier/supplierInfo.vue new file mode 100644 index 0000000..eb3fcac --- /dev/null +++ b/src/views/baseInfo/supplier/supplier/supplierInfo.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/src/views/baseInfo/supplier/suppliertype/suppliertype.vue b/src/views/baseInfo/supplier/suppliertype/suppliertype.vue new file mode 100644 index 0000000..8263136 --- /dev/null +++ b/src/views/baseInfo/supplier/suppliertype/suppliertype.vue @@ -0,0 +1,296 @@ + + + + diff --git a/src/views/baseInfo/unit/index.vue b/src/views/baseInfo/unit/index.vue deleted file mode 100644 index c247313..0000000 --- a/src/views/baseInfo/unit/index.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - diff --git a/src/views/baseInfo/unit/unitAdd.vue b/src/views/baseInfo/unit/unitAdd.vue deleted file mode 100644 index f1c26b8..0000000 --- a/src/views/baseInfo/unit/unitAdd.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - - diff --git a/src/views/baseInfo/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue similarity index 100% rename from src/views/baseInfo/goodsShelves/goodsShelvesAdd.vue rename to src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue diff --git a/src/views/baseInfo/goodsShelves/index.vue b/src/views/baseInfo/warehouses/goodsShelves/index.vue similarity index 100% rename from src/views/baseInfo/goodsShelves/index.vue rename to src/views/baseInfo/warehouses/goodsShelves/index.vue diff --git a/src/views/baseInfo/warehouse/index.vue b/src/views/baseInfo/warehouses/warehouse/index.vue similarity index 100% rename from src/views/baseInfo/warehouse/index.vue rename to src/views/baseInfo/warehouses/warehouse/index.vue diff --git a/src/views/baseInfo/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue similarity index 100% rename from src/views/baseInfo/warehouse/warehouseAdd.vue rename to src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue diff --git a/src/views/baseInfo/warehouseArea/index.vue b/src/views/baseInfo/warehouses/warehouseArea/index.vue similarity index 100% rename from src/views/baseInfo/warehouseArea/index.vue rename to src/views/baseInfo/warehouses/warehouseArea/index.vue diff --git a/src/views/baseInfo/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue similarity index 100% rename from src/views/baseInfo/warehouseArea/warehouseAreaAdd.vue rename to src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue diff --git a/src/views/baseInfo/warehouseAreaType/index.vue b/src/views/baseInfo/warehouses/warehouseAreaType/index.vue similarity index 100% rename from src/views/baseInfo/warehouseAreaType/index.vue rename to src/views/baseInfo/warehouses/warehouseAreaType/index.vue diff --git a/src/views/baseInfo/warehouseAreaType/warehouseAreaTypeAdd.vue b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue similarity index 100% rename from src/views/baseInfo/warehouseAreaType/warehouseAreaTypeAdd.vue rename to src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue diff --git a/src/views/carryover/carryoverstock.vue b/src/views/carryover/carryoverstock.vue deleted file mode 100644 index b209350..0000000 --- a/src/views/carryover/carryoverstock.vue +++ /dev/null @@ -1,227 +0,0 @@ - - - - diff --git a/src/views/deliveryNotice/index.vue b/src/views/deliveryNotice/index.vue deleted file mode 100644 index ef853d4..0000000 --- a/src/views/deliveryNotice/index.vue +++ /dev/null @@ -1,432 +0,0 @@ - - - - diff --git a/src/views/deliveryNotice/receiptAdd.vue b/src/views/deliveryNotice/receiptAdd.vue deleted file mode 100644 index 3aac858..0000000 --- a/src/views/deliveryNotice/receiptAdd.vue +++ /dev/null @@ -1,772 +0,0 @@ - - - - diff --git a/src/views/deliveryNotice/receiptInfo.vue b/src/views/deliveryNotice/receiptInfo.vue deleted file mode 100644 index af1a9bf..0000000 --- a/src/views/deliveryNotice/receiptInfo.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue deleted file mode 100644 index d7b1986..0000000 --- a/src/views/inventory/inventory.vue +++ /dev/null @@ -1,448 +0,0 @@ - - - - diff --git a/src/views/inventory/inventoryAdd.vue b/src/views/inventory/inventoryAdd.vue deleted file mode 100644 index 452f956..0000000 --- a/src/views/inventory/inventoryAdd.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/src/views/inventory/inventoryInfo.vue b/src/views/inventory/inventoryInfo.vue deleted file mode 100644 index 0c61637..0000000 --- a/src/views/inventory/inventoryInfo.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - - - diff --git a/src/views/login/login.vue b/src/views/login/login.vue index d1adb06..5f3ca3f 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -8,7 +8,7 @@ -
+
欢迎登录商享通WMS @@ -45,19 +45,130 @@
- 7天内免登录 + 7天内免登录
- 忘记密码 + 忘记密码
- 去注册 + 去注册
+ + +
+ +
+ 欢迎注册商享通WMS + + + 手机号码 + + + + 密码 + + + + 验证码 +
+ + {{sendCodeText2}} +
+ +
+ 已有账号？ + 登录 +
+ + + 注册 + +
+ + 我已阅读并同意 + 《宇信通服务协议》 + 与 + 《隐私协议》 +
+
+ +
+ + 请选择公司进入WMS + +
+ +
+
+ + {{item.orgName}} + + + + +
+ +
+ +
+ + 新建企业信息 + +
+ +
+ + 欢迎注册商享通WMS + + 请填写您的企业信息 + +
+ 企业名称： + +
+ +
+ 联系人员： + +
+ +
+ 所在区域： + + + + +
+ 创建并进入 + + +
+ +
+
@@ -67,36 +178,52 @@ - diff --git a/src/views/receivingGoods/receivingGoodsAdd.vue b/src/views/receivingGoods/receivingGoodsAdd.vue deleted file mode 100644 index 5954129..0000000 --- a/src/views/receivingGoods/receivingGoodsAdd.vue +++ /dev/null @@ -1,1143 +0,0 @@ - - - - diff --git a/src/views/receivingGoods/receivingGoodsInfo.vue b/src/views/receivingGoods/receivingGoodsInfo.vue deleted file mode 100644 index f59c5ed..0000000 --- a/src/views/receivingGoods/receivingGoodsInfo.vue +++ /dev/null @@ -1,308 +0,0 @@ - - - - diff --git a/src/views/receivingGoods/upShelfAddRecord.vue b/src/views/receivingGoods/upShelfAddRecord.vue deleted file mode 100644 index c0dc358..0000000 --- a/src/views/receivingGoods/upShelfAddRecord.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - - diff --git a/src/views/storageage/storageage.vue b/src/views/storageage/storageage.vue deleted file mode 100644 index e51c993..0000000 --- a/src/views/storageage/storageage.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - diff --git a/src/views/system/dictManage/dictCommon.vue b/src/views/system/dictManage/dictCommon.vue new file mode 100644 index 0000000..81e58fc --- /dev/null +++ b/src/views/system/dictManage/dictCommon.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/src/views/system/dictManage/dictManage.vue b/src/views/system/dictManage/dictManage.vue new file mode 100644 index 0000000..f325967 --- /dev/null +++ b/src/views/system/dictManage/dictManage.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/system/dictManage/dictMap.vue b/src/views/system/dictManage/dictMap.vue new file mode 100644 index 0000000..ede63bc --- /dev/null +++ b/src/views/system/dictManage/dictMap.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/system/logManage/logManage.vue b/src/views/system/logManage/logManage.vue new file mode 100644 index 0000000..ab23366 --- /dev/null +++ b/src/views/system/logManage/logManage.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue new file mode 100644 index 0000000..d350f22 --- /dev/null +++ b/src/views/system/menuManage/menuManage.vue @@ -0,0 +1,572 @@ + + + + + + + diff --git a/src/views/system/organizationManage/organizationManage.vue b/src/views/system/organizationManage/organizationManage.vue new file mode 100644 index 0000000..e9b5159 --- /dev/null +++ b/src/views/system/organizationManage/organizationManage.vue @@ -0,0 +1,660 @@ + + + + + + + diff --git a/src/views/system/postManage/postManage.vue b/src/views/system/postManage/postManage.vue new file mode 100644 index 0000000..326961d --- /dev/null +++ b/src/views/system/postManage/postManage.vue @@ -0,0 +1,505 @@ + + + + + diff --git a/src/views/system/roleAdminister/roleAdminister.vue b/src/views/system/roleAdminister/roleAdminister.vue new file mode 100644 index 0000000..3a9086c --- /dev/null +++ b/src/views/system/roleAdminister/roleAdminister.vue @@ -0,0 +1,977 @@ + + + + + diff --git a/src/views/system/userManage/userManage.vue b/src/views/system/userManage/userManage.vue new file mode 100644 index 0000000..37d826e --- /dev/null +++ b/src/views/system/userManage/userManage.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/system/userManage/userManageAdd.vue b/src/views/system/userManage/userManageAdd.vue new file mode 100644 index 0000000..7899d82 --- /dev/null +++ b/src/views/system/userManage/userManageAdd.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/system/userManage/userManageList.vue b/src/views/system/userManage/userManageList.vue new file mode 100644 index 0000000..ce96a96 --- /dev/null +++ b/src/views/system/userManage/userManageList.vue @@ -0,0 +1,504 @@ + + + + + diff --git a/src/views/upShelf/index.vue b/src/views/upShelf/index.vue deleted file mode 100644 index 81c3228..0000000 --- a/src/views/upShelf/index.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - diff --git a/src/views/upShelf/upShelfAdd.vue b/src/views/upShelf/upShelfAdd.vue deleted file mode 100644 index dfbefc2..0000000 --- a/src/views/upShelf/upShelfAdd.vue +++ /dev/null @@ -1,412 +0,0 @@ - - - - diff --git a/src/views/upShelf/upShelfInfo.vue b/src/views/upShelf/upShelfInfo.vue deleted file mode 100644 index 7d8238b..0000000 --- a/src/views/upShelf/upShelfInfo.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - diff --git a/src/views/warehouse/allocation/allocationAdd.vue b/src/views/warehouse/allocation/allocationAdd.vue deleted file mode 100644 index b375c94..0000000 --- a/src/views/warehouse/allocation/allocationAdd.vue +++ /dev/null @@ -1,470 +0,0 @@ - - - - - diff --git a/src/views/warehouse/allocation/index.vue b/src/views/warehouse/allocation/index.vue deleted file mode 100644 index 611a9cc..0000000 --- a/src/views/warehouse/allocation/index.vue +++ /dev/null @@ -1,324 +0,0 @@ - - - - diff --git a/src/views/warehouse/distribution/distributionAdd.vue b/src/views/warehouse/distribution/distributionAdd.vue deleted file mode 100644 index 27948e1..0000000 --- a/src/views/warehouse/distribution/distributionAdd.vue +++ /dev/null @@ -1,317 +0,0 @@ - - - - diff --git a/src/views/warehouse/distribution/distributionInfo.vue b/src/views/warehouse/distribution/distributionInfo.vue deleted file mode 100644 index 4531168..0000000 --- a/src/views/warehouse/distribution/distributionInfo.vue +++ /dev/null @@ -1,218 +0,0 @@ - - - - diff --git a/src/views/warehouse/distribution/index.vue b/src/views/warehouse/distribution/index.vue deleted file mode 100644 index 9184431..0000000 --- a/src/views/warehouse/distribution/index.vue +++ /dev/null @@ -1,354 +0,0 @@ - - - - diff --git a/src/views/warehouse/inOutStorage/index.vue b/src/views/warehouse/inOutStorage/index.vue deleted file mode 100644 index 64b722c..0000000 --- a/src/views/warehouse/inOutStorage/index.vue +++ /dev/null @@ -1,396 +0,0 @@ - - - - diff --git a/src/views/warehouse/inStorage/inStorageAdd.vue b/src/views/warehouse/inStorage/inStorageAdd.vue deleted file mode 100644 index 439ca7f..0000000 --- a/src/views/warehouse/inStorage/inStorageAdd.vue +++ /dev/null @@ -1,1143 +0,0 @@ - - - - diff --git a/src/views/warehouse/inStorage/inStorageInfo.vue b/src/views/warehouse/inStorage/inStorageInfo.vue deleted file mode 100644 index f59c5ed..0000000 --- a/src/views/warehouse/inStorage/inStorageInfo.vue +++ /dev/null @@ -1,308 +0,0 @@ - - - - diff --git a/src/views/warehouse/inStorage/index.vue b/src/views/warehouse/inStorage/index.vue deleted file mode 100644 index 60032f9..0000000 --- a/src/views/warehouse/inStorage/index.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - diff --git a/src/views/warehouse/inventory/index.vue b/src/views/warehouse/inventory/index.vue deleted file mode 100644 index 3575ebe..0000000 --- a/src/views/warehouse/inventory/index.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - diff --git a/src/views/warehouse/inventory/inventoryInfo.vue b/src/views/warehouse/inventory/inventoryInfo.vue deleted file mode 100644 index d5a9fda..0000000 --- a/src/views/warehouse/inventory/inventoryInfo.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsCope/index.vue b/src/views/warehouse/oldPartsCope/index.vue deleted file mode 100644 index da412e8..0000000 --- a/src/views/warehouse/oldPartsCope/index.vue +++ /dev/null @@ -1,323 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsCope/oldPartsCopeAdd.vue b/src/views/warehouse/oldPartsCope/oldPartsCopeAdd.vue deleted file mode 100644 index a8427de..0000000 --- a/src/views/warehouse/oldPartsCope/oldPartsCopeAdd.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsCope/oldPartsCopeInfo.vue b/src/views/warehouse/oldPartsCope/oldPartsCopeInfo.vue deleted file mode 100644 index 02b4e61..0000000 --- a/src/views/warehouse/oldPartsCope/oldPartsCopeInfo.vue +++ /dev/null @@ -1,296 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsFactory/index.vue b/src/views/warehouse/oldPartsFactory/index.vue deleted file mode 100644 index 37d607e..0000000 --- a/src/views/warehouse/oldPartsFactory/index.vue +++ /dev/null @@ -1,425 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsFactory/oldPartsFactoryAdd.vue b/src/views/warehouse/oldPartsFactory/oldPartsFactoryAdd.vue deleted file mode 100644 index be9f297..0000000 --- a/src/views/warehouse/oldPartsFactory/oldPartsFactoryAdd.vue +++ /dev/null @@ -1,575 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsFactory/oldPartsFactoryInfo.vue b/src/views/warehouse/oldPartsFactory/oldPartsFactoryInfo.vue deleted file mode 100644 index 1b32cf6..0000000 --- a/src/views/warehouse/oldPartsFactory/oldPartsFactoryInfo.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsInAndOutStorage/index.vue b/src/views/warehouse/oldPartsInAndOutStorage/index.vue deleted file mode 100644 index 4e7a95b..0000000 --- a/src/views/warehouse/oldPartsInAndOutStorage/index.vue +++ /dev/null @@ -1,438 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsInStorage/index.vue b/src/views/warehouse/oldPartsInStorage/index.vue deleted file mode 100644 index 18af288..0000000 --- a/src/views/warehouse/oldPartsInStorage/index.vue +++ /dev/null @@ -1,329 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsInStorage/oldPartsInStorageAdd.vue b/src/views/warehouse/oldPartsInStorage/oldPartsInStorageAdd.vue deleted file mode 100644 index 4043457..0000000 --- a/src/views/warehouse/oldPartsInStorage/oldPartsInStorageAdd.vue +++ /dev/null @@ -1,335 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsInvertory/index.vue b/src/views/warehouse/oldPartsInvertory/index.vue deleted file mode 100644 index 984f42d..0000000 --- a/src/views/warehouse/oldPartsInvertory/index.vue +++ /dev/null @@ -1,432 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsInvertory/oldPartsInvertoryInfo.vue b/src/views/warehouse/oldPartsInvertory/oldPartsInvertoryInfo.vue deleted file mode 100644 index 525c794..0000000 --- a/src/views/warehouse/oldPartsInvertory/oldPartsInvertoryInfo.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsRecovery/index.vue b/src/views/warehouse/oldPartsRecovery/index.vue deleted file mode 100644 index 00dc383..0000000 --- a/src/views/warehouse/oldPartsRecovery/index.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryAdd.vue b/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryAdd.vue deleted file mode 100644 index 641e13e..0000000 --- a/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryAdd.vue +++ /dev/null @@ -1,555 +0,0 @@ - - - - diff --git a/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryInfo.vue b/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryInfo.vue deleted file mode 100644 index f68ce6a..0000000 --- a/src/views/warehouse/oldPartsRecovery/oldPartsRecoveryInfo.vue +++ /dev/null @@ -1,227 +0,0 @@ - - - - diff --git a/src/views/warehouse/outStorage/distributionAdd.vue b/src/views/warehouse/outStorage/distributionAdd.vue deleted file mode 100644 index ed2430b..0000000 --- a/src/views/warehouse/outStorage/distributionAdd.vue +++ /dev/null @@ -1,291 +0,0 @@ - - - - diff --git a/src/views/warehouse/outStorage/index.vue b/src/views/warehouse/outStorage/index.vue deleted file mode 100644 index 8689774..0000000 --- a/src/views/warehouse/outStorage/index.vue +++ /dev/null @@ -1,335 +0,0 @@ - - - - diff --git a/src/views/warehouse/outStorage/outStorageAdd.vue b/src/views/warehouse/outStorage/outStorageAdd.vue deleted file mode 100644 index 2e88be7..0000000 --- a/src/views/warehouse/outStorage/outStorageAdd.vue +++ /dev/null @@ -1,529 +0,0 @@ - - - - diff --git a/src/views/warehouse/outStorage/outStorageInfo.vue b/src/views/warehouse/outStorage/outStorageInfo.vue deleted file mode 100644 index 4f7aa1d..0000000 --- a/src/views/warehouse/outStorage/outStorageInfo.vue +++ /dev/null @@ -1,231 +0,0 @@ - - - - diff --git a/src/views/warehouse/reservationInStorage/index.vue b/src/views/warehouse/reservationInStorage/index.vue deleted file mode 100644 index 89cb6f7..0000000 --- a/src/views/warehouse/reservationInStorage/index.vue +++ /dev/null @@ -1,511 +0,0 @@ - - - - diff --git a/src/views/warehouse/stocktaking/index.vue b/src/views/warehouse/stocktaking/index.vue deleted file mode 100644 index b0562ee..0000000 --- a/src/views/warehouse/stocktaking/index.vue +++ /dev/null @@ -1,322 +0,0 @@ - - - - diff --git a/src/views/warehouse/stocktaking/stocktakingAdd.vue b/src/views/warehouse/stocktaking/stocktakingAdd.vue deleted file mode 100644 index 2466f62..0000000 --- a/src/views/warehouse/stocktaking/stocktakingAdd.vue +++ /dev/null @@ -1,412 +0,0 @@ - - - - -