.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = ''
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
 VUE_APP_REPORT_VIEW_URL = '/ureport/preview'

.gitignore

@@ -22,4 +22,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 /.env.development
-vue.config.js
+/vue.config.js

src/api/basicData/Cache/location.js

@@ -1,15 +1,15 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 14:29:17
+ * @LastEditTime: 2021-01-28 09:38:31
  * @Description:
  */
 import request from '@/utils/request'
 
 export function locationList(data) { // 获取库位信息列表
   return request({
-    url: '/api/wms/area/locationByShelf',
+    url: '/basic/stock/page',
     method: 'post',
     data
   })
@@ -17,7 +17,7 @@ export function locationList(data) { // 获取库位信息列表
 
 export function locationDetail(id) { // 获取库位信息单条数据
   return request({
-    url: '/api/wms/area/locationById',
+    url: '/basic/stock/get',
     method: 'post',
     data: { id }
   })
@@ -25,7 +25,7 @@ export function locationDetail(id) { // 获取库位信息单条数据
 
 export function locationUpdate(data) { // 更新库位信息单条数据
   return request({
-    url: '/api/wms/area/updatelocation',
+    url: '/basic/stock/update',
     method: 'post',
     data
   })
@@ -33,7 +33,7 @@ export function locationUpdate(data) { // 更新库位信息单条数据
 
 export function locationAdd(data) { // 新增库位信息单条数据
   return request({
-    url: '/api/wms/area/addlocation',
+    url: '/basic/stock/add',
     method: 'post',
     data
   })
@@ -41,14 +41,14 @@ export function locationAdd(data) { // 新增库位信息单条数据
 
 export function locationCode() { // 获取库位信息code
   return request({
-    url: '/api/wms/area/getCode',
+    url: '/basic/stock/get-code',
     method: 'post'
   })
 }
 
 export function locationDelete(id) { // 删除库位信息单条数据
   return request({
-    url: '/api/wms/area/deletelocation',
+    url: '/basic/stock/delete',
     method: 'post',
     data: { id }
   })

src/api/basicData/Cache/processLocation.js

@@ -1,48 +0,0 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-06 18:13:49
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 18:29:43
- */
-import request from '@/utils/request'
-
-export function list(data) { // 获取工序库位信息列表
-  return request({
-    url: '/api/wms/processlocation/page',
-    method: 'post',
-    data
-  })
-}
-
-export function detail(id) { // 获取工序库位信息单条数据
-  return request({
-    url: '/api/wms/processlocation/getById',
-    method: 'post',
-    data: { id }
-  })
-}
-export function update(data) { // 更新工序库位信息单条数据
-  return request({
-    url: '/api/wms/processlocation/update',
-    method: 'post',
-    data
-  })
-}
-
-export function add(data) { // 手动绑定工序库位
-  return request({
-    url: '/api/wms/processlocation/add',
-    method: 'post',
-    data
-  })
-}
-
-export function locaDelete(id) { // 删除工序库位信息单条数据
-  return request({
-    url: '/api/wms/processlocation/delete',
-    method: 'post',
-    data: { id }
-  })
-}

src/api/basicData/Equipment/equipmentInfoAttr.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2020-12-29 16:00:14
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-05 10:22:28
+ * @LastEditTime: 2021-01-20 12:00:52
  * @Description:
  */
 import request from '@/utils/request'
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 export function equipmentInfoAttrList(data) { // 获取设备属性列表
   return request({
     // url: '/basic/equipment-attr/page',
-    url: '/api/wms/equipment/attr',
+    url: '/api/wms/equipment/page',
     method: 'post',
     data
   })
@@ -27,7 +27,7 @@ export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据
 
 export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数据
   return request({
-    url: '/api/wms/equipment/updateattr',
+    url: '/basic/equipment-attr/update',
     method: 'post',
     data
   })
@@ -35,7 +35,7 @@ export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数
 
 export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
   return request({
-    url: '/api/wms/equipment/addattr',
+    url: '/basic/equipment-attr/add',
     method: 'post',
     data
   })
@@ -43,14 +43,14 @@ export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
 
 export function equipmentInfoAttrCode() { // 获取设备属性code
   return request({
-    url: '/api/wms/equipment/getCode',
+    url: '/basic/equipment-attr/get-code',
     method: 'post'
   })
 }
 
 export function equipmentInfoAttrDelete(id) { // 删除设备属性单条数据
   return request({
-    url: '/api/wms/equipment/deleteattr',
+    url: '/basic/equipment-attr/delete',
     method: 'post',
     data: { id }
   })

src/api/report-manage/report.js

@@ -1,36 +1,19 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-07 18:39:03
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-06 19:27:01
+ * @LastEditTime: 2022-02-25 09:05:53
  * @Description: file content
  */
 import request from '@/utils/request'
-// 获取当前库存存储箱列表
+
-export function list(data) {
-  return request({
-    url: '/api/report/report-storage-box/list',
-    method: 'post',
-    data
-  })
-}
-// 获取当前库存存储箱分页报表
 export function page(data) {
   return request({
-    url: '/api/report/report-storage-box/page',
+    url: '/api/report/report-sheet/page',
     method: 'post',
     data
   })
 }
-// 导出当前库存存储箱列表
-export function download(data) {
-  return request({
-    url: '/api/report/report-storage-box/excel-download',
-    method: 'post',
-    data,
-    'responseType': 'arraybuffer'
-  })
-}
 
 export function del(data) {
   return request({
@@ -64,44 +47,3 @@ export function listCategory(data) {
     data
   })
 }
-
-// 获取当前存储箱对应基板列表
-export function listSubstrate(data) {
-  return request({
-    url: '/api/report/report-substrate/list',
-    method: 'post',
-    data
-  })
-}
-// 删除基板信息
-export function deleSubstrate(data) {
-  return request({
-    url: '/api/report/report-substrate/delete',
-    method: 'post',
-    data
-  })
-}
-// 获取当前存储箱对应基板分页报表
-export function pageSubstrate(data) {
-  return request({
-    url: '/api/report/report-substrate/page',
-    method: 'post',
-    data
-  })
-}
-// 更新基板信息
-export function updateSubstrate(data) {
-  return request({
-    url: '/api/report/report-substrate/update',
-    method: 'post',
-    data
-  })
-}
-// 导出当前存储箱对应基板列表
-export function downloadSubstrate(data) {
-  return request({
-    url: '/api/report/report-substrate/excel-download',
-    method: 'post',
-    data
-  })
-}

src/filters/index.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: fzq
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-03-05 11:13:00
+ * @LastEditTime: 2021-07-22 09:12:23
  * @FilePath: \basic-admin\src\filters\index.js
  * @Description: 过滤器定义、多语言过滤器修改
  */

src/lang/i18n.js

@@ -571,18 +571,10 @@ export default {
           zh: '货架信息',
           en: 'Shelf Add'
         },
-        shelfInfo: {
-          zh: '货位管理',
-          en: 'Shelf Info'
-        },
         locationAdd: {
           zh: '库位信息',
           en: 'Location Add'
         },
-        location: {
-          zh: '添加库位',
-          en: 'Location Management'
-        },
         storageBox: {
           zh: '存储箱',
           en: 'Storage Box'
@@ -592,18 +584,6 @@ export default {
           en: 'Position Detail Info'
         }
       },
-      process: {
-        zh: '工序信息',
-        en: 'ProcessLocation Info',
-        processInfo: {
-          zh: '工序库位信息',
-          en: 'ProcessLocation Info'
-        },
-        processInfoAdd: {
-          zh: '工序库位信息管理',
-          en: 'ProcessLocation Manage'
-        }
-      },
       equipment: {
         zh: '设备信息',
         en: 'Equipment Info',
@@ -747,10 +727,6 @@ export default {
       HistoricalTask: {
         zh: '历史任务',
         en: 'Historical Task'
-      },
-      ProcessStorageManagement: {
-        zh: '工序存储区域管理',
-        en: 'Process Storage Management'
       }
     },
     order: {
@@ -944,26 +920,6 @@ export default {
     form: {
       zh: '报表管理',
       en: 'Report Form',
-      currentInventory: {
-        zh: '当前库存',
-        en: 'Current Inventory'
-      },
-      currentEmptyBox: {
-        zh: '当前仓库空箱信息',
-        en: 'Current Empty Box'
-      },
-      currentSubstrate: {
-        zh: '当前基板流转情况',
-        en: 'Current Substrate'
-      },
-      viewSubstrate: {
-        zh: '查看基板',
-        en: 'View Substrate'
-      },
-      editSubstrate: {
-        zh: '编辑基板',
-        en: 'Edit Substrate'
-      },
       report: {
         zh: '报表列表',
         en: 'Report List'

src/lang/i18n/en/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:45:54
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-04 15:07:12
+ * @LastEditTime: 2021-04-15 19:34:46
  * @Description: file content
  */
 
@@ -47,7 +47,6 @@ export default {
   sameEqError: 'Can not choice same equipment!',
   processList: {
     processName: 'Process Step Name',
-    processCode: 'process Code',
     processEq: 'Process Step Equipment',
     description: 'Description',
     addProcess: 'Add a Process Step',

src/lang/i18n/en/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 15:24:39
+ * @LastEditTime: 2022-03-04 10:13:58
  * @Description: file content
  */
 export default {
@@ -287,7 +287,6 @@ export default {
     BoxStatus: 'Box Status',
     BoxNumber: 'Box Number',
     PreviousOperation: 'Previous Operation',
-    ExecutionOperation: 'Execution Operation',
     NextOperation: 'Next Operation',
     CompletionTime: 'Completion Time',
     StartLocation: 'Start Location',
@@ -316,8 +315,6 @@ export default {
     IsEmpty: 'Is Empty',
     IsEmptyBox: 'Is Empty Box',
     LocationName: 'Location Name',
-    LocationCode: 'Location Code',
+    LocationCode: 'Location Code'
-    PerformTaskManual: 'Perform Task Manual',
-    processStorageLink: 'Process Storage Link'
   }
 }

src/lang/i18n/zh/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:46:00
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-04 15:07:02
+ * @LastEditTime: 2021-04-15 19:35:00
  * @Description: file content
  */
 
@@ -47,7 +47,6 @@ export default {
   sameEqError: '不能选择相同的设备!',
   processList: {
     processName: '工序名称',
-    processCode: '工序编码',
     processEq: '工序设备',
     description: '描述',
     addProcess: '添加一道工序',

src/lang/i18n/zh/module/basicData.js

@@ -2,7 +2,8 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-07 09:14:33
+ * @LastEditTime: 2022-03-04 10:13:41
+ * @Description: file content
  */
 export default {
   visual: {
@@ -134,8 +135,6 @@ export default {
     AreaName: '货架名称',
     rowNum: '行数',
     columnNum: '列数',
-    rowMark: '行标',
-    columnMark: '列标',
     Shelf: '货架',
     ManageShelves: '管理货架',
     ShelfCode: '货架编码',
@@ -146,16 +145,13 @@ export default {
     ManageLocation: '管理货位',
     LocationCode: '库位编码',
     LocationName: '库位名称',
-    locationType: '库位类型',
+    anotherName: '别名',
-    anotherName: '库位别名',
     place: '位置',
-    addCacheArea: '添加货架',
+    addCacheArea: '添加货架'
-    addLocation: '添加库位',
-    status: '状态'
   },
   storageBox: {
-    name: '存储箱名称',
+    name: '名称',
-    code: '存储箱编码',
+    code: '编码',
     alias: '别名',
     StorageQuantity: '存储数量',
     status: '状态',
@@ -166,8 +162,6 @@ export default {
     PositionCodeAlias: '位置编码别名'
   },
   equipment: {
-    shortName: '名称缩写',
-    enName: '英文名称',
     EquipmentName: '设备名称',
     EquipmentCode: '设备编码',
     EquipmentType: '设备类型',
@@ -245,14 +239,6 @@ export default {
     manual: '手动',
     workOrderId: '工单名称'
   },
-  processLocation: {
-    sequence: '顺序',
-    locationName: '库位名',
-    isProcess: '是否为工序准备箱',
-    locationId: '库位ID',
-    workSequenId: '工序ID',
-    equipmentMark: '设备标记'
-  },
   productPool: {
     productName: '产品名称',
     productCode: '产品编码'
@@ -301,7 +287,6 @@ export default {
     BoxStatus: '箱状态',
     BoxNumber: '箱号',
     PreviousOperation: '上一个工序',
-    ExecutionOperation: '执行工序',
     NextOperation: '下一个工序',
     CompletionTime: '完成时间',
     StartLocation: '开始库位',
@@ -330,8 +315,7 @@ export default {
     IsEmpty: '是否有基板',
     IsEmptyBox: '是否空箱',
     LocationName: '库位名',
-    LocationCode: '库位编码',
+    LocationCode: '库位编码'
-    PerformTaskManual: '手动执行任务',
+
-    processStorageLink: '工序关联库位'
   }
 }

src/lang/i18n/zh/module/report.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-22 19:48:46
- * @LastEditors: fzq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-06 16:50:50
+ * @LastEditTime: 2021-04-27 12:13:25
  * @Description: file content
  */
 
@@ -11,30 +11,7 @@ export default {
     reportName: '报表名称',
     reportSort: '报表分类',
     createTime: '添加时间',
-    operation: '操作',
+    operation: '操作'
-    storageBoxNumber: '存储箱号',
-    queryFiltering: '查询过滤'
-  },
-  inventory: {
-    code: '存储箱号',
-    status: '存储箱状态',
-    inprocessCode: '完成工序',
-    nextprocessCode: '下一个工序',
-    currentLocation: '当前库位',
-    storeTime: '存放时间',
-    orderName: '工单名',
-    substrateDetails: '详情基板',
-    viewSubstrates: '查看基板',
-    manual: '使用流程',
-    downl: '导出'
-  },
-  substrate: {
-    substrateCode: '基板编码',
-    location: '当前位置',
-    storeTime: '入库时间',
-    substrateStatus: '基板状态',
-    editSubstrate: '编辑基板',
-    interCode: '内部编码'
   },
   reportSort: {
     all: '全部'

src/router/index.js

@@ -98,19 +98,11 @@ export const constantRoutes = [
     name: 'basicData',
     meta: { title: routerTitle.basicData?.[language] || routerTitle.basicData.en, icon: 'form', iconPart: 'basicData', affix: true, required: true, requireToken: true },
     children: [
-      // 缓存区信息
-      {
-        path: 'cache',
-        component: () => import('@/views/basicData/Cache/cache'),
-        name: 'cache',
-        hidden: true,
-        meta: { title: routerTitle.basicData.ports.ports?.[language] || routerTitle.basicData.ports.ports.en, icon: 'form', affix: true }
-      },
       {
         path: 'ports',
-        component: () => import('@/views/basicData/Cache/shelf'),
+        component: () => import('@/views/basicData/Cache/cache'),
         name: 'ports',
-        meta: { title: routerTitle.basicData.ports.shelfInfo?.[language] || routerTitle.basicData.ports.shelfInfo.en, icon: 'form', affix: true }
+        meta: { title: routerTitle.basicData.ports.ports?.[language] || routerTitle.basicData.ports.ports.en, icon: 'form', affix: true }
       },
       {
         path: 'area',
@@ -155,19 +147,6 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: routerTitle.basicData.ports.PositionDetailInfo?.[language] || routerTitle.basicData.ports.PositionDetailInfo.en, icon: 'form', affix: true }
       },
-      {
-        path: 'processInfo',
-        component: () => import('@/views/basicData/Process/processInfo'),
-        name: 'processInfo',
-        meta: { title: routerTitle.basicData.process.processInfo?.[language] || routerTitle.basicData.process.processInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: 'processInfoAdd',
-        component: () => import('@/views/basicData/Process/components/processInfo-add'),
-        name: 'processInfoAdd',
-        hidden: true,
-        meta: { title: routerTitle.basicData.process.processInfoAdd?.[language] || routerTitle.basicData.process.processInfoAdd.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
       {
         path: 'equipmentInfo',
         component: () => import('@/views/basicData/Equipment/equipmentInfo'),
@@ -185,7 +164,6 @@ export const constantRoutes = [
         path: '/Materials',
         component: () => import('@/views/basicData/index'),
         name: 'Materials',
-        hidden: true,
         meta: { title: routerTitle.basicData.materials?.[language] || routerTitle.basicData.materials.en, icon: 'form', affix: true, required: true, requireToken: true },
         children: [
           {
@@ -298,21 +276,6 @@ export const constantRoutes = [
           import('@/views/basicData/Warehouse/HistoricalTask'),
         name: 'HistoricalTask',
         meta: { title: routerTitle.Warehouse.HistoricalTask?.[language] || routerTitle.Warehouse.HistoricalTask.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: '/ProcessStorageManagement',
-        component: () =>
-          import('@/views/basicData/Warehouse/ProcessStorageManagement'),
-        name: 'ProcessStorageManagement',
-        meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
-      },
-      {
-        path: '/ProcessStorageManagementInfo',
-        hidden: true,
-        component: () =>
-          import('@/views/basicData/Warehouse/components/ProcessStorageManagement-info'),
-        name: 'ProcessStorageManagementInfo',
-        meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
       }
     ]
   },
@@ -411,36 +374,36 @@ export const constantRoutes = [
     name: 'formManage',
     meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false },
     children: [{
-      path: 'currentInventory',
+      path: 'report',
-      component: () => import('@/views/report-manage/CurrentInventory'),
+      component: () => import('@/views/report-manage/ReportSortChoise'),
-      name: 'currentInventory',
+      name: 'Report',
-      meta: { title: routerTitle.form.currentInventory?.[language] || routerTitle.form.currentInventory.en, icon: 'form', affix: true, required: true, requireToken: true }
+      meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true }
     },
     {
-      path: 'currentEmptyBox',
+      path: 'report-sort-list',
-      component: () => import('@/views/report-manage/CurrentEmptyBox'),
+      component: () => import('@/views/report-manage/Report'),
-      name: 'currentEmptyBox',
+      name: 'ReportSortList',
-      meta: { title: routerTitle.form.currentEmptyBox?.[language] || routerTitle.form.currentEmptyBox.en, icon: 'form', affix: true, required: true, requireToken: true }
-    },
-    {
-      path: 'currentSubstrate',
-      component: () => import('@/views/report-manage/CurrentSubstrate'),
-      name: 'currentSubstrate',
-      meta: { title: routerTitle.form.currentSubstrate?.[language] || routerTitle.form.currentSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
-    },
-    {
-      path: 'editSubstrate',
-      component: () => import('@/views/report-manage/components/edit-substrate'),
-      name: 'editSubstrate',
       hidden: true,
-      meta: { title: routerTitle.form.editSubstrate?.[language] || routerTitle.form.editSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
+      meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true }
     },
     {
-      path: 'viewSubstrate',
+      path: 'report-view',
-      component: () => import('@/views/report-manage/components/viewSubstrate'),
+      component: () => import('@/views/report-manage/ReportView'),
-      name: 'viewSubstrate',
+      name: 'ReportDesign',
-      hidden: true,
+      meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true },
-      meta: { title: routerTitle.form.viewSubstrate?.[language] || routerTitle.form.viewSubstrate.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 }
     }]
   },
   {

src/views/basicData/Cache/cache.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 16:35:32
+ * @LastEditTime: 2022-01-11 15:48:58
  * @Description:
 -->
 <template>
@@ -158,9 +158,8 @@ export default {
     },
     getList(key) {
       this.listLoading = true
-      this.listQuery.tareaName = key
+      this.listQuery.name = key
       this.listQuery.code = key
-      console.log(this.listQuery)
       cacheList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records

src/views/basicData/Cache/components/cache-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 14:21:53
+ * @LastEditTime: 2022-01-11 16:26:29
  * @enName:
 -->
 <template>
@@ -104,11 +104,11 @@
 
 <script>import i18n from '@/lang'
 import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/Cache/cache'
-import { shelfList, shelfDelete } from '@/api/basicData/Cache/shelf'
+import { areaList, areaDelete } from '@/api/basicData/Cache/area'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import shelfAttrAdd from './shelfAttr-add.vue'
-import locationBtn from './locationBtn.vue'
+import shelfBtn from './shelfBtn.vue'
 const tableBtn = [
   {
     type: 'edit',
@@ -121,7 +121,7 @@ const tableBtn = [
 ]
 const tableProps = [
   {
-    prop: 'shelfName',
+    prop: 'name',
     label: i18n.t('module.basicData.cache.AreaName'),
     align: 'center'
   },
@@ -131,7 +131,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'total',
+    prop: 'shelfNum',
     label: i18n.t('module.basicData.cache.StorageQuantity'),
     align: 'center'
   },
@@ -148,7 +148,7 @@ const tableProps = [
   {
     prop: 'shelf',
     label: i18n.t('module.basicData.cache.Location'),
-    subcomponent: locationBtn,
+    subcomponent: shelfBtn,
     align: 'center'
   }
 ]
@@ -219,20 +219,9 @@ export default {
         if (this.id) {
           cacheDetail(this.id).then(res => {
             this.dataForm = res.data
-            // console.log(this.dataForm)
           })
           this.listQuery.id = this.id
-          console.log(this.listQuery.id)
+          areaList(this.listQuery).then(response => {
-          // shelfDetail(this.listQuery).then(response => {
-          //   console.log(response)
-          //   if (response.data.records) {
-          //     this.list = response.data.records
-          //   } else {
-          //     this.list.splice(0, this.list.length)
-          //   }
-          // })
-          shelfList(this.listQuery).then(response => {
-            console.log(response)
             if (response.data.records) {
               this.list = response.data.records
             } else {
@@ -247,7 +236,7 @@ export default {
       })
     },
     getList() {
-      shelfList(this.listQuery).then(response => {
+      areaList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records
         }
@@ -260,7 +249,7 @@ export default {
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'
         }).then(() => {
-          shelfDelete(raw.data.id).then(response => {
+          areaDelete(raw.data.id).then(response => {
             this.$message({
               message: this.$t('module.basicData.visual.success'),
               type: 'success',

src/views/basicData/Cache/components/location-add.vue

@@ -1,23 +1,16 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 19:08:00
+ * @LastEditTime: 2021-03-11 16:44:10
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <!-- <div style="margin:10px 50px">
+    <div style="margin:10px 50px">
       <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
       <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
-    </div> -->
+    </div>
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyNameAdd"
-      @getDataList="getList"
-      @add="addNew"
-    />
-    <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -37,11 +30,11 @@
 </template>
 
 <script>import i18n from '@/lang'
-import HeadForm from '@/components/basicData/HeadForm'
 import { locationList, locationDelete } from '@/api/basicData/Cache/location'
 import locationAttrAdd from './locationAttr-add.vue'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -69,15 +62,10 @@ const tableBtn = [
   }
 ]
 const tableProps = [
-  // {
-  //   prop: 'createTime',
-  //   label: i18n.t('module.basicData.factory.createTime'),
-  //   filter: timeFormatter,
-  //   align: 'center'
-  // },
   {
-    prop: 'locationName',
+    prop: 'createTime',
-    label: i18n.t('module.basicData.cache.LocationName'),
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
     align: 'center'
   },
   {
@@ -86,35 +74,30 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'locationNameAlias',
+    prop: 'name',
+    label: i18n.t('module.basicData.cache.LocationName'),
+    align: 'center'
+  },
+  {
+    prop: 'anotherName',
     label: i18n.t('module.basicData.cache.anotherName'),
     align: 'center'
   },
   {
-    prop: 'layers',
+    prop: 'place',
-    label: i18n.t('module.basicData.cache.rowMark'),
+    label: i18n.t('module.basicData.cache.place'),
     align: 'center'
   },
   {
-    prop: 'columns',
+    prop: 'remark',
-    label: i18n.t('module.basicData.cache.columnMark'),
+    label: i18n.t('module.basicData.visual.Remarks'),
-    align: 'center'
-  },
-  {
-    prop: 'locationType',
-    label: i18n.t('module.basicData.cache.locationType'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.cache.status'),
     align: 'center'
   }
 ]
 
 export default {
   name: 'Location',
-  components: { BaseTable, MethodBtn, locationAttrAdd, HeadForm },
+  components: { BaseTable, MethodBtn, locationAttrAdd },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -128,8 +111,6 @@ export default {
   data() {
     return {
       addOrUpdateVisible: false,
-      keyNameAdd: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: this.$t('module.basicData.cache.LocationName'),
       tableBtn,
       trueWidth: 200,
       tableProps,
@@ -138,8 +119,7 @@ export default {
       listQuery: {
         current: 1,
         size: 990,
-        shelfId: '',
+        shelfId: ''
-        id: ''
       }
     }
   },
@@ -150,8 +130,7 @@ export default {
   methods: {
     handleClick(raw) {
       if (raw.type === 'delete') {
-        console.log(raw.data)
+        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.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
           confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'
@@ -174,12 +153,9 @@ export default {
     getList(key) {
       this.listLoading = true
       this.listQuery.name = key
-      // shelfId与查询参数id关联
-      this.listQuery.id = this.listQuery.shelfId
       locationList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records
-          console.log(this.list)
         } else {
           this.list.splice(0, this.list.length)
         }

src/views/basicData/Cache/components/locationAttr-add.vue

@@ -1,36 +1,30 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 18:59:53
+ * @LastEditTime: 2021-03-25 16:23:03
  * @Description:
 -->
 <template>
   <el-dialog
-    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.shelfId ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.basicData.cache.LocationName')" prop="locationName">
+      <el-form-item :label="$t('module.basicData.cache.LocationName')" prop="name">
-        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationName')])" clearable />
+        <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationName')])" clearable />
       </el-form-item>
       <el-form-item :label="$t('module.basicData.cache.LocationCode')" prop="code">
         <el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationCode')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
+      <el-form-item :label="$t('module.basicData.cache.anotherName')" prop="anotherName">
-        <el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
+        <el-input v-model="dataForm.anotherName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+      <el-form-item :label="$t('module.basicData.cache.place')" prop="place">
-        <el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
+        <el-input v-model="dataForm.place" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.place')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
+      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
-        <el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
+        <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
-        <el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
-        <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -57,14 +51,11 @@ export default {
       visible: false,
       dataForm: {
         id: 0,
-        locationName: '',
+        name: '',
         code: '',
-        locationNameAlias: '',
+        anotherName: '',
-        rowNum: '',
+        place: '',
-        columns: '',
+        remark: ''
-        layers: '',
-        status: '',
-        locationType: ''
       },
       dataRule: {
         name: [
@@ -98,15 +89,13 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = {
-            'locationName': this.dataForm.locationName,
+            'name': this.dataForm.name,
             'code': this.dataForm.code,
-            'locationNameAlias': this.dataForm.locationNameAlias,
+            'anotherName': this.dataForm.anotherName,
-            'columns': this.dataForm.columns,
+            'place': this.dataForm.place,
-            'layers': this.dataForm.layers,
+            'remark': this.dataForm.remark,
             'shelfId': this.shelfId,
-            'id': this.dataForm.id,
+            'id': this.dataForm.id
-            'status': this.dataForm.status,
-            'locationType': this.dataForm.locationType
           }
           if (this.dataForm.id) {
             locationUpdate(data).then(res => {
@@ -122,8 +111,6 @@ export default {
             })
           } else {
             locationAdd(data).then(res => {
-              console.log(data)
-              console.log(res)
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
                 type: 'success',

src/views/basicData/Cache/components/locationBtn.vue

@@ -1,13 +1,13 @@
 <!--
  * @Date: 2021-01-07 20:09:37
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 18:39:03
+ * @LastEditTime: 2021-03-06 13:12:47
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
 <template>
   <span>
-    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
+    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.ManageLocation') }}</el-button>
   </span>
 </template>
 

src/views/basicData/Cache/components/shelfAttr-add.vue

@@ -1,14 +1,13 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-03 19:00:08
+ * @LastEditTime: 2021-04-16 15:01:45
  * @Description:
 -->
 <template>
-  <!-- 新增/编辑识别 :title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter" -->
   <el-dialog
-    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
@@ -18,7 +17,6 @@
       <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 />
       </el-form-item>
-      <!-- 选择货架code的下拉框
       <el-form-item v-if="isPage" :label="$t('module.basicData.cache.AreaName')" prop="areaId">
         <el-select v-model="dataForm.areaId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.AreaName')])" clearable>
           <el-option
@@ -28,15 +26,9 @@
             :value="item.id"
           />
         </el-select>
-      </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.cache.StorageQuantity')" prop="total">
-        <el-input-number v-model="dataForm.total" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.StorageQuantity')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.rowNum')" prop="rowNum">
+      <el-form-item :label="$t('module.basicData.cache.StorageQuantity')" prop="shelfNumber">
-        <el-input-number v-model="dataForm.rowNum" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowNum')])" clearable />
+        <el-input-number v-model="dataForm.shelfNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.StorageQuantity')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.columnNum')" prop="columnNum">
-        <el-input-number v-model="dataForm.columnNum" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnNum')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -47,7 +39,8 @@
 </template>
 
 <script>
-import { shelfList, shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
+import { shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
+import { areaList } from '@/api/basicData/Cache/area'
 
 export default {
   props: {
@@ -97,7 +90,7 @@ export default {
         current: 1,
         size: 500
       }
-      shelfList(params).then(response => {
+      areaList(params).then(response => {
         if (response.data.records) {
           this.areaArr = response.data.records
         }
@@ -121,7 +114,7 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = this.dataForm
-          // console.log(data)
+          console.log(data)
           if (this.dataForm.id) {
             shelfUpdate(data).then(res => {
               this.$message({
@@ -136,7 +129,6 @@ export default {
             })
           } else {
             shelfAdd(data).then(res => {
-              console.log(res)
               this.$message({
                 message: this.$t('module.basicData.visual.success'),
                 type: 'success',

src/views/basicData/Cache/components/shelfBtn.vue

@@ -1,13 +1,13 @@
 <!--
  * @Date: 2021-01-07 20:09:37
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-02 19:00:47
+ * @LastEditTime: 2021-03-06 13:03:40
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
 <template>
   <span>
-    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
+    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.ManageShelves') }}</el-button>
   </span>
 </template>
 

src/views/basicData/Cache/shelf.vue

@@ -1,18 +1,18 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 19:00:14
+ * @LastEditTime: 2021-03-25 16:13:19
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <!-- <head-form
+    <head-form
       :placeholder-name="placeholderName"
       :key-name="keyName"
       @getDataList="getList"
       @add="addNew"
-    /> -->
+    />
     <base-table
       :page="listQuery.current"
       :limit="listQuery.size"
@@ -39,13 +39,15 @@
 </template>
 
 <script>import i18n from '@/lang'
-// import HeadForm from '@/components/basicData/HeadForm'
+import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { shelfList, shelfDelete } from '@/api/basicData/Cache/shelf'
+import { areaList } from '@/api/basicData/Cache/area'
 import shelfAttrAdd from './components/shelfAttr-add.vue'
 import locationBtn from './components/locationBtn.vue'
+import { timeFormatter } from '@/filters'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -74,33 +76,34 @@ const tableBtn = [
 ]
 const tableProps = [
   {
-    prop: 'shelfName',
+    prop: 'createTime',
-    label: i18n.t('module.basicData.cache.AreaName'),
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
+    align: 'center'
+  },
+  {
+    prop: 'name',
+    label: i18n.t('module.basicData.cache.ShelfName'),
     align: 'center'
   },
   {
     prop: 'code',
-    label: i18n.t('module.basicData.cache.AreaCode'),
+    label: i18n.t('module.basicData.cache.ShelfCode'),
     align: 'center'
   },
   {
-    prop: 'total',
+    prop: 'areaName',
+    label: i18n.t('module.basicData.cache.AreaName'),
+    align: 'center'
+  },
+  {
+    prop: 'shelfNumber',
     label: i18n.t('module.basicData.cache.StorageQuantity'),
     align: 'center'
   },
   {
-    prop: 'rowNum',
+    prop: 'location',
-    label: i18n.t('module.basicData.cache.rowNum'),
+    label: i18n.t('module.basicData.cache.Location'),
-    align: 'center'
-  },
-  {
-    prop: 'columnNum',
-    label: i18n.t('module.basicData.cache.columnNum'),
-    align: 'center'
-  },
-  {
-    prop: 'shelf',
-    label: i18n.t('module.basicData.visual.location'),
     subcomponent: locationBtn,
     align: 'center'
   }
@@ -108,7 +111,7 @@ const tableProps = [
 
 export default {
   name: 'Area',
-  components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
+  components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -138,22 +141,21 @@ export default {
     }
   },
   created() {
-    // const params = {
+    const params = {
-    //   current: 1,
+      current: 1,
-    //   size: 500
+      size: 500
-    // }
+    }
-    // shelfList(params).then(response => {
+    areaList(params).then(response => {
-    //   if (response.data.records) {
+      if (response.data.records) {
-    //     this.areaList = response.data.records
+        this.areaList = response.data.records
-    //   }
+      }
-    //   this.getList()
+      this.getList()
-    // })
+    })
-    this.getList()
   },
   methods: {
     handleClick(raw) {
       if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.shelfName}]?`, 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'
@@ -177,10 +179,9 @@ export default {
     },
     getList(key) {
       this.listLoading = true
-      this.listQuery.shelfName = key
+      this.listQuery.name = key
-      console.log(this.listQuery)
       shelfList(this.listQuery).then(response => {
-        // console.log(response)
+        console.log(response)
         if (response.data.records) {
           this.list = response.data.records
           this.list.forEach(item => {

src/views/basicData/Equipment/components/equipmentInfo-add.vue

@@ -37,7 +37,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
+            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
               <el-select
                 v-model="dataForm.equipmentType"
                 :disabled="isdetail"
@@ -53,25 +53,9 @@
                   :disabled="item.disabled"
                 />
               </el-select>
-            </el-form-item> -->
-            <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
-              <el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
-              <el-date-picker
-                v-model="dataForm.enterTime"
-                :disabled="isdetail"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-ddT00:00:00"
-                :style="{width: '100%'}"
-                :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="8">
             <el-form-item :label="$t('module.basicData.equipment.EquipmentGrouping')" prop="groupId">
               <el-select
                 v-model="dataForm.groupId"
@@ -89,18 +73,18 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
         <el-row>
-          <!-- <el-col :span="8">
+          <el-col :span="8">
             <el-form-item :label="$t('module.basicData.visual.Specs')" prop="spec">
               <el-input v-model="dataForm.spec" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Specs')])" clearable :style="{width: '100%'}" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.productionTime')" prop="createTime">
+            <el-form-item :label="$t('module.basicData.visual.productionTime')" prop="productionTime">
               <el-date-picker
-                v-model="dataForm.createTime"
+                v-model="dataForm.productionTime"
                 :disabled="isdetail"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
@@ -109,10 +93,23 @@
                 clearable
               />
             </el-form-item>
-          </el-col> -->
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
+              <el-date-picker
+                v-model="dataForm.enterTime"
+                :disabled="isdetail"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                :style="{width: '100%'}"
+                :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-          <!-- <el-col :span="8">
+          <el-col :span="8">
             <el-form-item :label="$t('module.basicData.visual.debugTime')" prop="debugTime">
               <el-date-picker
                 v-model="dataForm.debugTime"
@@ -129,7 +126,7 @@
             <el-form-item :label="$t('module.basicData.equipment.DebugPeriod')" prop="debugPeriod">
               <el-input v-model="dataForm.debugPeriod" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.DebugPeriod')])" clearable :style="{width: '100%'}" />
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('module.basicData.visual.Manufacturer')" prop="manufacturer">
               <el-input
@@ -141,19 +138,9 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
-              <el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
-              <el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
-          <!-- <el-col :span="8">
+          <el-col :span="8">
             <el-form-item :label="$t('module.basicData.equipment.intellectualProperty')" prop="intellectualProperty">
               <el-input
                 v-model="dataForm.intellectualProperty"
@@ -175,8 +162,20 @@
                 :style="{width: '100%'}"
               />
             </el-form-item>
-          </el-col> -->
+          </el-col>
-          <!-- <el-col :span="8">
+          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
+              <el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
+              <el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item :label="$t('module.basicData.equipment.plcVersion')" prop="plcVersion">
               <el-input v-model="dataForm.plcVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.plcVersion')])" clearable :style="{width: '100%'}" />
             </el-form-item>
@@ -185,9 +184,9 @@
             <el-form-item :label="$t('module.basicData.equipment.eapVersion')" prop="eapVersion">
               <el-input v-model="dataForm.eapVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.eapVersion')])" clearable :style="{width: '100%'}" />
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
-        <!-- <el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item :label="$t('module.basicData.equipment.maintenanceCycle')" prop="maintenanceCycle">
               <el-input v-model="dataForm.maintenanceCycle" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceCycle')])" clearable :style="{width: '100%'}" />
@@ -198,9 +197,9 @@
               <el-input v-model="dataForm.maintenanceTime" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceTime')])" clearable :style="{width: '100%'}" />
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
         <el-row>
-          <!-- <el-col :span="4">
+          <el-col :span="4">
             <el-form-item :label="$t('module.basicData.equipment.E10Status')" prop="estatus">
               <el-switch
                 v-model="dataForm.estatus"
@@ -249,11 +248,11 @@
                 inactive-color="#AAAAAA"
               />
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="9">
-            <!-- <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
+            <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
               <el-upload
                 ref="eImg"
                 name="files"
@@ -266,7 +265,7 @@
               >
                 <el-button size="small" type="primary" icon="el-icon-upload">{{ 'btn.upload' | i18nFilter }}</el-button>
               </el-upload>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item v-if="isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="upInfo">
               <div v-for="item in imgList" :key="item.id">
                 {{ item.fileName }} <el-button size="small" type="primary" icon="el-icon-upload" @click="downloadFile(item.fileId)">{{ 'btn.download' | i18nFilter }}</el-button>
@@ -331,9 +330,12 @@ import {
   equipmentInfoUpdate,
   equipmentInfoAdd,
   equipmentInfoCode,
-  equipmentInfoFileAdd
+  equipmentInfoFileAdd,
+  getEquipmentInfoFile
 } from '@/api/basicData/Equipment/equipmentInfo'
+import { equipmentGroupList } from '@/api/basicData/Equipment/equipmentGroup'
 import { equipmentInfoAttrList, equipmentInfoAttrDelete } from '@/api/basicData/Equipment/equipmentInfoAttr'
+import { equipmentTypeList } from '@/api/basicData/Equipment/equipmentType'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import equipmentInfoAttrAdd from './equipmentInfoAttr-add'
@@ -363,15 +365,15 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'attrContent',
+    prop: 'attrValue',
     label: i18n.t('module.basicData.visual.AttributeValue'),
     align: 'center'
+  },
+  {
+    prop: 'remark',
+    label: i18n.t('module.basicData.visual.Remarks'),
+    align: 'center'
   }
-  // {
-  //   prop: 'remark',
-  //   label: i18n.t('module.basicData.visual.Remarks'),
-  //   align: 'center'
-  // }
 ]
 
 export default {
@@ -391,7 +393,7 @@ export default {
         abbr: '',
         equipmentType: '',
         spec: '',
-        createTime: '',
+        productionTime: '',
         enterTime: '',
         debugTime: '',
         debugPeriod: '',
@@ -427,17 +429,17 @@ export default {
           required: true,
           message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentType')]),
           trigger: 'change'
+        }],
+        maintenanceCycle: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
+          trigger: 'blur'
+        }],
+        maintenanceTime: [{
+          required: true,
+          message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
+          trigger: 'blur'
         }]
-        // maintenanceCycle: [{
-        //   required: true,
-        //   message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
-        //   trigger: 'blur'
-        // }],
-        // maintenanceTime: [{
-        //   required: true,
-        //   message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
-        //   trigger: 'blur'
-        // }]
       },
       typeCode: {},
       eImgAction: uploadPath,
@@ -460,36 +462,34 @@ export default {
   created() {
     this.listQuery.equipmentId = this.$route.query.id
     this.init()
-    this.getList()
   },
   methods: {
     init() {
       this.isdetail = false
       this.isdetail = Boolean(this.$route.query.isdetail)
-      // 设备信息下载接口，暂时未调用
+      if (this.isdetail) {
-      // if (this.isdetail) {
+        const data =
-      //   const data =
+          {
-      //     {
+            'equipmentId': this.listQuery.equipmentId
-      //       'equipmentId': this.listQuery.equipmentId
+          }
-      //     }
+        getEquipmentInfoFile(data).then(res => {
-      //   getEquipmentInfoFile(data).then(res => {
+          this.downloadList = res.data
-      //     this.downloadList = res.data
+          this.downloadList.forEach(item => {
-      //     this.downloadList.forEach(item => {
+            if (item.typeCode === 'equipmentInfoImage') {
-      //       if (item.typeCode === 'equipmentInfoImage') {
+              this.imgList.push(item)
-      //         this.imgList.push(item)
+            } else {
-      //       } else {
+              this.fileList.push(item)
-      //         this.fileList.push(item)
+            }
-      //       }
+          })
-      //     })
+        })
-      //   })
+      }
-      // }
+      this.list.splice(0, this.list.length)
-      // this.list.splice(0, this.list.length)
+      equipmentTypeList(this.listQuery).then(response => {
-      // equipmentTypeList(this.listQuery).then(response => {
+        this.equipmentTypeOption = response.data.records
-      //   this.equipmentTypeOption = response.data.records
+      })
-      // })
+      equipmentGroupList(this.listQuery).then(response => {
-      // equipmentGroupList(this.listQuery).then(response => {
+        this.equipmentGroupOption = response.data.records
-      //   this.equipmentGroupOption = response.data.records
+      })
-      // })
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.listQuery.equipmentId) {
@@ -514,9 +514,7 @@ export default {
     },
     getList() {
       this.listLoading = true
-      console.log(this.listQuery)
       equipmentInfoAttrList(this.listQuery).then(response => {
-        console.log(response)
         if (response.data.records) {
           this.list = response.data.records
         } else {
@@ -527,7 +525,7 @@ export default {
     },
     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.attrName}]?`, this.$t('module.basicData.visual.Tips'), {
           confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'

src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-05 14:08:41
+ * @LastEditTime: 2021-03-25 16:31:46
  * @Description:
 -->
 <template>
@@ -19,12 +19,12 @@
       <el-form-item :label="$t('module.basicData.visual.AttributeName')" prop="attrName">
         <el-input v-model="dataForm.attrName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeName')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrContent">
+      <el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrValue">
-        <el-input v-model="dataForm.attrContent" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
+        <el-input v-model="dataForm.attrValue" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
       </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
+      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
         <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
     <div class="drawer-footer">
       <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
@@ -52,14 +52,14 @@ export default {
       dataForm: {
         id: 0,
         attrName: '',
-        attrContent: '',
+        attrValue: '',
         remark: ''
       },
       dataRule: {
         attrName: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeName')]), trigger: 'blur' }
         ],
-        attrContent: [
+        attrValue: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeValue')]), trigger: 'blur' }
         ]
       }
@@ -74,7 +74,6 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           equipmentInfoAttrDetail(this.dataForm.id).then(res => {
-            console.log(res)
             this.dataForm = res.data
           })
         }
@@ -87,7 +86,7 @@ export default {
         if (valid) {
           const data = {
             'attrName': this.dataForm.attrName,
-            'attrContent': this.dataForm.attrContent,
+            'attrValue': this.dataForm.attrValue,
             'remark': this.dataForm.remark,
             'equipmentId': this.equipmentId,
             'id': this.dataForm.id

src/views/basicData/Equipment/equipmentInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-05 11:01:57
+ * @LastEditTime: 2021-07-08 09:46:10
  * @Description:
 -->
 <template>
@@ -43,7 +43,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 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'
+// import { timeFormatter } from '@/filters'
 // import dataDict from '@/filters/DataDict'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -76,25 +76,30 @@ const tableBtn = [
   }
 ]
 const tableProps = [
-  {
+  // {
-    prop: 'createTime',
+  //   prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+  //   label: i18n.t('module.basicData.factory.createTime'),
-    filter: timeFormatter,
+  //   filter: timeFormatter,
-    align: 'center'
+  //   align: 'center'
-  },
+  // },
   {
     prop: 'name',
     label: i18n.t('module.basicData.equipment.EquipmentName'),
     align: 'center'
   },
+  {
+    prop: 'equipmentTypeName',
+    label: i18n.t('module.basicData.equipment.EquipmentType'),
+    align: 'center'
+  },
   {
     prop: 'code',
     label: i18n.t('module.basicData.equipment.EquipmentCode'),
     align: 'center'
   },
   {
-    prop: 'equipmentType',
+    prop: 'equipmentGroupName',
-    label: i18n.t('module.basicData.equipment.EquipmentType'),
+    label: i18n.t('module.basicData.equipment.EquipmentGrouping'),
     align: 'center'
   },
   {
@@ -103,11 +108,26 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'abbr',
+    prop: 'maintenanceCycle',
-    label: i18n.t('module.basicData.equipment.shortName'),
+    label: i18n.t('module.basicData.equipment.maintenanceCycle'),
+    align: 'center'
+  },
+  {
+    prop: 'maintenanceTime',
+    label: i18n.t('module.basicData.equipment.maintenanceTime'),
+    align: 'center'
+  },
+  {
+    prop: 'description',
+    label: i18n.t('module.basicData.equipment.FunctionDescription'),
     align: 'center'
   }
   // {
+  //   prop: 'abbr',
+  //   label: i18n.t('module.basicData.visual.Abbreviation'),
+  //   align: 'center'
+  // }
+  // {
   //   prop: 'estatus',
   //   label: i18n.t('module.basicData.visual.CurrentState'),
   //   filter: dataDict('enableState'),
@@ -177,7 +197,6 @@ export default {
       this.listQuery.name = key
       this.listQuery.code = key
       equipmentInfoList(this.listQuery).then(response => {
-        console.log(response)
         if (response.data.records) {
           this.list = response.data.records
         } else {

src/views/basicData/Materials/material.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: fzq
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 18:33:17
+ * @LastEditTime: 2021-03-11 16:48:22
  * @Description:
 -->
 <template>
@@ -180,7 +180,6 @@ export default {
       this.listLoading = true
       this.listQuery.name = key
       this.listQuery.code = key
-      console.log(this.listQuery)
       materialList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records

src/views/basicData/Process/components/processInfo-add.vue

@@ -1,120 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-04 11:12:42
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 19:17:36
--->
-<template>
-  <el-dialog
-    :title="!dataForm.locationId ? 'btn.add' : 'btn.edit' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-form ref="dataForm" :model="dataForm" label-width="130px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.basicData.processLocation.sequence')" prop="sequence">
-        <el-input v-model="dataForm.sequence" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.sequence')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
-        <el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
-        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.locationId')" prop="locationId">
-        <el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationId')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
-        <el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
-        <el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { detail, update, add } from '@/api/basicData/Cache/processLocation'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: 0,
-        sequence: '',
-        locationName: '',
-        isProcess: '',
-        equipmentMark: ''
-      },
-      listQuery: {
-        current: 1,
-        size: 10,
-        locationId: '',
-        workSequenId: '',
-        locationName: ''
-      }
-    }
-  },
-  methods: {
-    init(LocationId) {
-      this.listQuery.LocationId = LocationId || ''
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.listQuery.LocationId) {
-          // list(this.listQuery).then(res =>{
-          //   this.list = response.data.records
-          // })
-          detail(this.dataForm.id).then(res => {
-            this.dataForm = res.data
-          })
-        } else {
-          // storageBoxCode().then(res => {
-          //   this.dataForm.code = res.data
-          // })
-        }
-      })
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          const data = this.dataForm
-          data.id = this.dataForm.id
-          if (this.dataForm.id) {
-            update(data).then(res => {
-              this.$message({
-                message: this.$t('module.basicData.visual.success'),
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
-            })
-          } else {
-            add(data).then(res => {
-              this.$message({
-                message: this.$t('module.basicData.visual.success'),
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
-            })
-          }
-        }
-      })
-    }
-  }
-}
-</script>

src/views/basicData/Process/processInfo.vue

@@ -1,212 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-03 09:51:25
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 19:15:25
--->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      @getDataList="getList"
-      @add="addNew"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <processInfo-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" />
-  </div>
-</template>
-
-<script>import i18n from '@/lang'
-import HeadForm from '@/components/basicData/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import processInfoAdd from './components/processInfo-add'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { list, locaDelete } from '@/api/basicData/Cache/processLocation'
-import { timeFormatter } from '@/filters'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'edit',
-    btnName: 'btn.edit'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'sequence',
-    label: i18n.t('module.basicData.processLocation.sequence'),
-    align: 'center'
-  },
-  {
-    prop: 'locationName',
-    label: i18n.t('module.basicData.processLocation.locationName'),
-    align: 'center'
-  },
-  {
-    prop: 'isProcess',
-    label: i18n.t('module.basicData.processLocation.isProcess'),
-    align: 'center'
-  },
-  {
-    prop: 'locationId',
-    label: i18n.t('module.basicData.processLocation.locationId'),
-    align: 'center'
-  },
-  {
-    prop: 'workSequenId',
-    label: i18n.t('module.basicData.processLocation.workSequenId'),
-    align: 'center'
-  },
-  {
-    prop: 'equipmentMark',
-    label: i18n.t('module.basicData.processLocation.equipmentMark'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Area',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm, processInfoAdd },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      keyName: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: i18n.t('module.basicData.processLocation.locationName'),
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      areaList: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10,
-        locationId: '',
-        workSequenId: '',
-        locationName: ''
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          console.log(raw.data)
-          locaDelete(raw.data.id).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      } else if (raw.type === 'edit') {
-        this.addNew(raw.data.locationId)
-      } else {
-        this.addNew(raw.data.locationId, true)
-      }
-    },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.locationName = key
-      list(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-        console.log(response)
-        this.listLoading = false
-      })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, true)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:56:41
+ * @LastEditTime: 2022-01-14 15:54:12
  * @Description:
 -->
 <template>
@@ -46,7 +46,6 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
-        <el-button type="primary" @click="manualTask()"> {{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
       </el-form-item>
     </el-form>
     <base-table
@@ -71,14 +70,12 @@
       @pagination="getList()"
     />
     <current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
-    <current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
 import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
 import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
-import CurrentTaskAdd from './components/CurrentTask-add.vue'
 import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
@@ -171,12 +168,11 @@ const tableProps = [
 
 export default {
   name: 'ScrapInfo',
-  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
+  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo },
   data() {
     return {
       trueWidth: 100,
       addOrUpdateVisible: false,
-      manualTaskVisible: false,
       tableProps,
       tableBtn,
       list: [],
@@ -241,13 +237,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.addOrUpdate.init(id)
       })
-    },
-    // 手动执行任务
-    manualTask() {
-      this.manualTaskVisible = true
-      this.$nextTick(() => {
-        this.$refs.manualTaskRef.init()
-      })
     }
   }
 }

src/views/basicData/Warehouse/ProcessStorageManagement.vue

@@ -1,202 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 15:45:23
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <el-form
-      ref="formData"
-      :rules="rules"
-      :model="listQuery"
-      :inline="true"
-      size="medium"
-      label-width="100px"
-    >
-      <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
-        <el-select
-          v-model="listQuery.processId"
-          :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
-          clearable
-          filterable
-          :style="{width: '100%'}"
-        >
-          <el-option
-            v-for="(item, index) in processArr"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
-      </el-form-item>
-    </el-form>
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-  </div>
-</template>
-
-<script>
-import { list } from '@/api/art-manage/process'
-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'
-import i18n from '@/lang'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'see',
-    btnName: i18n.t('module.basicData.Warehouse.processStorageLink')
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.art.processList.processCode'),
-    align: 'center'
-  },
-  {
-    prop: 'name',
-    label: i18n.t('module.art.processList.processName'),
-    align: 'center'
-  },
-  {
-    prop: 'createTime',
-    label: i18n.t('module.art.eqName'),
-    filter: timeFormatter,
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'ExecutionInfo',
-  components: { Pagination, BaseTable, MethodBtn },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      processArr: [],
-      total: 0,
-      listLoading: true,
-      rules: {},
-      listQuery: {
-        current: 1,
-        size: 10,
-        processId: ''
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.init()
-  },
-  methods: {
-    handleClick(raw) {
-      this.addNew(raw.data.id)
-    },
-    init() {
-      const lparams = {
-        current: 1,
-        size: 999
-      }
-      list(lparams).then(response => {
-        if (response.data.records) {
-          this.processArr = response.data.records
-        } else {
-          this.processArr.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-      })
-    },
-    getList() {
-      // this.listLoading = true
-      // ExecutionInfoList(this.listQuery).then(response => {
-      //   if (response.data.records) {
-      //     this.list = response.data.records
-      //   } else {
-      //     this.list.splice(0, this.list.length)
-      //   }
-      //   this.total = response.data.total
-      this.list = [
-        {
-          code: 11,
-          name: '11'
-        }
-      ]
-      this.listLoading = false
-      // })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.$router.push({
-        name: 'ProcessStorageManagementInfo',
-        query: {
-          dictTypeId: id
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/basicData/Warehouse/components/CurrentTask-add.vue

@@ -1,125 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 11:05:23
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="'btn.see' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-row :gutter="10">
-      <el-form
-        ref="dataForm"
-        :model="dataForm"
-        size="medium"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-col :span="12">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
-                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
-                <el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
-                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
-                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
-                <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="12">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
-                <el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
-                <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
-                <el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
-                <el-input
-                  v-model="dataForm.anotherCurrLocation"
-                  readonly
-                  :style="{width: '100%'}"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="visible = false">{{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        taskCode: undefined,
-        orderName: undefined,
-        fullCode: undefined,
-        name: undefined,
-        remark: undefined,
-        field119: undefined,
-        createTime: undefined,
-        taskType: undefined,
-        emptyCode: undefined,
-        anotherCurrLocation: undefined,
-        field121: undefined,
-        taskSource: undefined,
-        anotherCurrProcessCode: undefined,
-        anotherNextProcessCode: undefined,
-        anotherTargetLocation: undefined,
-        field126: undefined
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    }
-  }
-}
-</script>

src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue

@@ -1,166 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 16:01:28
- * @Description:
--->
-<template>
-  <div class="app-container">
-    <div style="margin:10px 50px">
-      <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
-    </div>
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <processStorage-link v-if="addOrUpdateVisible" ref="addOrUpdate" :area-id="listQuery.areaId" @refreshDataList="getList" />
-  </div>
-</template>
-
-<script>
-import i18n from '@/lang'
-import processStorageLink from './processStorageLink.vue'
-import BaseTable from '@/components/BaseTable'
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { timeFormatter } from '@/filters'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.basicData.cache.LocationCode'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'name',
-    label: i18n.t('module.basicData.cache.LocationName'),
-    align: 'center'
-  },
-  {
-    prop: 'shelfName',
-    label: i18n.t('module.basicData.cache.locationType'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Shelf',
-  components: { BaseTable, MethodBtn, processStorageLink },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 990,
-        areaId: ''
-      }
-    }
-  },
-  created() {
-    this.listQuery.areaId = this.$route.query.id
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        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'
-        }).then(() => {
-          // shelfDelete(raw.data.id).then(response => {
-          //   this.$message({
-          //     message: this.$t('module.basicData.visual.success'),
-          //     type: 'success',
-          //     duration: 1500,
-          //     onClose: () => {
-          //       this.getList()
-          //     }
-          //   })
-          // })
-        }).catch(() => {})
-      }
-    },
-    getList(key) {
-      this.listLoading = true
-      // shelfList(this.listQuery).then(response => {
-      //   if (response.data.records) {
-      //     this.list = response.data.records
-      //   } else {
-      //     this.list.splice(0, this.list.length)
-      //   }
-      this.listLoading = false
-      // })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id)
-      })
-    },
-    goback() {
-      this.$router.go(-1)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/basicData/Warehouse/components/processStorageLink.vue

@@ -1,175 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 16:54:51
- * @Description:
--->
-<template>
-  <el-dialog
-    :title="$t('module.basicData.visual.stock') | i18nFilter"
-    :visible.sync="visible"
-    top="5vh"
-  >
-    <div>
-      <div class="mainDiv" style="margin:10px 0 100px">
-        <div class="title">货架一</div>
-        <div class="flexDiv">
-          <div
-            v-for="count in 5"
-            :key="count"
-            class="wareBox"
-            :class="[
-              count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-              { active: count === isActive }
-            ]"
-            @click="selectBox(count)"
-          >
-            <div class="plat">库位{{ count }}</div>
-          </div>
-        </div>
-        <div class="flexDiv">
-          <div
-            v-for="count in 5"
-            :key="count"
-            class="wareBox"
-            :class="[
-              count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-              { active: count + 5 === isActive }
-            ]"
-            @click="selectBox(count + 5)"
-          >
-            <div class="plat">库位{{ count + 5 }}</div>
-          </div>
-        </div>
-      </div>
-      <div class="line" />
-      <div class="mainDiv" style="margin:100px 0 10px">
-        <div class="title">货架二</div>
-        <div class="flexDiv">
-          <div
-            v-for="count in 5"
-            :key="count"
-            class="wareBox"
-            :class="[
-              count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-              { active: count+10 === isActive }
-            ]"
-            @click="selectBox(count+10)"
-          >
-            <div class="plat">库位{{ count+10 }}</div>
-          </div>
-        </div>
-        <div class="flexDiv">
-          <div
-            v-for="count in 5"
-            :key="count"
-            class="wareBox"
-            :class="[
-              count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-              { active: count+15 === isActive }
-            ]"
-            @click="selectBox(count+15)"
-          >
-            <div class="plat">库位{{ count+15 }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-  data() {
-    return {
-      visible: false,
-      isActiveArr: []
-    }
-  },
-  methods: {
-    init() {
-      this.visible = true
-    },
-    selectBox(count) {
-      this.isActive.push(count)
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style scoped>
-.mainDiv {
-  border: 2px solid rgb(145, 174, 255);
-  padding: 20px 0;
-}
-.flexDiv {
-  display: -webkit-flex;
-  display: flex;
-  -webkit-justify-content: space-around;
-  justify-content: space-around;
-}
-.title {
-  float: left;
-  width: 50px;
-  font-size: 40px;
-  line-height: 45px;
-}
-/* 边框特效 */
-.wareBox:hover {
-  background: linear-gradient(to left, deepskyblue, deepskyblue) left top
-      no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
-  background-size: 5px 30px, 30px 5px;
-  color: black;
-  border-radius: 5px;
-  background-color: rgb(190, 224, 241);
-}
-.wareBox {
-  cursor: pointer;
-  margin: 10px;
-  height: 80px;
-  line-height: 70px;
-  text-align: center;
-  border: 2px solid #cdcdc5;
-  border-radius: 5px;
-}
-.plat {
-  min-width: 80px;
-}
-.line {
-  margin: 20px 0;
-  height: 2px;
-  background-color: gray;
-  border-left: 200px solid #ddd;
-  border-right: 200px solid #ddd;
-}
-.enableBox {
-  background: rgb(0, 189, 16);
-}
-.disableBox {
-  background: #ddd;
-  cursor: not-allowed;
-}
-.end-plat {
-  background-color: rgb(195, 246, 255);
-}
-.active {
-  border: 2px solid red;
-}
-</style>

src/views/report-manage/CurrentEmptyBox.vue

@@ -1,199 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-04 20:54:54
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 16:37:29
--->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="false"
-      @getDataList="getList"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <!-- <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      /> -->
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
-  </div>
-</template>
-
-<script>import i18n from '@/lang'
-import HeadForm from '@/components/basicData/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import { list } from '@/api/report-manage/report'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'edit',
-    btnName: 'btn.edit'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.report.inventory.code'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.report.inventory.status'),
-    align: 'center'
-  },
-  {
-    prop: 'inprocessCode',
-    label: i18n.t('module.report.inventory.inprocessCode'),
-    align: 'center'
-  },
-  {
-    prop: 'currentLocation',
-    label: i18n.t('module.report.inventory.currentLocation'),
-    align: 'center'
-  },
-  {
-    prop: 'storeTime',
-    label: i18n.t('module.report.inventory.storeTime'),
-    align: 'center'
-  },
-  {
-    prop: 'manual',
-    label: i18n.t('module.report.inventory.manual'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Inventory',
-  components: { Pagination, BaseTable, HeadForm },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      keyName: i18n.t('module.report.reportList.storageBoxNumber'),
-      placeholderName: this.$t('module.report.reportList.queryFiltering'),
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    // handleClick(raw) {
-    //   if (raw.type === 'delete') {
-    //     this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
-    //       confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-    //       cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-    //       type: 'warning'
-    //     }).then(() => {
-    //       storageBoxDelete(raw.data.id).then(response => {
-    //         this.$message({
-    //           message: this.$t('module.basicData.visual.success'),
-    //           type: 'success',
-    //           duration: 1500,
-    //           onClose: () => {
-    //             this.getList()
-    //           }
-    //         })
-    //       })
-    //     }).catch(() => {})
-    //   } else if (raw.type === 'edit') {
-    //     this.addNew(raw.data.id)
-    //   } else {
-    //     this.addNew(raw.data.id, true)
-    //   }
-    // },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.code = key
-      console.log(this.listQuery)
-      list(this.listQuery).then(response => {
-        console.log(response)
-        if (response.data) {
-          this.list = response.data
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        // this.total = response.data.total
-        this.listLoading = false
-      })
-    }
-    // 新增 / 修改
-    // addNew(id) {
-    //   this.addOrUpdateVisible = true
-    //   this.$nextTick(() => {
-    //     this.$refs.addOrUpdate.init(id, true)
-    //   })
-    // }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/report-manage/CurrentInventory.vue

@@ -1,232 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-04 20:54:54
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 19:32:34
--->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="false"
-      @getDataList="getList"
-      @downl="downl"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <!-- <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      /> -->
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
-  </div>
-</template>
-
-<script>import i18n from '@/lang'
-import HeadForm from './components/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import { list, download } from '@/api/report-manage/report'
-import substrateBtn from './components/substrateBtn.vue'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'edit',
-    btnName: 'btn.edit'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'code',
-    label: i18n.t('module.report.inventory.code'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.report.inventory.status'),
-    align: 'center'
-  },
-  {
-    prop: 'inprocessCode',
-    label: i18n.t('module.report.inventory.inprocessCode'),
-    align: 'center'
-  },
-  {
-    prop: 'nextprocessCode',
-    label: i18n.t('module.report.inventory.nextprocessCode'),
-    align: 'center'
-  },
-  {
-    prop: 'currentLocation',
-    label: i18n.t('module.report.inventory.currentLocation'),
-    align: 'center'
-  },
-  {
-    prop: 'storeTime',
-    label: i18n.t('module.report.inventory.storeTime'),
-    align: 'center'
-  },
-  {
-    prop: 'orderName',
-    label: i18n.t('module.report.inventory.orderName'),
-    align: 'center'
-  },
-  {
-    prop: 'substrateDetails',
-    label: i18n.t('module.report.inventory.substrateDetails'),
-    subcomponent: substrateBtn,
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Inventory',
-  components: { Pagination, BaseTable, HeadForm },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      keyName: i18n.t('module.report.reportList.storageBoxNumber'),
-      placeholderName: this.$t('module.report.reportList.queryFiltering'),
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10,
-        enabled: 1
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    // handleClick(raw) {
-    //   if (raw.type === 'delete') {
-    //     this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
-    //       confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-    //       cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-    //       type: 'warning'
-    //     }).then(() => {
-    //       storageBoxDelete(raw.data.id).then(response => {
-    //         this.$message({
-    //           message: this.$t('module.basicData.visual.success'),
-    //           type: 'success',
-    //           duration: 1500,
-    //           onClose: () => {
-    //             this.getList()
-    //           }
-    //         })
-    //       })
-    //     }).catch(() => {})
-    //   } else if (raw.type === 'edit') {
-    //     this.addNew(raw.data.id)
-    //   } else {
-    //     this.addNew(raw.data.id, true)
-    //   }
-    // },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.code = key
-      // console.log(this.listQuery)
-      list(this.listQuery).then(response => {
-        console.log(response)
-        if (response.data) {
-          this.list = response.data
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        // this.total = response.data.total
-        this.listLoading = false
-      })
-    },
-    downl(key) {
-      this.listLoading = true
-      this.listQuery.code = key
-      // console.log(this.listQuery)
-      download(this.listQuery).then(res => {
-        console.log(res)
-        // const fileName = `${+new Date()}.xlsx`
-        // const blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
-        // if (navigator.msSaveBlob) {
-        //   navigator.msSaveBlob(blob, fileName)
-        // } else {
-        //   const link = document.createElement('a')
-        //   link.href = URL.createObjectURL(blob)
-        //   link.download = fileName
-        //   link.click()
-        //   URL.revokeObjectURL(link.href)
-        // }
-      })
-    }
-    // 新增 / 修改
-    // addNew(id) {
-    //   this.addOrUpdateVisible = true
-    //   this.$nextTick(() => {
-    //     this.$refs.addOrUpdate.init(id, true)
-    //   })
-    // }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/report-manage/CurrentSubstrate.vue

@@ -1,203 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-04 20:54:54
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-04 21:09:41
--->
-<template>
-  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      @getDataList="getList"
-      @add="addNew"
-    />
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="listQuery.current"
-      :limit.sync="listQuery.size"
-      @pagination="getList()"
-    />
-    <!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
-  </div>
-</template>
-
-<script>import i18n from '@/lang'
-import HeadForm from '@/components/basicData/HeadForm'
-import BaseTable from '@/components/BaseTable'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import { storageBoxList, storageBoxDelete } from '@/api/basicData/Cache/storageBox'
-import { timeFormatter } from '@/filters'
-import basicData from '@/filters/basicData'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'edit',
-    btnName: 'btn.edit'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
-    filter: timeFormatter,
-    align: 'center'
-  },
-  {
-    prop: 'storageBoxName',
-    label: i18n.t('module.basicData.storageBox.name'),
-    align: 'center'
-  },
-  {
-    prop: 'code',
-    label: i18n.t('module.basicData.storageBox.code'),
-    align: 'center'
-  },
-  {
-    prop: 'enName',
-    label: i18n.t('module.basicData.visual.EnglishName'),
-    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.storageBox.status'),
-    filter: basicData('storage'),
-    align: 'center'
-  },
-  {
-    prop: 'note',
-    label: i18n.t('module.basicData.storageBox.remark'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'Area',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      keyName: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      areaList: [],
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          storageBoxDelete(raw.data.id).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      } else if (raw.type === 'edit') {
-        this.addNew(raw.data.id)
-      } else {
-        this.addNew(raw.data.id, true)
-      }
-    },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.storageBoxName = key
-      storageBoxList(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-        this.listLoading = false
-      })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, true)
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-</style>

src/views/report-manage/components/HeadForm.vue

@@ -1,67 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-06 17:06:51
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 17:10:16
--->
-<template>
-  <el-form :inline="true" @keyup.enter.native="getDataList()">
-    <el-form-item :label="keyName">
-      <el-input v-model="key" style="width:300px" :placeholder="placeholderName" clearable />
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="getDataList()">{{ 'btn.search' | i18nFilter }}</el-button>
-      <el-button v-if="showAdd" type="primary" @click="add()">{{ 'btn.add' | i18nFilter }}</el-button>
-      <el-button type="success" @click="downl()">{{ '导出' | i18nFilter }}</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { string } from 'jszip/lib/support'
-
-export default {
-  props: {
-    keyName: {
-      type: string,
-      default: () => {
-        return '关键字'
-      }
-    },
-    showAdd: {
-      type: Boolean,
-      default: () => {
-        return true
-      }
-    },
-    placeholderName: {
-      type: string,
-      default: () => {
-        return '请输入关键字'
-      }
-    }
-  },
-  data() {
-    return {
-      key: ''
-    }
-  },
-  methods: {
-    getDataList() {
-      this.$emit('getDataList', this.key)
-    },
-    add() {
-      this.$emit('add')
-    },
-    downl() {
-      this.$emit('downl', this.key)
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>

src/views/report-manage/components/edit-substrate.vue

@@ -1,156 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-05 17:45:46
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 16:46:54
--->
-<template>
-  <!-- <el-dialog
-    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
-    :visible.sync="visible"
-  > -->
-  <el-dialog
-    :title="'btn.edit' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
-      <el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode">
-        <el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.location')" prop="location">
-        <el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime">
-        <el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="substrateStatus">
-        <el-input v-model="dataForm.substrateStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
-        <el-input v-model="dataForm.interCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.interCode')])" clearable />
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { updateSubstrate, listSubstrate } from '@/api/report-manage/report'
-
-export default {
-  props: {
-    id: {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        substrateCode: '',
-        location: '',
-        storeTime: '',
-        substrateStatus: '',
-        code: '',
-        storageBoxId: '',
-        storageCode: '',
-        interCode: ''
-      },
-      list: {
-        id: '',
-        location: '',
-        storeTime: '',
-        substrateCode: '',
-        substrateStatus: ''
-      },
-      dataRule: {
-        substrateCode: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
-        ],
-        code: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
-        ],
-        interCode: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    // init(id) {
-    //   // this.dataForm.id = id || ''
-    //   this.dataForm.storageBoxId = this.$route.query.id
-    //   this.dataForm.storageCode = this.$route.query.code
-    //   this.visible = true
-    //   this.$nextTick(() => {
-    //     this.$refs['dataForm'].resetFields()
-    //     // console.log(this.dataForm)
-    //     listSubstrate(this.dataForm).then(res => {
-    //       this.dataForm.id = res.data.id
-    //       this.dataForm.location = res.data.location
-    //       this.dataForm.storeTime = res.data.storeTime
-    //       this.dataForm.substrateCode = res.data.substrateCode
-    //       this.dataForm.substrateStatus = res.data.substrateStatus
-    //       // console.log(this.dataForm)
-    //     })
-    //   })
-    // },
-    init(id) {
-      // this.dataForm.id = id || ''
-      this.dataForm.storageBoxId = this.$route.query.id
-      this.dataForm.storageCode = this.$route.query.code
-      this.visible = true
-      listSubstrate(this.dataForm).then(res => {
-        console.log(res.data[0])
-        this.dataForm.id = res.data[0].id
-        this.dataForm.location = res.data[0].location
-        this.dataForm.storeTime = res.data[0].storeTime
-        this.dataForm.substrateCode = res.data[0].substrateCode
-        this.dataForm.substrateStatus = res.data[0].substrateStatus
-        this.dataForm.interCode = res.data[0].interCode
-        // console.log(this.dataForm)
-      })
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          const data = {
-            'substrateStatus': this.dataForm.substrateStatus,
-            'storeTime': this.dataForm.storeTime,
-            'id': this.dataForm.id,
-            'substrateCode': this.dataForm.substrateCode,
-            'location': this.dataForm.location,
-            'interCode': this.dataForm.interCode,
-            'storageBoxId': this.dataForm.storageBoxId
-          }
-          console.log(data)
-          updateSubstrate(data).then(res => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.visible = false
-                this.$emit('refreshDataList')
-              }
-            })
-          })
-        }
-      })
-    }
-  }
-}
-</script>

src/views/report-manage/components/substrateBtn.vue

@@ -1,35 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-05 14:35:07
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-05 16:44:43
--->
-<template>
-  <span>
-    <el-button type="text" size="small" @click="emitClick">{{ $t('module.report.inventory.viewSubstrates') }}</el-button>
-  </span>
-</template>
-
-<script>
-export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  methods: {
-    emitClick() {
-      this.$router.push({
-        name: 'viewSubstrate',
-        query: {
-          id: this.injectData.id,
-          code: this.injectData.code
-        }
-      })
-    }
-  }
-}
-</script>

src/views/report-manage/components/viewSubstrate.vue

@@ -1,191 +0,0 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: fzq
- * @Date: 2022-03-05 15:55:45
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-05 19:44:47
--->
-<template>
-  <div class="app-container">
-    <!-- <div style="margin:10px 50px">
-      <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
-    </div> -->
-    <div style="title">存储箱号:{{ num }}
-      <el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
-    </div>
-    <base-table
-      :page="listQuery.current"
-      :limit="listQuery.size"
-      :table-config="tableProps"
-      :table-data="list"
-      :is-loading="listLoading"
-    >
-      <method-btn
-        slot="handleBtn"
-        :width="trueWidth"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <edit-substrate v-if="addOrUpdateVisible" :id="listQuery.id" ref="addOrUpdate" @refreshDataList="getList" />
-  </div>
-</template>
-
-<script>import i18n from '@/lang'
-import { listSubstrate, deleSubstrate } from '@/api/report-manage/report'
-import editSubstrate from './edit-substrate.vue'
-import BaseTable from '@/components/BaseTable'
-import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-/**
- * 表格表头配置项 TypeScript接口注释
- * tableConfig<ConfigItem> = []
- *
- * Interface ConfigItem = {
- *  prop: string,
- *  label: string,
- *  width: string,
- *  align: string,
- *  subcomponent: function,
- *  filter: function
- * }
- *
- *
- */
-
-const tableBtn = [
-  {
-    type: 'edit',
-    btnName: 'btn.edit'
-  },
-  {
-    type: 'delete',
-    btnName: 'btn.delete'
-  }
-]
-const tableProps = [
-  {
-    prop: 'substrateCode',
-    label: i18n.t('module.report.substrate.substrateCode'),
-    align: 'center'
-  },
-  {
-    prop: 'location',
-    label: i18n.t('module.report.substrate.location'),
-    align: 'center'
-  },
-  {
-    prop: 'storeTime',
-    label: i18n.t('module.report.substrate.storeTime'),
-    align: 'center'
-  },
-  {
-    prop: 'substrateStatus',
-    label: i18n.t('module.report.substrate.substrateStatus'),
-    align: 'center'
-  }
-]
-
-export default {
-  name: 'ViewSubstrate',
-  components: { BaseTable, MethodBtn, editSubstrate },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      addOrUpdateVisible: false,
-      num: '',
-      tableBtn,
-      trueWidth: 200,
-      tableProps,
-      list: [],
-      listLoading: true,
-      listQuery: {
-        current: 1,
-        size: 10,
-        substrateCode: ''
-      }
-    }
-  },
-  created() {
-    this.listQuery.substrateCode = this.$route.query.code
-    this.getList()
-  },
-  methods: {
-    handleClick(raw) {
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.substrateCode}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-        //   console.log(raw.data)
-          deleSubstrate(raw.data).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      } else {
-        this.addNew(raw.data.id)
-      }
-    },
-    getList() {
-      this.listLoading = true
-      this.num = this.listQuery.substrateCode
-      this.listQuery.code = this.$route.query.code
-      console.log(this.listQuery)
-      listSubstrate(this.listQuery).then(response => {
-        if (response.data) {
-          this.list = response.data
-          console.log(this.list)
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.listLoading = false
-      })
-    },
-    // 新增 / 修改
-    addNew(id) {
-      this.addOrUpdateVisible = true
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id)
-      })
-    },
-    goback() {
-      this.$router.go(-1)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.title {
-  left: 150px;
-}
-.edit-input {
-  padding-right: 100px;
-}
-.cancel-btn {
-  position: absolute;
-  right: 15px;
-  top: 10px;
-}
-.back {
-  right: 20px;
-}
-</style>

vue.config.js

@@ -46,9 +46,9 @@ module.exports = {
     // 这里写入需要代理的api和对应的目标地址
     proxy: {
       '/api': {
-        target: 'http://localhost:8080',
+        // target: 'http://localhost:8080',
         // target: 'http://192.168.0.148:8080',
-        // target: 'http://a.wms.picaiba.com/api',
+        target: 'http://a.wms.picaiba.com/api',
         // target: 'http://192.168.0.127:8080',
         // target: 'http://192.168.0.165:8080',
         // target: 'http://192.168.43.105:8080',