From 16610e1390110677d397a1e7de4e80b48d1abeef Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Mon, 17 Jan 2022 15:32:28 +0800 Subject: [PATCH 1/5] 1 --- package.json | 2 +- vue.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2f2edfc..e51dedf 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@vue/test-utils": "1.0.0-beta.29", "autoprefixer": "^9.5.1", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", + "babel-eslint": "8.2.2", "babel-jest": "23.6.0", "chalk": "2.4.2", "chokidar": "2.1.5", diff --git a/vue.config.js b/vue.config.js index d760c0c..b85eedc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -47,7 +47,7 @@ module.exports = { proxy: { '/api': { target: 'http://localhost:8080', - // target: 'http://192.168.0.198:8080', + // target: 'http://192.168.0.188:8080', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', -- 2.45.2 From b800893ea5cd9295ab605bdff04d997484300e31 Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Tue, 18 Jan 2022 17:02:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E2=80=98=E5=AF=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Cache/area.js | 2 +- src/api/basicData/Cache/cache.js | 2 +- src/api/basicData/Cache/storageBox.js | 4 +- src/api/basicData/Equipment/equipmentInfo.js | 2 +- src/router/index.js | 39 ++++++++++++++++++++ src/views/basicData/Cache/cache.vue | 3 +- vue.config.js | 4 +- 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/api/basicData/Cache/area.js b/src/api/basicData/Cache/area.js index 856032d..ec39efc 100644 --- a/src/api/basicData/Cache/area.js +++ b/src/api/basicData/Cache/area.js @@ -41,7 +41,7 @@ export function areaAdd(data) { // 新增缓存区区域信息单条数据 export function areaCode() { // 获取缓存区区域信息code return request({ - url: '/api/wms/area/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } diff --git a/src/api/basicData/Cache/cache.js b/src/api/basicData/Cache/cache.js index cf33218..30f715e 100644 --- a/src/api/basicData/Cache/cache.js +++ b/src/api/basicData/Cache/cache.js @@ -41,7 +41,7 @@ export function cacheAdd(data) { // 新增缓存区信息单条数据 export function cacheCode() { // 获取缓存区信息code return request({ - url: '/api/wms/area/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } diff --git a/src/api/basicData/Cache/storageBox.js b/src/api/basicData/Cache/storageBox.js index ea1f238..ceddaf4 100644 --- a/src/api/basicData/Cache/storageBox.js +++ b/src/api/basicData/Cache/storageBox.js @@ -41,7 +41,7 @@ export function storageBoxAdd(data) { // 新增存储箱单条数据 export function storageBoxCode() { // 获取存储箱code return request({ - url: '/api/wms/storagebox/get-code', + url: '/api/wms/storagebox/getCode', method: 'post' }) } @@ -56,7 +56,7 @@ export function storageBoxDelete(id) { // 删除存储箱单条数据 export function PositionDetailInfoAdd(data) { // 新增存储箱地址单条数据 return request({ - url: '/api/wms/storagebox-site/add', + url: '/api/wms/storagebox/add', method: 'post', data }) diff --git a/src/api/basicData/Equipment/equipmentInfo.js b/src/api/basicData/Equipment/equipmentInfo.js index 61747b3..fee35a8 100644 --- a/src/api/basicData/Equipment/equipmentInfo.js +++ b/src/api/basicData/Equipment/equipmentInfo.js @@ -41,7 +41,7 @@ export function equipmentInfoAdd(data) { // 新增设备信息单条数据 export function equipmentInfoCode() { // 获取设备信息code return request({ - url: '/api/wms/equipment/get-code', + url: '/api/wms/equipment/getCode', method: 'post' }) } diff --git a/src/router/index.js b/src/router/index.js index a9304c8..81600c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -224,6 +224,45 @@ export const constantRoutes = [ ] }, { + // path: '/form', + // component: Layout, + // redirect: '/form', + // name: 'formManage', + // meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false }, + // children: [{ + // path: 'report', + // component: () => import('@/views/report-manage/ReportSortChoise'), + // name: 'Report', + // meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-sort-list', + // component: () => import('@/views/report-manage/Report'), + // name: 'ReportSortList', + // hidden: true, + // meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-view', + // component: () => import('@/views/report-manage/ReportView'), + // name: 'ReportDesign', + // meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true }, + // hidden: true + // }, + // { + // path: 'report-design', + // component: () => import('@/views/report-manage/ReportDesign'), + // name: 'ReportDesign', + // meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true } + // }, + // { + // path: 'report-sort', + // component: () => import('@/views/report-manage/ReportSort/index'), + // name: 'ReportSort', + // meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true } + // }] + // }, + // { path: '/interface', component: Layout, redirect: '/interface', diff --git a/src/views/basicData/Cache/cache.vue b/src/views/basicData/Cache/cache.vue index fc94aed..71fa389 100644 --- a/src/views/basicData/Cache/cache.vue +++ b/src/views/basicData/Cache/cache.vue @@ -44,6 +44,7 @@ import BaseTable from '@/components/BaseTable' import Pagination from '@/components/Pagination' // Secondary package based on el-pagination import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' import { timeFormatter } from '@/filters' + /** * 表格表头配置项 TypeScript接口注释 * tableConfig = [] @@ -133,7 +134,7 @@ export default { methods: { handleClick(raw) { if (raw.type === 'delete') { - this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), { + this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.tareaName}]?`, this.$t('module.basicData.visual.Tips'), { confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'), type: 'warning' diff --git a/vue.config.js b/vue.config.js index b85eedc..0dedbbf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - target: 'http://localhost:8080', - // target: 'http://192.168.0.188:8080', + // target: 'http://localhost:8080', + target: 'http://192.168.0.148:8080', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', -- 2.45.2 From fe1c64845e48d7ab67e3a993207d0aac06e3e62c Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Wed, 16 Feb 2022 19:32:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E2=80=98=E5=9F=BA=E7=A1=80=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=AF=B9=E6=8E=A5=E5=8F=A3=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Cache/area.js | 4 ++-- src/api/basicData/Cache/shelf.js | 13 +++++++------ src/api/basicData/Equipment/equipmentGroup.js | 3 ++- src/api/basicData/Equipment/equipmentInfo.js | 6 ++++-- src/api/basicData/Equipment/equipmentInfoAttr.js | 6 ++++-- src/api/basicData/Equipment/equipmentType.js | 3 ++- vue.config.js | 4 ++-- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/api/basicData/Cache/area.js b/src/api/basicData/Cache/area.js index ec39efc..18e995f 100644 --- a/src/api/basicData/Cache/area.js +++ b/src/api/basicData/Cache/area.js @@ -9,7 +9,7 @@ import request from '@/utils/request' export function areaList(data) { // 获取缓存区区域信息列表 return request({ - url: '/api/wms/area/shelf', + url: '/api/wms/area/page', method: 'post', data }) @@ -17,7 +17,7 @@ export function areaList(data) { // 获取缓存区区域信息列表 export function areaDetail(id) { // 获取缓存区区域信息单条数据 return request({ - url: '/api/wms/area/get', + url: '/api/wms/area/getById', method: 'post', data: { id } }) diff --git a/src/api/basicData/Cache/shelf.js b/src/api/basicData/Cache/shelf.js index e1ceb3a..b4e5d4b 100644 --- a/src/api/basicData/Cache/shelf.js +++ b/src/api/basicData/Cache/shelf.js @@ -9,7 +9,7 @@ import request from '@/utils/request' export function shelfList(data) { // 获取货架信息列表 return request({ - url: '/basic/shelf/page', + url: '/api/wms/area/shelf', method: 'post', data }) @@ -17,7 +17,7 @@ export function shelfList(data) { // 获取货架信息列表 export function shelfDetail(id) { // 获取货架信息单条数据 return request({ - url: '/basic/shelf/get', + url: '/api/wms/area/shelfById', method: 'post', data: { id } }) @@ -25,7 +25,8 @@ export function shelfDetail(id) { // 获取货架信息单条数据 export function shelfUpdate(data) { // 更新货架信息单条数据 return request({ - url: '/basic/shelf/update', + // url: '/basic/shelf/update', + url: '/api/wms/area/updateshelf', method: 'post', data }) @@ -33,7 +34,7 @@ export function shelfUpdate(data) { // 更新货架信息单条数据 export function shelfAdd(data) { // 新增货架信息单条数据 return request({ - url: '/basic/shelf/add', + url: '/api/wms/area/addshelf', method: 'post', data }) @@ -41,14 +42,14 @@ export function shelfAdd(data) { // 新增货架信息单条数据 export function shelfCode() { // 获取货架信息code return request({ - url: '/basic/shelf/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } export function shelfDelete(id) { // 删除货架信息单条数据 return request({ - url: '/basic/shelf/delete', + url: '/api/wms/area/deleteshelf', method: 'post', data: { id } }) diff --git a/src/api/basicData/Equipment/equipmentGroup.js b/src/api/basicData/Equipment/equipmentGroup.js index 360fd86..b3a27e3 100644 --- a/src/api/basicData/Equipment/equipmentGroup.js +++ b/src/api/basicData/Equipment/equipmentGroup.js @@ -10,7 +10,8 @@ import request from '@/utils/request' export function equipmentGroupList(data) { // 获取设备分组列表 return request({ - url: '/equipment/equipment-group/findAll', + // url: '/equipment/equipment-group/findAll', + url: '/api/wms/equipment/page', method: 'post', data }) diff --git a/src/api/basicData/Equipment/equipmentInfo.js b/src/api/basicData/Equipment/equipmentInfo.js index fee35a8..449d2e9 100644 --- a/src/api/basicData/Equipment/equipmentInfo.js +++ b/src/api/basicData/Equipment/equipmentInfo.js @@ -64,8 +64,10 @@ export function equipmentInfoFileAdd(data) { // 设备信息上传 export function getEquipmentInfoFile(data) { // 设备信息下载 return request({ - url: '/api/wms/equipment-file/get-by-param', - method: 'post', + // url: '/api/wms/equipment-file/get-by-param', + url: '/api/common/attachment/downloadFile', + // method: 'post', + method: 'get', data }) } diff --git a/src/api/basicData/Equipment/equipmentInfoAttr.js b/src/api/basicData/Equipment/equipmentInfoAttr.js index e7ed725..572e245 100644 --- a/src/api/basicData/Equipment/equipmentInfoAttr.js +++ b/src/api/basicData/Equipment/equipmentInfoAttr.js @@ -9,7 +9,8 @@ import request from '@/utils/request' export function equipmentInfoAttrList(data) { // 获取设备属性列表 return request({ - url: '/basic/equipment-attr/page', + // url: '/basic/equipment-attr/page', + url: '/api/wms/equipment/page', method: 'post', data }) @@ -17,7 +18,8 @@ export function equipmentInfoAttrList(data) { // 获取设备属性列表 export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据 return request({ - url: '/basic/equipment-attr/get', + // url: '/basic/equipment-attr/get', + url: '/api/wms/equipment/attrById', method: 'post', data: { id } }) diff --git a/src/api/basicData/Equipment/equipmentType.js b/src/api/basicData/Equipment/equipmentType.js index 3f075b7..6a44a7e 100644 --- a/src/api/basicData/Equipment/equipmentType.js +++ b/src/api/basicData/Equipment/equipmentType.js @@ -9,7 +9,8 @@ import request from '@/utils/request' export function equipmentTypeList(data) { // 获取设备类型列表 return request({ - url: '/basic/equipment-type/page', + // url: '/basic/equipment-type/page', + url: '/api/wms/equipment/page', method: 'post', data }) diff --git a/vue.config.js b/vue.config.js index 0dedbbf..4663d2a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - // target: 'http://localhost:8080', - target: 'http://192.168.0.148:8080', + target: 'http://localhost:8080', + // target: 'http://192.168.0.148:8080', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', -- 2.45.2 From 2628c14e99518e88a493f026e68bbb45590cc571 Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Wed, 16 Feb 2022 19:36:26 +0800 Subject: [PATCH 4/5] '' --- src/router/index.js | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index ad5cbfb..096dfc3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -149,8 +149,7 @@ export const constantRoutes = [ }, { path: 'equipmentInfo', - component: () => - import('@/views/basicData/Equipment/equipmentInfo'), + component: () => import('@/views/basicData/Equipment/equipmentInfo'), name: 'equipmentInfo', meta: { title: routerTitle.basicData.equipment.equipmentInfo?.[language] || routerTitle.basicData.equipment.equipmentInfo.en, icon: 'form', affix: true, required: true, requireToken: true } }, @@ -224,45 +223,6 @@ export const constantRoutes = [ ] }, { - // path: '/form', - // component: Layout, - // redirect: '/form', - // name: 'formManage', - // meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false }, - // children: [{ - // path: 'report', - // component: () => import('@/views/report-manage/ReportSortChoise'), - // name: 'Report', - // meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true } - // }, - // { - // path: 'report-sort-list', - // component: () => import('@/views/report-manage/Report'), - // name: 'ReportSortList', - // hidden: true, - // meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true } - // }, - // { - // path: 'report-view', - // component: () => import('@/views/report-manage/ReportView'), - // name: 'ReportDesign', - // meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true }, - // hidden: true - // }, - // { - // path: 'report-design', - // component: () => import('@/views/report-manage/ReportDesign'), - // name: 'ReportDesign', - // meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true } - // }, - // { - // path: 'report-sort', - // component: () => import('@/views/report-manage/ReportSort/index'), - // name: 'ReportSort', - // meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true } - // }] - // }, - // { path: '/interface', component: Layout, redirect: '/interface', -- 2.45.2 From 64c27487c5bd91100b21a89fd563fd212ec8e6b3 Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Fri, 25 Feb 2022 15:12:37 +0800 Subject: [PATCH 5/5] '' --- src/views/basicData/Cache/cache.vue | 2 +- src/views/basicData/Cache/components/cache-add.vue | 6 +++--- src/views/basicData/Cache/components/shelf-add.vue | 2 +- .../basicData/Cache/components/shelfAttr-add.vue | 11 +++++++---- src/views/basicData/Cache/shelf.vue | 1 + 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/views/basicData/Cache/cache.vue b/src/views/basicData/Cache/cache.vue index 71fa389..3d54870 100644 --- a/src/views/basicData/Cache/cache.vue +++ b/src/views/basicData/Cache/cache.vue @@ -134,7 +134,7 @@ export default { methods: { handleClick(raw) { if (raw.type === 'delete') { - this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.tareaName}]?`, this.$t('module.basicData.visual.Tips'), { + this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), { confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'), cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'), type: 'warning' diff --git a/src/views/basicData/Cache/components/cache-add.vue b/src/views/basicData/Cache/components/cache-add.vue index 17b8794..b0b574a 100644 --- a/src/views/basicData/Cache/components/cache-add.vue +++ b/src/views/basicData/Cache/components/cache-add.vue @@ -98,7 +98,7 @@ /> - + @@ -107,7 +107,7 @@ import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/C import { areaList, areaDelete } from '@/api/basicData/Cache/area' import BaseTable from '@/components/BaseTable' import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn' -import cacheAreaAdd from './cacheArea-add.vue' +import shelfAttrAdd from './shelfAttr-add.vue' import shelfBtn from './shelfBtn.vue' const tableBtn = [ { @@ -154,7 +154,7 @@ const tableProps = [ ] export default { - components: { BaseTable, MethodBtn, cacheAreaAdd }, + components: { BaseTable, MethodBtn, shelfAttrAdd }, data() { return { addOrUpdateVisible: false, diff --git a/src/views/basicData/Cache/components/shelf-add.vue b/src/views/basicData/Cache/components/shelf-add.vue index 3ff9c37..9e8ee91 100644 --- a/src/views/basicData/Cache/components/shelf-add.vue +++ b/src/views/basicData/Cache/components/shelf-add.vue @@ -75,7 +75,7 @@ const tableProps = [ align: 'center' }, { - prop: 'name', + prop: 'shelfName', label: i18n.t('module.basicData.cache.ShelfName'), align: 'center' }, diff --git a/src/views/basicData/Cache/components/shelfAttr-add.vue b/src/views/basicData/Cache/components/shelfAttr-add.vue index cf17bac..303085a 100644 --- a/src/views/basicData/Cache/components/shelfAttr-add.vue +++ b/src/views/basicData/Cache/components/shelfAttr-add.vue @@ -12,7 +12,7 @@ > - + @@ -56,15 +56,17 @@ export default { visible: false, isPage: false, dataForm: { + abbr: 'n', id: 0, areaId: '', - name: '', + shelfName: '', code: '', - shelfNumber: '' + shelfNumber: '', + total: '' }, areaArr: [], dataRule: { - name: [ + shelfName: [ { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.ShelfName')]), trigger: 'blur' } ], code: [ @@ -112,6 +114,7 @@ export default { this.$refs['dataForm'].validate((valid) => { if (valid) { const data = this.dataForm + console.log(data) if (this.dataForm.id) { shelfUpdate(data).then(res => { this.$message({ diff --git a/src/views/basicData/Cache/shelf.vue b/src/views/basicData/Cache/shelf.vue index 96c47f8..64b6ac7 100644 --- a/src/views/basicData/Cache/shelf.vue +++ b/src/views/basicData/Cache/shelf.vue @@ -181,6 +181,7 @@ export default { this.listLoading = true this.listQuery.name = key shelfList(this.listQuery).then(response => { + console.log(response) if (response.data.records) { this.list = response.data.records this.list.forEach(item => { -- 2.45.2