''

Merge branch 'develop' into fzq
'工序库位+报表'
2022-03-07 08:41:20 +08:00 · 2022-03-06 19:36:56 +08:00 · 2022-03-06 19:36:26 +08:00 · 2022-03-05 19:43:42 +08:00 · 2022-03-04 11:18:40 +08:00 · 2022-03-04 11:12:33 +08:00
47 changed files with 2250 additions and 465 deletions
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'

 # base api
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = '/api'
 VUE_APP_REPORT_DESIGN_URL = '/ureport/designer'
 VUE_APP_REPORT_VIEW_URL = '/ureport/preview'
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ selenium-debug.log
 package-lock.json
 yarn.lock
 /.env.development
-/vue.config.js
+vue.config.js
--- a/src/api/basicData/Cache/location.js
+++ b/src/api/basicData/Cache/location.js
@@ -1,15 +1,15 @@
 /*
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
- * @LastEditors: zwq
- * @LastEditTime: 2021-01-28 09:38:31
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 14:29:17
 * @Description:
 */
 import request from '@/utils/request'

 export function locationList(data) { // 获取库位信息列表
  return request({
-    url: '/basic/stock/page',
+    url: '/api/wms/area/locationByShelf',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function locationList(data) { // 获取库位信息列表

 export function locationDetail(id) { // 获取库位信息单条数据
  return request({
-    url: '/basic/stock/get',
+    url: '/api/wms/area/locationById',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function locationDetail(id) { // 获取库位信息单条数据

 export function locationUpdate(data) { // 更新库位信息单条数据
  return request({
-    url: '/basic/stock/update',
+    url: '/api/wms/area/updatelocation',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function locationUpdate(data) { // 更新库位信息单条数据

 export function locationAdd(data) { // 新增库位信息单条数据
  return request({
-    url: '/basic/stock/add',
+    url: '/api/wms/area/addlocation',
    method: 'post',
    data
  })
@@ -41,14 +41,14 @@ export function locationAdd(data) { // 新增库位信息单条数据

 export function locationCode() { // 获取库位信息code
  return request({
-    url: '/basic/stock/get-code',
+    url: '/api/wms/area/getCode',
    method: 'post'
  })
 }

 export function locationDelete(id) { // 删除库位信息单条数据
  return request({
-    url: '/basic/stock/delete',
+    url: '/api/wms/area/deletelocation',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/Cache/processLocation.js
+++ b/src/api/basicData/Cache/processLocation.js
@@ -0,0 +1,48 @@
+/*
+ * @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 }
+  })
+}
--- a/src/api/basicData/Equipment/equipmentInfo.js
+++ b/src/api/basicData/Equipment/equipmentInfo.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-10 17:00:16
+ * @LastEditTime: 2022-03-04 09:06:58
 * @Description:
 */
 import request from '@/utils/request'
@@ -15,6 +15,14 @@ export function equipmentInfoList(data) { // 获取设备信息列表
  })
 }

+export function equipmentlistList(data) { // 获取设备信息列表
+  return request({
+    url: '/api/process/work-sequence/equipmentlistList',
+    method: 'post',
+    data
+  })
+}
+
 export function equipmentInfoDetail(id) { // 获取设备信息单条数据
  return request({
    url: '/api/wms/equipment/get',
--- a/src/api/basicData/Equipment/equipmentInfoAttr.js
+++ b/src/api/basicData/Equipment/equipmentInfoAttr.js
@@ -1,8 +1,8 @@
 /*
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
- * @LastEditors: zwq
- * @LastEditTime: 2021-01-20 12:00:52
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-05 10:22:28
 * @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/page',
+    url: '/api/wms/equipment/attr',
    method: 'post',
    data
  })
@@ -27,7 +27,7 @@ export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据

 export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数据
  return request({
-    url: '/basic/equipment-attr/update',
+    url: '/api/wms/equipment/updateattr',
    method: 'post',
    data
  })
@@ -35,7 +35,7 @@ export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数

 export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
  return request({
-    url: '/basic/equipment-attr/add',
+    url: '/api/wms/equipment/addattr',
    method: 'post',
    data
  })
@@ -43,14 +43,14 @@ export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据

 export function equipmentInfoAttrCode() { // 获取设备属性code
  return request({
-    url: '/basic/equipment-attr/get-code',
+    url: '/api/wms/equipment/getCode',
    method: 'post'
  })
 }

 export function equipmentInfoAttrDelete(id) { // 删除设备属性单条数据
  return request({
-    url: '/basic/equipment-attr/delete',
+    url: '/api/wms/equipment/deleteattr',
    method: 'post',
    data: { id }
  })
--- a/src/api/basicData/GroupModule/staff.js
+++ b/src/api/basicData/GroupModule/staff.js
@@ -2,14 +2,14 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 15:10:05
+ * @LastEditTime: 2022-03-04 10:05:02
 * @Description:
 */
 import request from '@/utils/request'

 export function staffList(data) { // 获取员工列表
  return request({
-    url: '/basic/worker/page',
+    url: '/api/wms/worker/page',
    method: 'post',
    data
  })
@@ -17,7 +17,7 @@ export function staffList(data) { // 获取员工列表

 export function staffDetail(id) { // 获取员工单条数据
  return request({
-    url: '/basic/worker/get',
+    url: '/api/wms/worker/get',
    method: 'post',
    data: { id }
  })
@@ -25,7 +25,7 @@ export function staffDetail(id) { // 获取员工单条数据

 export function staffUpdate(data) { // 更新员工单条数据
  return request({
-    url: '/basic/worker/update',
+    url: '/api/wms/worker/update',
    method: 'post',
    data
  })
@@ -33,7 +33,7 @@ export function staffUpdate(data) { // 更新员工单条数据

 export function staffAdd(data) { // 新增员工单条数据
  return request({
-    url: '/basic/worker/add',
+    url: '/api/wms/worker/add',
    method: 'post',
    data
  })
@@ -41,14 +41,14 @@ export function staffAdd(data) { // 新增员工单条数据

 export function staffCode() { // 获取员工code
  return request({
-    url: '/basic/worker/get-code',
+    url: '/api/wms/worker/get-code',
    method: 'post'
  })
 }

 export function staffDelete(id) { // 删除员工单条数据
  return request({
-    url: '/basic/worker/delete',
+    url: '/api/wms/worker/delete',
    method: 'post',
    data: { id }
  })
--- a/src/api/orderManage/workOrder/workOrder.js
+++ b/src/api/orderManage/workOrder/workOrder.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 13:57:00
+ * @LastEditTime: 2022-03-04 09:35:14
 * @Description:
 */
 import request from '@/utils/request'
@@ -15,6 +15,14 @@ export function workOrderList(data) { // 获取工单列表
  })
 }

+export function workOrderListList(data) { // 00A获取工单列表
+  return request({
+    url: '/api/wms/work/order/page',
+    method: 'post',
+    data
+  })
+}
+
 export function workOrderDetail(id) { // 获取工单单条数据
  const data = {
    'id': id
--- a/src/api/report-manage/report.js
+++ b/src/api/report-manage/report.js
@@ -1,19 +1,36 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-07 18:39:03
- * @LastEditors: zwq
- * @LastEditTime: 2022-02-25 09:05:53
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-06 19:27:01
 * @Description: file content
 */
 import request from '@/utils/request'
-
-export function page(data) {
+// 获取当前库存存储箱列表
+export function list(data) {
  return request({
-    url: '/api/report/report-sheet/page',
+    url: '/api/report/report-storage-box/list',
    method: 'post',
    data
  })
 }
+// 获取当前库存存储箱分页报表
+export function page(data) {
+  return request({
+    url: '/api/report/report-storage-box/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({
@@ -47,3 +64,44 @@ 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
+  })
+}
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2020-12-14 09:07:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-22 09:12:23
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-05 11:13:00
 * @FilePath: \basic-admin\src\filters\index.js
 * @Description: 过滤器定义、多语言过滤器修改
 */
--- a/src/lang/i18n.js
+++ b/src/lang/i18n.js
@@ -571,10 +571,18 @@ 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'
@@ -584,6 +592,18 @@ 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',
@@ -920,6 +940,26 @@ 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'
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:18
+ * @LastEditTime: 2022-03-04 10:13:58
 * @Description: file content
 */
 export default {
@@ -225,6 +225,7 @@ export default {
    wasteGrade: 'Waste Grade',
    RegisterPerson: 'Register Person',
    updateTime: 'Update Time',
+    registrationPlace: 'Registration Place',
    cause: 'Cause',
    causeCode: 'Cause Code',
    WasteName: 'Waste Name',
--- a/src/lang/i18n/en/module/quality.js
+++ b/src/lang/i18n/en/module/quality.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-03-13 13:49:16
 * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:59:15
+ * @LastEditTime: 2022-03-04 09:21:36
 * @FilePath: \basic-admin\src\lang\i18n\en\module\quality.js
 * @Description:
 */
@@ -90,5 +90,10 @@ export default {
    subTitle: 'Scrap Category Statistics',
    completeWaste: 'Complete Waste',
    CanBeUsedAfterProcessing: 'Can be used after processing'
+  },
+  QCPplan: {
+    QCPcode: 'QCP Code',
+    getTime: 'Get Time',
+    detail: 'Detail'
  }
 }
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,8 +1,13 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-06 19:53:27
+=======
 * @LastEditors: zwq
- * @LastEditTime: 2022-01-17 15:12:12
+ * @LastEditTime: 2022-03-04 10:13:41
+>>>>>>> develop
 * @Description: file content
 */
 export default {
@@ -135,6 +140,8 @@ export default {
    AreaName: '货架名称',
    rowNum: '行数',
    columnNum: '列数',
+    rowMark: '行标',
+    columnMark: '列标',
    Shelf: '货架',
    ManageShelves: '管理货架',
    ShelfCode: '货架编码',
@@ -145,13 +152,16 @@ export default {
    ManageLocation: '管理货位',
    LocationCode: '库位编码',
    LocationName: '库位名称',
-    anotherName: '别名',
+    locationType: '库位类型',
+    anotherName: '库位别名',
    place: '位置',
-    addCacheArea: '添加货架'
+    addCacheArea: '添加货架',
+    addLocation: '添加库位',
+    status: '状态'
  },
  storageBox: {
-    name: '名称',
-    code: '编码',
+    name: '存储箱名称',
+    code: '存储箱编码',
    alias: '别名',
    StorageQuantity: '存储数量',
    status: '状态',
@@ -162,6 +172,8 @@ export default {
    PositionCodeAlias: '位置编码别名'
  },
  equipment: {
+    shortName: '名称缩写',
+    enName: '英文名称',
    EquipmentName: '设备名称',
    EquipmentCode: '设备编码',
    EquipmentType: '设备类型',
@@ -225,6 +237,7 @@ export default {
    wasteGrade: '废品等级',
    RegisterPerson: '登记人',
    updateTime: '登记时间',
+    registrationPlace: '登记地点',
    cause: '报废原因',
    causeCode: '报废原因编码',
    WasteName: '废品报废名称',
@@ -238,6 +251,14 @@ export default {
    manual: '手动',
    workOrderId: '工单名称'
  },
+  processLocation: {
+    sequence: '顺序',
+    locationName: '库位名',
+    isProcess: '是否为工序准备箱',
+    locationId: '库位ID',
+    workSequenId: '工序ID',
+    equipmentMark: '设备标记'
+  },
  productPool: {
    productName: '产品名称',
    productCode: '产品编码'
--- a/src/lang/i18n/zh/module/quality.js
+++ b/src/lang/i18n/zh/module/quality.js
@@ -1,7 +1,7 @@
 /*
 * @Date: 2021-03-13 13:49:07
 * @LastEditors: zwq
- * @LastEditTime: 2021-04-15 09:58:18
+ * @LastEditTime: 2022-03-04 09:21:04
 * @FilePath: \basic-admin\src\lang\i18n\zh\module\quality.js
 * @Description:
 */
@@ -90,5 +90,10 @@ export default {
    subTitle: '废品分类统计',
    completeWaste: '完全废品',
    CanBeUsedAfterProcessing: '加工可用'
+  },
+  QCPplan: {
+    QCPcode: 'QCP项目编码',
+    getTime: '获取时间',
+    detail: '详情'
  }
 }
--- a/src/lang/i18n/zh/module/report.js
+++ b/src/lang/i18n/zh/module/report.js
@@ -1,8 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-04-22 19:48:46
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-27 12:13:25
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-06 16:50:50
 * @Description: file content
 */

@@ -11,7 +11,30 @@ 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: '全部'
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -98,11 +98,19 @@ 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/cache'),
+        component: () => import('@/views/basicData/Cache/shelf'),
        name: 'ports',
-        meta: { title: routerTitle.basicData.ports.ports?.[language] || routerTitle.basicData.ports.ports.en, icon: 'form', affix: true }
+        meta: { title: routerTitle.basicData.ports.shelfInfo?.[language] || routerTitle.basicData.ports.shelfInfo.en, icon: 'form', affix: true }
      },
      {
        path: 'area',
@@ -147,6 +155,19 @@ 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'),
@@ -164,6 +185,7 @@ 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: [
          {
@@ -188,6 +210,12 @@ export const constantRoutes = [
          }
        ]
      },
+      {
+        path: 'staff',
+        component: () => import('@/views/basicData/GroupModule/staff'),
+        name: 'staff',
+        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
+      },
      {
        path: '/dataDictionary',
        component: () => import('@/views/basicData/index'),
@@ -345,12 +373,12 @@ export const constantRoutes = [
            name: 'ScrapType',
            meta: { title: routerTitle.basicData.scrap.scrapType?.[language] || routerTitle.basicData.scrap.scrapType.en, icon: 'form', affix: true, required: true, requireToken: true }
          },
-          {
-            path: 'EquipmentScrapGrade',
-            component: () => import('@/views/basicData/EquipmentScrapGrade'),
-            name: 'EquipmentScrapGrade',
-            meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
-          },
+          // {
+          //   path: 'EquipmentScrapGrade',
+          //   component: () => import('@/views/basicData/EquipmentScrapGrade'),
+          //   name: 'EquipmentScrapGrade',
+          //   meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
+          // },
          {
            path: 'scrap',
            component: () => import('@/views/QualityManager/scrap'),
@@ -368,36 +396,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: 'report',
-      component: () => import('@/views/report-manage/ReportSortChoise'),
-      name: 'Report',
-      meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true }
+      path: 'currentInventory',
+      component: () => import('@/views/report-manage/CurrentInventory'),
+      name: 'currentInventory',
+      meta: { title: routerTitle.form.currentInventory?.[language] || routerTitle.form.currentInventory.en, icon: 'form', affix: true, required: true, requireToken: true }
    },
    {
-      path: 'report-sort-list',
-      component: () => import('@/views/report-manage/Report'),
-      name: 'ReportSortList',
+      path: 'currentEmptyBox',
+      component: () => import('@/views/report-manage/CurrentEmptyBox'),
+      name: 'currentEmptyBox',
+      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.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true }
+      meta: { title: routerTitle.form.editSubstrate?.[language] || routerTitle.form.editSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
    },
    {
-      path: 'report-view',
-      component: () => import('@/views/report-manage/ReportView'),
-      name: 'ReportDesign',
-      meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true },
-      hidden: true
-    },
-    {
-      path: 'report-design',
-      component: () => import('@/views/report-manage/ReportDesign'),
-      name: 'ReportDesign',
-      meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true }
-    },
-    {
-      path: 'report-sort',
-      component: () => import('@/views/report-manage/ReportSort/index'),
-      name: 'ReportSort',
-      meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true }
+      path: 'viewSubstrate',
+      component: () => import('@/views/report-manage/components/viewSubstrate'),
+      name: 'viewSubstrate',
+      hidden: true,
+      meta: { title: routerTitle.form.viewSubstrate?.[language] || routerTitle.form.viewSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
    }]
  },
  {
--- a/src/views/QualityManager/QCPplan.vue
+++ b/src/views/QualityManager/QCPplan.vue
@@ -2,18 +2,35 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-03 14:28:58
+ * @LastEditTime: 2022-03-04 09:22:58
 * @Description:
 -->
 <template>
  <div class="app-container">
-    <head-form
-      :placeholder-name="placeholderName"
-      :key-name="keyName"
-      :show-add="showAdd"
-      @getDataList="getList"
-      @add="addNew"
-    />
+    <el-form
+      ref="formData"
+      :rules="rules"
+      :model="listQuery"
+      :inline="true"
+      size="medium"
+      label-width="100px"
+    >
+      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+        <el-date-picker
+          v-model="listQuery.timeSlot"
+          type="daterange"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          :start-placeholder="$t('module.orderManage.order.StartTime')"
+          :end-placeholder="$t('module.orderManage.order.StartTime')"
+          :range-separator="$t('module.orderManage.order.To')"
+          clearable
+        />
+      </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"
@@ -35,18 +52,17 @@
      :limit.sync="listQuery.size"
      @pagination="getList()"
    />
+    <Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
  </div>
 </template>

 <script>
-import i18n from '@/lang'
-import { StateConfigList, StateConfigDelete } from '@/api/basicData/StateConfig'
-import HeadForm from '@/components/basicData/HeadForm'
+import FactoryAdd from './components/ExecutionInfoDetail.vue'
 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 basicData from '@/filters/basicData'
+import i18n from '@/lang'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@@ -65,62 +81,51 @@ import basicData from '@/filters/basicData'

 const tableBtn = [
  {
-    type: 'edit',
-    btnName: 'btn.edit'
+    type: 'see',
+    btnName: 'btn.see'
  }
-  // {
-  //   type: 'delete',
-  //   btnName: 'btn.delete'
-  // }
 ]
 const tableProps = [
+  {
+    prop: 'name',
+    label: i18n.t('module.quality.QCPplan.QCPcode'),
+    align: 'center'
+  },
  {
    prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
+    label: i18n.t('module.quality.QCPplan.getTime'),
    filter: timeFormatter,
    align: 'center'
-  },
-  {
-    prop: 'status',
-    label: i18n.t('module.basicData.StateConfig.status'),
-    align: 'center'
-  },
-  {
-    prop: 'twinkle',
-    label: i18n.t('module.basicData.StateConfig.Twinkle'),
-    filter: basicData('onDuty'),
-    align: 'center'
-  },
-  {
-    prop: 'colour',
-    label: i18n.t('module.basicData.StateConfig.DisplayColor'),
-    align: 'center'
-  },
-  {
-    prop: 'description',
-    label: i18n.t('module.basicData.visual.Remarks'),
-    align: 'center'
  }
 ]

 export default {
-  name: 'QCPplan',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm },
+  name: 'ExecutionInfo',
+  components: { Pagination, BaseTable, MethodBtn, FactoryAdd },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
  data() {
    return {
-      keyName: i18n.t('module.basicData.visual.keyword'),
-      placeholderName: this.$t('module.basicData.StateConfig.status'),
      addOrUpdateVisible: false,
      tableBtn,
-      trueWidth: 150,
+      trueWidth: 200,
      tableProps,
      list: [],
      total: 0,
-      showAdd: false,
      listLoading: true,
+      rules: {},
      listQuery: {
        current: 1,
-        size: 10
+        size: 10,
+        timeSlot: []
      }
    }
  },
@@ -129,37 +134,32 @@ export default {
  },
  methods: {
    handleClick(raw) {
-      console.log(raw)
-      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.status}]?`, this.$t('module.basicData.visual.Tips'), {
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
-          type: 'warning'
-        }).then(() => {
-          StateConfigDelete(raw.data.id).then(response => {
-            this.$message({
-              message: this.$t('module.basicData.visual.success'),
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getList()
-              }
-            })
-          })
-        }).catch(() => {})
-      }
+      this.addNew(raw.data.id)
    },
-    getList(key) {
-      this.listLoading = true
-      this.listQuery.status = key
-      StateConfigList(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
+    getList() {
+      // this.listLoading = true
+      if (this.listQuery.timeSlot) {
+        this.listQuery.startTime = this.listQuery.timeSlot[0]
+        this.listQuery.endTime = this.listQuery.timeSlot[1]
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      // 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.listLoading = false
+      // })
+    },
+    // 新增 / 修改
+    addNew(id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
      })
    }
  }
--- a/src/views/QualityManager/components/ExecutionInfoDetail.vue
+++ b/src/views/QualityManager/components/ExecutionInfoDetail.vue
@@ -0,0 +1,115 @@
+<!--
+ * @Author: zwq
+ * @Date: 2020-12-29 16:37:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-01-17 15:21:50
+ * @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="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
+                <el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
+                <el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
+                <el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
+                <el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
+                <el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
+                <el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
+                <el-input
+                  v-model="dataForm.subProccessName"
+                  :placeholder="$t('module.basicData.Warehouse.SubProcessName')"
+                  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>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { ExecutionInfoDetail } from '@/api/orderManage/00A'
+
+export default {
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        id: 0,
+        name: undefined,
+        createTime: undefined,
+        taskCode: undefined,
+        taskType: undefined,
+        craftName: undefined,
+        planQuantity: undefined,
+        subProccessName: undefined
+      }
+    }
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          ExecutionInfoDetail(this.dataForm.id).then(res => {
+            this.dataForm = res.data
+          })
+        }
+      })
+    }
+  }
+}
+</script>
--- a/src/views/QualityManager/scrap/ScrapInfo-add.vue
+++ b/src/views/QualityManager/scrap/ScrapInfo-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-20 11:03:09
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 10:39:52
 * @Description:
 -->
 <template>
@@ -122,6 +122,9 @@
          </el-select>
        </el-form-item>

+        <el-form-item :label="$t('module.basicData.ScrapInfo.registrationPlace')" prop="placeOfRegis">
+          <el-input v-model="dataForm.placeOfRegis" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.registrationPlace')])" clearable :style="{width: '100%'}" />
+        </el-form-item>
        <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
          <el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.remark')])" clearable :style="{width: '100%'}" />
        </el-form-item>
@@ -141,7 +144,7 @@ import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quali
 import { scrapReasonList } from '@/api/dict'
 import { getDictWorker } from '@/api/dict'
 import { getEqList } from '@/api/equipment/maintain'
-import { workOrderList } from '@/api/orderManage/workOrder/workOrder'
+import { workOrderListList } from '@/api/orderManage/workOrder/workOrder'

 const wasteGradeArr = [{
  value: '加工可用',
@@ -173,6 +176,7 @@ export default {
        scrapGrade: undefined,
        description: undefined,
        substrateId: undefined,
+        placeOfRegis: '00A',
        remark: undefined
      },
      wasteGradeArr,
@@ -279,7 +283,7 @@ export default {
      })
    },
    async getDict() {
-      const result3 = await workOrderList({
+      const result3 = await workOrderListList({
        current: 1,
        size: 999
      })
--- a/src/views/QualityManager/scrap/index.vue
+++ b/src/views/QualityManager/scrap/index.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-26 13:39:35
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 10:40:51
 * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
      :model="formData"
      :inline="true"
      size="medium"
-      label-width="130px"
+      label-width="100px"
    >
      <el-form-item v-if="false" :label="$t('module.basicData.ScrapInfo.PlateId')" prop="basalId">
        <el-input v-model="formData.basalId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
@@ -117,11 +117,6 @@ const tableProps = [
    label: i18n.t('module.basicData.ScrapInfo.source'),
    align: 'center'
  },
-  {
-    prop: 'scrapGradeDic',
-    label: i18n.t('module.basicData.ScrapInfo.wasteGrade'),
-    align: 'center'
-  },
  {
    prop: 'equipmentName',
    label: i18n.t('module.basicData.ScrapInfo.name'),
--- a/src/views/art/components/Process-add.vue
+++ b/src/views/art/components/Process-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-26 14:39:36
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 16:43:26
 * @Description:
 -->
 <template>
@@ -16,14 +16,14 @@
      </el-form-item>
      <el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
        <el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
-          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
+          <el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.enName" />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('module.art.processList.type')" prop="type">
+      <!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
        <el-select v-model="dataForm.type" clearable filterable>
          <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
        </el-select>
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item :label="$t('module.art.processList.description')" prop="address">
        <el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
      </el-form-item>
--- a/src/views/art/processList.vue
+++ b/src/views/art/processList.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: gtz
 * @Date: 2021-04-06 20:07:22
- * @LastEditors: gtz
- * @LastEditTime: 2021-06-23 16:22:06
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-03 17:00:54
 * @Description: file content
 -->
 <template>
@@ -23,7 +23,7 @@

 <script>
 // edit here
-import DataDict from './filters'
+// import DataDict from './filters'
 const tableBtn = [{
  type: 'edit',
  btnName: 'btn.edit'
@@ -35,12 +35,14 @@ const tableProps = [{
  prop: 'name',
  label: i18n.t('module.art.processList.processName'),
  align: 'center'
-}, {
-  prop: 'type',
-  label: i18n.t('module.art.processList.type'),
-  align: 'center',
-  filter: DataDict('typeFilter')
-}, {
+},
+// {
+//   prop: 'type',
+//   label: i18n.t('module.art.processList.type'),
+//   align: 'center',
+//   filter: DataDict('typeFilter')
+// },
+{
  prop: 'description',
  label: i18n.t('module.art.processList.description'),
  align: 'center'
@@ -48,7 +50,7 @@ const tableProps = [{
 import BaseTable from '@/components/BaseTable'
 // edit here
 import { list, del } from '@/api/art-manage/process'
-import { equipmentInfoList } from '@/api/basicData/Equipment/equipmentInfo'
+import { equipmentlistList } from '@/api/basicData/Equipment/equipmentInfo'
 import HeadForm from '@/components/basicData/HeadForm'
 import ProcessAdd from './components/Process-add'
 import Pagination from '@/components/Pagination'
@@ -124,10 +126,7 @@ export default {
    },
    async getEqList(key) {
      // edit here
-      const res = await equipmentInfoList({
-        current: 1,
-        size: 999
-      })
+      const res = await equipmentlistList()
      if (res.code === 0) {
        this.eqList = res.data.records
      }
--- a/src/views/basicData/Cache/cache.vue
+++ b/src/views/basicData/Cache/cache.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-11 15:48:58
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 16:35:32
 * @Description:
 -->
 <template>
@@ -158,8 +158,9 @@ export default {
    },
    getList(key) {
      this.listLoading = true
-      this.listQuery.name = key
+      this.listQuery.tareaName = key
      this.listQuery.code = key
+      console.log(this.listQuery)
      cacheList(this.listQuery).then(response => {
        if (response.data.records) {
          this.list = response.data.records
--- a/src/views/basicData/Cache/components/cache-add.vue
+++ b/src/views/basicData/Cache/components/cache-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-01-11 16:26:29
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 14:21:53
 * @enName:
 -->
 <template>
@@ -104,11 +104,11 @@

 <script>import i18n from '@/lang'
 import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/Cache/cache'
-import { areaList, areaDelete } from '@/api/basicData/Cache/area'
+import { shelfList, shelfDelete } from '@/api/basicData/Cache/shelf'
 import BaseTable from '@/components/BaseTable'
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import shelfAttrAdd from './shelfAttr-add.vue'
-import shelfBtn from './shelfBtn.vue'
+import locationBtn from './locationBtn.vue'
 const tableBtn = [
  {
    type: 'edit',
@@ -121,7 +121,7 @@ const tableBtn = [
 ]
 const tableProps = [
  {
-    prop: 'name',
+    prop: 'shelfName',
    label: i18n.t('module.basicData.cache.AreaName'),
    align: 'center'
  },
@@ -131,7 +131,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'shelfNum',
+    prop: 'total',
    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: shelfBtn,
+    subcomponent: locationBtn,
    align: 'center'
  }
 ]
@@ -219,9 +219,20 @@ export default {
        if (this.id) {
          cacheDetail(this.id).then(res => {
            this.dataForm = res.data
+            // console.log(this.dataForm)
          })
          this.listQuery.id = this.id
-          areaList(this.listQuery).then(response => {
+          console.log(this.listQuery.id)
+          // 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 {
@@ -236,7 +247,7 @@ export default {
      })
    },
    getList() {
-      areaList(this.listQuery).then(response => {
+      shelfList(this.listQuery).then(response => {
        if (response.data.records) {
          this.list = response.data.records
        }
@@ -249,7 +260,7 @@ export default {
          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
          type: 'warning'
        }).then(() => {
-          areaDelete(raw.data.id).then(response => {
+          shelfDelete(raw.data.id).then(response => {
            this.$message({
              message: this.$t('module.basicData.visual.success'),
              type: 'success',
--- a/src/views/basicData/Cache/components/location-add.vue
+++ b/src/views/basicData/Cache/components/location-add.vue
@@ -1,16 +1,23 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-11 16:44:10
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-04 19:08:00
 * @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"
@@ -30,11 +37,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> = []
@@ -62,10 +69,15 @@ const tableBtn = [
  }
 ]
 const tableProps = [
+  // {
+  //   prop: 'createTime',
+  //   label: i18n.t('module.basicData.factory.createTime'),
+  //   filter: timeFormatter,
+  //   align: 'center'
+  // },
  {
-    prop: 'createTime',
-    label: i18n.t('module.basicData.factory.createTime'),
-    filter: timeFormatter,
+    prop: 'locationName',
+    label: i18n.t('module.basicData.cache.LocationName'),
    align: 'center'
  },
  {
@@ -74,30 +86,35 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'name',
-    label: i18n.t('module.basicData.cache.LocationName'),
-    align: 'center'
-  },
-  {
-    prop: 'anotherName',
+    prop: 'locationNameAlias',
    label: i18n.t('module.basicData.cache.anotherName'),
    align: 'center'
  },
  {
-    prop: 'place',
-    label: i18n.t('module.basicData.cache.place'),
+    prop: 'layers',
+    label: i18n.t('module.basicData.cache.rowMark'),
    align: 'center'
  },
  {
-    prop: 'remark',
-    label: i18n.t('module.basicData.visual.Remarks'),
+    prop: 'columns',
+    label: i18n.t('module.basicData.cache.columnMark'),
+    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 },
+  components: { BaseTable, MethodBtn, locationAttrAdd, HeadForm },
  filters: {
    statusFilter(status) {
      const statusMap = {
@@ -111,6 +128,8 @@ export default {
  data() {
    return {
      addOrUpdateVisible: false,
+      keyNameAdd: i18n.t('module.basicData.visual.keyword'),
+      placeholderName: this.$t('module.basicData.cache.LocationName'),
      tableBtn,
      trueWidth: 200,
      tableProps,
@@ -119,7 +138,8 @@ export default {
      listQuery: {
        current: 1,
        size: 990,
-        shelfId: ''
+        shelfId: '',
+        id: ''
      }
    }
  },
@@ -130,7 +150,8 @@ export default {
  methods: {
    handleClick(raw) {
      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
+        console.log(raw.data)
+        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'
@@ -153,9 +174,12 @@ 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)
        }
--- a/src/views/basicData/Cache/components/locationAttr-add.vue
+++ b/src/views/basicData/Cache/components/locationAttr-add.vue
@@ -1,30 +1,36 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-25 16:23:03
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-04 18:59:53
 * @Description:
 -->
 <template>
  <el-dialog
-    :title="!dataForm.shelfId ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.id ? '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="name">
-        <el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationName')])" clearable />
+      <el-form-item :label="$t('module.basicData.cache.LocationName')" prop="locationName">
+        <el-input v-model="dataForm.locationName" :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="anotherName">
-        <el-input v-model="dataForm.anotherName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
+      <el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
+        <el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.cache.place')" prop="place">
-        <el-input v-model="dataForm.place" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.place')])" clearable />
+      <el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
+        <el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
      </el-form-item>
-      <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 :label="$t('module.basicData.cache.columnMark')" prop="columns">
+        <el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" 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">
@@ -51,11 +57,14 @@ export default {
      visible: false,
      dataForm: {
        id: 0,
-        name: '',
+        locationName: '',
        code: '',
-        anotherName: '',
-        place: '',
-        remark: ''
+        locationNameAlias: '',
+        rowNum: '',
+        columns: '',
+        layers: '',
+        status: '',
+        locationType: ''
      },
      dataRule: {
        name: [
@@ -89,13 +98,15 @@ export default {
      this.$refs['dataForm'].validate((valid) => {
        if (valid) {
          const data = {
-            'name': this.dataForm.name,
+            'locationName': this.dataForm.locationName,
            'code': this.dataForm.code,
-            'anotherName': this.dataForm.anotherName,
-            'place': this.dataForm.place,
-            'remark': this.dataForm.remark,
+            'locationNameAlias': this.dataForm.locationNameAlias,
+            'columns': this.dataForm.columns,
+            'layers': this.dataForm.layers,
            '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 => {
@@ -111,6 +122,8 @@ export default {
            })
          } else {
            locationAdd(data).then(res => {
+              console.log(data)
+              console.log(res)
              this.$message({
                message: this.$t('module.basicData.visual.success'),
                type: 'success',
--- a/src/views/basicData/Cache/components/locationBtn.vue
+++ b/src/views/basicData/Cache/components/locationBtn.vue
@@ -1,13 +1,13 @@
 <!--
 * @Date: 2021-01-07 20:09:37
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-06 13:12:47
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 18:39:03
 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
 * @Description:
 -->
 <template>
  <span>
-    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.ManageLocation') }}</el-button>
+    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
  </span>
 </template>

--- a/src/views/basicData/Cache/components/shelfAttr-add.vue
+++ b/src/views/basicData/Cache/components/shelfAttr-add.vue
@@ -1,13 +1,14 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-16 15:01:45
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 19:00:08
 * @Description:
 -->
 <template>
+  <!-- 新增/编辑识别 :title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter" -->
  <el-dialog
-    :title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter"
+    :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
    :visible.sync="visible"
  >
    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
@@ -17,6 +18,7 @@
      <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
@@ -26,9 +28,15 @@
            :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.StorageQuantity')" prop="shelfNumber">
-        <el-input-number v-model="dataForm.shelfNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.StorageQuantity')])" clearable />
+      <el-form-item :label="$t('module.basicData.cache.rowNum')" prop="rowNum">
+        <el-input-number v-model="dataForm.rowNum" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowNum')])" 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">
@@ -39,8 +47,7 @@
 </template>

 <script>
-import { shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
-import { areaList } from '@/api/basicData/Cache/area'
+import { shelfList, shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'

 export default {
  props: {
@@ -90,7 +97,7 @@ export default {
        current: 1,
        size: 500
      }
-      areaList(params).then(response => {
+      shelfList(params).then(response => {
        if (response.data.records) {
          this.areaArr = response.data.records
        }
@@ -114,7 +121,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({
@@ -129,6 +136,7 @@ export default {
            })
          } else {
            shelfAdd(data).then(res => {
+              console.log(res)
              this.$message({
                message: this.$t('module.basicData.visual.success'),
                type: 'success',
--- a/src/views/basicData/Cache/components/shelfBtn.vue
+++ b/src/views/basicData/Cache/components/shelfBtn.vue
@@ -1,13 +1,13 @@
 <!--
 * @Date: 2021-01-07 20:09:37
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-06 13:03:40
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-02 19:00: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.ManageShelves') }}</el-button>
+    <el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
  </span>
 </template>

--- a/src/views/basicData/Cache/shelf.vue
+++ b/src/views/basicData/Cache/shelf.vue
@@ -1,18 +1,18 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-25 16:13:19
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-04 19:00:14
 * @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,15 +39,13 @@
 </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> = []
@@ -76,34 +74,33 @@ const tableBtn = [
 ]
 const tableProps = [
  {
-    prop: 'createTime',
-    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.ShelfCode'),
-    align: 'center'
-  },
-  {
-    prop: 'areaName',
+    prop: 'shelfName',
    label: i18n.t('module.basicData.cache.AreaName'),
    align: 'center'
  },
  {
-    prop: 'shelfNumber',
+    prop: 'code',
+    label: i18n.t('module.basicData.cache.AreaCode'),
+    align: 'center'
+  },
+  {
+    prop: 'total',
    label: i18n.t('module.basicData.cache.StorageQuantity'),
    align: 'center'
  },
  {
-    prop: 'location',
-    label: i18n.t('module.basicData.cache.Location'),
+    prop: 'rowNum',
+    label: i18n.t('module.basicData.cache.rowNum'),
+    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'
  }
@@ -111,7 +108,7 @@ const tableProps = [

 export default {
  name: 'Area',
-  components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
+  components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
  filters: {
    statusFilter(status) {
      const statusMap = {
@@ -141,21 +138,22 @@ export default {
    }
  },
  created() {
-    const params = {
-      current: 1,
-      size: 500
-    }
-    areaList(params).then(response => {
-      if (response.data.records) {
-        this.areaList = response.data.records
-      }
-      this.getList()
-    })
+    // const params = {
+    //   current: 1,
+    //   size: 500
+    // }
+    // shelfList(params).then(response => {
+    //   if (response.data.records) {
+    //     this.areaList = response.data.records
+    //   }
+    //   this.getList()
+    // })
+    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'), {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.shelfName}]?`, this.$t('module.basicData.visual.Tips'), {
          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
          type: 'warning'
@@ -179,9 +177,10 @@ export default {
    },
    getList(key) {
      this.listLoading = true
-      this.listQuery.name = key
+      this.listQuery.shelfName = 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 => {
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/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,9 +53,25 @@
                  :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"
@@ -73,18 +89,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="productionTime">
+            <el-form-item :label="$t('module.basicData.visual.productionTime')" prop="createTime">
              <el-date-picker
-                v-model="dataForm.productionTime"
+                v-model="dataForm.createTime"
                :disabled="isdetail"
                format="yyyy-MM-dd"
                value-format="yyyy-MM-dd"
@@ -93,23 +109,10 @@
                clearable
              />
            </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-dd"
-                :style="{width: '100%'}"
-                :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
-                clearable
-              />
-            </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.debugTime')" prop="debugTime">
              <el-date-picker
                v-model="dataForm.debugTime"
@@ -126,7 +129,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
@@ -138,9 +141,19 @@
              />
            </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"
@@ -162,20 +175,8 @@
                :style="{width: '100%'}"
              />
            </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-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-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>
@@ -184,9 +185,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%'}" />
@@ -197,9 +198,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"
@@ -248,11 +249,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"
@@ -265,7 +266,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>
@@ -330,12 +331,9 @@ import {
  equipmentInfoUpdate,
  equipmentInfoAdd,
  equipmentInfoCode,
-  equipmentInfoFileAdd,
-  getEquipmentInfoFile
+  equipmentInfoFileAdd
 } 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'
@@ -365,15 +363,15 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'attrValue',
+    prop: 'attrContent',
    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 {
@@ -393,7 +391,7 @@ export default {
        abbr: '',
        equipmentType: '',
        spec: '',
-        productionTime: '',
+        createTime: '',
        enterTime: '',
        debugTime: '',
        debugPeriod: '',
@@ -429,17 +427,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,
@@ -462,34 +460,36 @@ 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) {
-        const data =
-          {
-            'equipmentId': this.listQuery.equipmentId
-          }
-        getEquipmentInfoFile(data).then(res => {
-          this.downloadList = res.data
-          this.downloadList.forEach(item => {
-            if (item.typeCode === 'equipmentInfoImage') {
-              this.imgList.push(item)
-            } else {
-              this.fileList.push(item)
-            }
-          })
-        })
-      }
-      this.list.splice(0, this.list.length)
-      equipmentTypeList(this.listQuery).then(response => {
-        this.equipmentTypeOption = response.data.records
-      })
-      equipmentGroupList(this.listQuery).then(response => {
-        this.equipmentGroupOption = response.data.records
-      })
+      // 设备信息下载接口，暂时未调用
+      // if (this.isdetail) {
+      //   const data =
+      //     {
+      //       'equipmentId': this.listQuery.equipmentId
+      //     }
+      //   getEquipmentInfoFile(data).then(res => {
+      //     this.downloadList = res.data
+      //     this.downloadList.forEach(item => {
+      //       if (item.typeCode === 'equipmentInfoImage') {
+      //         this.imgList.push(item)
+      //       } else {
+      //         this.fileList.push(item)
+      //       }
+      //     })
+      //   })
+      // }
+      // this.list.splice(0, this.list.length)
+      // equipmentTypeList(this.listQuery).then(response => {
+      //   this.equipmentTypeOption = response.data.records
+      // })
+      // equipmentGroupList(this.listQuery).then(response => {
+      //   this.equipmentGroupOption = response.data.records
+      // })
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
        if (this.listQuery.equipmentId) {
@@ -514,7 +514,9 @@ 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 {
@@ -525,7 +527,7 @@ export default {
    },
    handleClick(raw) {
      if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.attrName}]?`, 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'
--- a/src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-25 16:31:46
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-05 14:08:41
 * @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="attrValue">
-        <el-input v-model="dataForm.attrValue" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
+      <el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrContent">
+        <el-input v-model="dataForm.attrContent" :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: '',
-        attrValue: '',
+        attrContent: '',
        remark: ''
      },
      dataRule: {
        attrName: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeName')]), trigger: 'blur' }
        ],
-        attrValue: [
+        attrContent: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeValue')]), trigger: 'blur' }
        ]
      }
@@ -74,6 +74,7 @@ export default {
        this.$refs['dataForm'].resetFields()
        if (this.dataForm.id) {
          equipmentInfoAttrDetail(this.dataForm.id).then(res => {
+            console.log(res)
            this.dataForm = res.data
          })
        }
@@ -86,7 +87,7 @@ export default {
        if (valid) {
          const data = {
            'attrName': this.dataForm.attrName,
-            'attrValue': this.dataForm.attrValue,
+            'attrContent': this.dataForm.attrContent,
            'remark': this.dataForm.remark,
            'equipmentId': this.equipmentId,
            'id': this.dataForm.id
--- a/src/views/basicData/Equipment/equipmentInfo.vue
+++ b/src/views/basicData/Equipment/equipmentInfo.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2021-07-08 09:46:10
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-05 11:01:57
 * @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,20 +76,15 @@ const tableBtn = [
  }
 ]
 const tableProps = [
-  // {
-  //   prop: 'createTime',
-  //   label: i18n.t('module.basicData.factory.createTime'),
-  //   filter: timeFormatter,
-  //   align: 'center'
-  // },
  {
-    prop: 'name',
-    label: i18n.t('module.basicData.equipment.EquipmentName'),
+    prop: 'createTime',
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
    align: 'center'
  },
  {
-    prop: 'equipmentTypeName',
-    label: i18n.t('module.basicData.equipment.EquipmentType'),
+    prop: 'name',
+    label: i18n.t('module.basicData.equipment.EquipmentName'),
    align: 'center'
  },
  {
@@ -98,8 +93,8 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'equipmentGroupName',
-    label: i18n.t('module.basicData.equipment.EquipmentGrouping'),
+    prop: 'equipmentType',
+    label: i18n.t('module.basicData.equipment.EquipmentType'),
    align: 'center'
  },
  {
@@ -108,26 +103,11 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'maintenanceCycle',
-    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'),
+    prop: 'abbr',
+    label: i18n.t('module.basicData.equipment.shortName'),
    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'),
@@ -197,6 +177,7 @@ 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 {
--- a/src/views/basicData/GroupModule/components/staff-add.vue
+++ b/src/views/basicData/GroupModule/components/staff-add.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-17 16:33:37
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 10:06:01
 * @Description:
 -->
 <template>
@@ -62,23 +62,8 @@
              </el-form-item>
            </el-col>
            <el-col :span="20">
-              <el-form-item :label="$t('module.basicData.staff.Profession')" prop="majorId">
-                <el-select
-                  v-model="staffData.majorId"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.staff.Profession')])"
-                  multiple
-                  filterable
-                  clearable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in majorArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                    :disabled="item.disabled"
-                  />
-                </el-select>
+              <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
+                <el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -122,11 +107,6 @@
                </el-radio-group>
              </el-form-item>
            </el-col>
-            <el-col :span="20">
-              <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
-                <el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
-              </el-form-item>
-            </el-col>
          </el-row>
        </el-col>
      </el-form>
@@ -140,7 +120,6 @@

 <script>
 import { staffDetail, staffUpdate, staffAdd, staffCode } from '@/api/basicData/GroupModule/staff'
-import { majorList } from '@/api/basicData/GroupModule/major'

 export default {
  props: {
@@ -152,7 +131,6 @@ export default {
  data() {
    return {
      visible: false,
-      majorArr: [],
      staffData: {
        name: undefined,
        sex: '',
@@ -211,13 +189,6 @@ export default {
      staffCode().then(res => {
        this.staffData.code = res.data
      })
-      majorList({
-        current: 1,
-        size: 999,
-        name: ''
-      }).then(response => {
-        this.majorArr = response.data.records
-      })
      this.staffData.id = id || ''
      this.visible = true
      this.$nextTick(() => {
--- a/src/views/basicData/Materials/material.vue
+++ b/src/views/basicData/Materials/material.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2021-03-11 16:48:22
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 18:33:17
 * @Description:
 -->
 <template>
@@ -180,6 +180,7 @@ 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
--- a/src/views/basicData/Process/components/processInfo-add.vue
+++ b/src/views/basicData/Process/components/processInfo-add.vue
@@ -0,0 +1,120 @@
+<!--
+ * @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>
--- a/src/views/basicData/Process/processInfo.vue
+++ b/src/views/basicData/Process/processInfo.vue
@@ -0,0 +1,212 @@
+<!--
+ * @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>
--- a/src/views/basicData/components/EquipmentScrapGrade-add.vue
+++ b/src/views/basicData/components/EquipmentScrapGrade-add.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2021-07-06 11:26:28
+ * @LastEditTime: 2022-03-03 16:49:10
 * @Description:
 -->
 <template>
@@ -83,7 +83,7 @@ export default {
      dataDictionaryDataList({
        current: 1,
        size: 999,
-        dictTypeId: '1412216979622785026'
+        dictTypeId: '2'
      }).then(response => {
        if (response.data.records) {
          this.scrapsArr = response.data.records
--- a/src/views/report-manage/CurrentEmptyBox.vue
+++ b/src/views/report-manage/CurrentEmptyBox.vue
@@ -0,0 +1,199 @@
+<!--
+ * @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>
--- a/src/views/report-manage/CurrentInventory.vue
+++ b/src/views/report-manage/CurrentInventory.vue
@@ -0,0 +1,232 @@
+<!--
+ * @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>
--- a/src/views/report-manage/CurrentSubstrate.vue
+++ b/src/views/report-manage/CurrentSubstrate.vue
@@ -0,0 +1,203 @@
+<!--
+ * @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>
--- a/src/views/report-manage/components/HeadForm.vue
+++ b/src/views/report-manage/components/HeadForm.vue
@@ -0,0 +1,67 @@
+<!--
+ * @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>
--- a/src/views/report-manage/components/edit-substrate.vue
+++ b/src/views/report-manage/components/edit-substrate.vue
@@ -0,0 +1,156 @@
+<!--
+ * @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>
--- a/src/views/report-manage/components/substrateBtn.vue
+++ b/src/views/report-manage/components/substrateBtn.vue
@@ -0,0 +1,35 @@
+<!--
+ * @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>
--- a/src/views/report-manage/components/viewSubstrate.vue
+++ b/src/views/report-manage/components/viewSubstrate.vue
@@ -0,0 +1,191 @@
+<!--
+ * @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>
--- a/vue.config.js
+++ b/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',
Author	SHA1	Message	Date
Fanzink	9f1a4226c3	''	2022-03-07 08:41:20 +08:00
Fanzink	90344983b3	Merge branch 'develop' into fzq	2022-03-06 19:36:56 +08:00
Fanzink	97997681a2	'工序库位+报表'	2022-03-06 19:36:26 +08:00
Fanzink	82f44b5a62	'基础+报表'	2022-03-05 19:43:42 +08:00
朱文强	28316462aa	Merge pull request 'fzq' (#32 ) from fzq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #32	2022-03-04 11:18:40 +08:00
Fanzink	b5081ba279	'不动vue.config.js'	2022-03-04 11:12:33 +08:00
Fanzink	913e03230e	''	2022-03-04 11:01:51 +08:00
Fanzink	81e92cdb3f	'不动vue.config.js'	2022-03-04 10:59:43 +08:00
Fanzink	aec5bcaf85	''	2022-03-04 10:58:39 +08:00
Fanzink	581ca3d60b	''	2022-03-04 10:48:30 +08:00
Fanzink	cb7718c340	''	2022-03-04 10:47:28 +08:00
朱文强	7501849be6	Merge pull request '更新' (#30 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #30	2022-03-04 10:45:43 +08:00
Fanzink	2a4fdeef04	'不动vue.config.js'	2022-03-04 10:45:12 +08:00
zwq	33a27dd810	更新	2022-03-04 10:44:28 +08:00
Fanzink	8801c44b98	Merge branch 'develop' into fzq	2022-03-03 20:49:39 +08:00
Fanzink	04cc50f504	'基础资料部分'	2022-03-03 20:48:59 +08:00
朱文强	878c9b22f7	Merge pull request 'eslint版本' (#28 ) from dy into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #28	2022-03-03 16:59:38 +08:00
Fanzink	ffdcbf6fa7	修改vue.config.js	2022-02-28 15:53:44 +08:00
Fanzink	f655b4d718	''	2022-02-28 15:48:39 +08:00
Fanzink	a0adee8ce5	''	2022-02-28 15:45:50 +08:00