Merge pull request 'fzq' (#20) from fzq into develop

Reviewed-on: #20
2022-02-28 10:33:30 +08:00 · 2022-02-28 10:33:30 +08:00 · 21d7a8f7eb
commit 21d7a8f7eb
--- a/package.json
+++ b/package.json
@ -66,7 +66,6 @@
    "nprogress": "0.2.0",
    "outlayer": "^2.1.1",
    "path-to-regexp": "2.4.0",
-    "raphael": "git+https://gitee.com/shihairong/raphael",
    "screenfull": "4.2.0",
    "script-loader": "0.7.2",
    "showdown": "1.9.0",
@ -97,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",
--- 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 }
  })
@ -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'
  })
 }
--- 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'
  })
 }
--- 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 }
  })
--- 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
  })
--- 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
  })
--- 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'
  })
 }
@ -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
  })
 }
--- 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 }
  })
--- 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
  })
--- 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 }
      },
@ -279,64 +278,6 @@ export const constantRoutes = [
      }
    ]
  },
-  {
-    path: '/equipment',
-    component: Layout,
-    // redirect: '/equipment/manager',
-    name: 'EquipmentManager',
-    meta: { title: routerTitle.equipment?.[language] || routerTitle.equipment.en, icon: 'form', iconPart: 'EquipmentManager', affix: true, required: true, requireToken: true },
-    children: [{
-      path: 'bom',
-      component: () => import('@/views/EquipmentManager/BOMManager'),
-      name: 'BOMManage',
-      meta: { title: routerTitle.equipment.bom?.[language] || routerTitle.equipment.bom.en, icon: 'form', affix: true, required: true, requireToken: true }
-    }, {
-      path: 'recipe',
-      component: () => import('@/views/EquipmentManager/RecipeManager'),
-      name: 'RecipeManage',
-      meta: { title: routerTitle.equipment.recipe?.[language] || routerTitle.equipment.recipe.en, icon: 'form', affix: true }
-    }
-    ]
-  },
-  {
-    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,
--- 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<ConfigItem> = []
--- a/src/views/basicData/Cache/components/cache-add.vue
+++ b/src/views/basicData/Cache/components/cache-add.vue
@ -98,7 +98,7 @@
        />
      </base-table>
    </div>
-    <cacheArea-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
+    <shelfAttr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.id" @refreshDataList="getList" />
  </div>
 </template>

@ -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,
--- 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'
  },
--- a/src/views/basicData/Cache/components/shelfAttr-add.vue
+++ b/src/views/basicData/Cache/components/shelfAttr-add.vue
@ -12,7 +12,7 @@
  >
    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
      <el-form-item :label="$t('module.basicData.cache.ShelfName')" prop="name">
-        <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
+        <el-input v-model="dataForm.shelfName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfName')])" clearable />
      </el-form-item>
      <el-form-item :label="$t('module.basicData.cache.ShelfCode')" prop="code">
        <el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfCode')])" clearable />
@ -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({
--- 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 => {
--- a/vue.config.js
+++ b/vue.config.js
@ -46,8 +46,18 @@ module.exports = {
    // 这里写入需要代理的api和对应的目标地址
    proxy: {
      '/api': {
+<<<<<<< HEAD
+        target: 'http://localhost:8080',
+        // target: 'http://192.168.0.148:8080',
+=======
+<<<<<<< HEAD
+        // target: 'http://localhost:8080',
+        target: 'http://192.168.0.148:8080',
+=======
        // target: 'http://192.168.0.148:8080',
        target: 'http://a.wms.picaiba.com/api',
+>>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f
+>>>>>>> develop
        // target: 'http://192.168.0.127:8080',
        // target: 'http://192.168.0.165:8080',
        // target: 'http://192.168.43.105:8080',