29 changed files with 2183 additions and 1754 deletions
--- a/src/api/basicData/Warehouse/StorageBoxInfo.js
+++ b/src/api/basicData/Warehouse/StorageBoxInfo.js
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:00:14
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 16:23:43
+ * @LastEditTime: 2022-01-17 13:59:54
 * @Description:
 */
 import request from '@/utils/request'
@ -84,19 +84,3 @@ export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据
    data: { id }
  })
 }
-
-export function batchListAdd(data) { // 新增工序库位关联
-  return request({
-    url: '/api/wms/processlocation/batchList',
-    method: 'post',
-    data
-  })
-}
-
-export function locationByProcessList(data) { // 工序库位列表获取
-  return request({
-    url: '/api/wms/processlocation/locationByProcess',
-    method: 'post',
-    data
-  })
-}
--- 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-03-15 10:17:01
+ * @LastEditTime: 2022-03-11 08:28:27
 * @Description: file content
 */
 export default {
@ -54,8 +54,7 @@ export default {
    editLocation: 'Edit Location Point',
    location: 'Location',
    locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
-    locationInfo: 'Location Point Info',
-    storageCode: 'storageBoxCode'
+    locationInfo: 'Location Point Info'
  },
  factory: {
    placeholderName: 'Name Or Code',
@ -166,10 +165,7 @@ export default {
    addCacheArea: 'add Ports Shelf',
    warning: 'Layers and Columns must be integer!',
    logisticsEquipment: 'Logistics Equipment',
-    processEquipment: 'Process Equipment',
-    sheCode: 'Shelf Code',
-    sheName: 'Shelf Name',
-    locaNum: 'Location Number'
+    processEquipment: 'Process Equipment'
  },
  storageBox: {
    name: 'Name',
@ -181,10 +177,7 @@ export default {
    remark: 'Remark',
    PositionNo: 'PositionNo',
    PositionCode: 'PositionCode',
-    PositionCodeAlias: 'PositionCodeAlias',
-    scrapped: 'Scrapped',
-    normal: 'Normal',
-    repairing: 'Repairing'
+    PositionCodeAlias: 'PositionCodeAlias'
  },
  equipment: {
    EquipmentName: 'Equipment Name',
@ -262,7 +255,7 @@ export default {
    entryType: 'Manual/Automatic',
    automatic: 'automatic',
    manual: 'Manual',
-    workOrderName: 'Work Order Name'
+    workOrderId: 'workOrderId'
  },
  productPool: {
    productName: 'Product Name',
@ -350,10 +343,6 @@ export default {
    PerformTaskManual: 'Perform Task Manual',
    processStorageLink: 'Process Storage Link',
    SelectStorageType: 'Select Storage Type',
-    LocationStorageSetting: 'Location Storage Setting',
-    publishTask: 'Publish The Task',
-    startPosition: 'Start',
-    endPosition: 'End',
-    taskType: 'Task Type'
+    LocationStorageSetting: 'Location Storage Setting'
  }
 }
--- a/src/lang/i18n/en/module/dashboard.js
+++ b/src/lang/i18n/en/module/dashboard.js
@ -1,16 +0,0 @@
-/*
- * @Author: gtz
- * @Date: 2022-03-15 16:42:34
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:58:26
- * @Description: file content
- * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
- */
-
-export default {
-  first: 'First Row',
-  second: 'Second Row',
-  title: 'WMS Inventory Information',
-  pageHeader: 'No.',
-  pageFooter: ' Page'
-}
--- a/src/lang/i18n/en/module/index.js
+++ b/src/lang/i18n/en/module/index.js
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:12:46
 * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:44:11
+ * @LastEditTime: 2021-04-22 19:49:39
 * @Description: file content
 */

@ -17,7 +17,6 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
-import dashboard from './dashboard'

 export default {
  basicData,
@ -30,6 +29,5 @@ export default {
  quality,
  factory,
  formManage,
-  report,
-  dashboard
+  report
 }
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:16:52
+ * @LastEditTime: 2022-03-11 08:28:40
 */
 export default {
  visual: {
@ -53,8 +53,7 @@ export default {
    editLocation: '编辑库位点',
    location: '库位',
    locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
-    locationInfo: '库位点信息',
-    storageCode: '存储箱号'
+    locationInfo: '库位点信息'
  },
  factory: {
    placeholderName: '名称或编码',
@ -156,10 +155,7 @@ export default {
    status: '状态',
    warning: '行列标必须为整数！',
    logisticsEquipment: '物流设备',
-    processEquipment: '工艺设备',
-    sheCode: '货架编码',
-    sheName: '货架名',
-    locaNum: '库存数量'
+    processEquipment: '工艺设备'
  },
  storageBox: {
    name: '存储箱名称',
@ -171,11 +167,7 @@ export default {
    remark: '备注',
    PositionNo: '位置序号',
    PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名',
-    scrapped: '报废',
-    normal: '正常',
-    repairing: '维修中'
-
+    PositionCodeAlias: '位置编码别名'
  },
  equipment: {
    shortName: '名称缩写',
@ -255,7 +247,7 @@ export default {
    entryType: '手动/自动',
    automatic: '自动',
    manual: '手动',
-    workOrderName: '工单名称'
+    workOrderId: '工单名称'
  },
  processLocation: {
    sequence: '顺序',
@ -357,10 +349,6 @@ export default {
    PerformTaskManual: '手动执行任务',
    processStorageLink: '工序关联库位',
    SelectStorageType: '选择库位类型',
-    LocationStorageSetting: '库位存储箱设置',
-    publishTask: '发布任务',
-    startPosition: '起点',
-    endPosition: '终点',
-    taskType: '任务类型'
+    LocationStorageSetting: '库位存储箱设置'
  }
 }
--- a/src/lang/i18n/zh/module/dashboard.js
+++ b/src/lang/i18n/zh/module/dashboard.js
@ -1,16 +0,0 @@
-/*
- * @Author: gtz
- * @Date: 2022-03-15 16:42:34
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:58:30
- * @Description: file content
- * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
- */
-
-export default {
-  first: '第一排',
-  second: '第二排',
-  title: 'WMS库存信息',
-  pageHeader: '第',
-  pageFooter: '页'
-}
--- a/src/lang/i18n/zh/module/index.js
+++ b/src/lang/i18n/zh/module/index.js
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:12:46
 * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:44:05
+ * @LastEditTime: 2021-04-22 19:49:47
 * @Description: file content
 */

@ -17,7 +17,6 @@ import quality from './quality'
 import factory from './factory'
 import formManage from './formManage'
 import report from './report'
-import dashboard from './dashboard'

 export default {
  basicData,
@ -30,6 +29,5 @@ export default {
  quality,
  factory,
  formManage,
-  report,
-  dashboard
+  report
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@ -218,9 +218,9 @@ export const constantRoutes = [
        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
      {
-        path: '/DataDictionary',
+        path: '/dataDictionary',
        component: () => import('@/views/basicData/index'),
-        name: 'DataDictionary',
+        name: 'dataDictionary',
        meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
        children: [{
          path: 'dataDictionary',
@ -260,7 +260,7 @@ export const constantRoutes = [
      {
        path: 'processList',
        component: () => import('@/views/art/processList'),
-        name: 'processList',
+        name: 'Process',
        meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true }
      }
    ]
@ -268,7 +268,7 @@ export const constantRoutes = [
  {
    path: '/Warehouse',
    component: Layout,
-    redirect: '/Warehouse/StorageBoxInfo',
+    redirect: '/Warehouse/workOrderManage',
    name: 'Warehouse',
    meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true },
    children: [
@ -281,7 +281,6 @@ export const constantRoutes = [
      },
      {
        path: '/StorageBoxRack',
-        hidden: true,
        component: () =>
          import('@/views/basicData/Warehouse/StorageBoxRack'),
        name: 'StorageBoxRack',
@ -497,7 +496,7 @@ export const constantRoutes = [
    path: '/basic',
    component: Layout,
    redirect: '/user/manager',
-    name: 'basic',
+    name: 'ArticleManager',
    meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
    children: [
      {
--- a/src/views/QualityManager/scrap/ScrapInfo-add.vue
+++ b/src/views/QualityManager/scrap/ScrapInfo-add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 10:55:27
+ * @LastEditTime: 2022-03-11 09:48:52
 * @Description:
 -->
 <template>
@ -66,10 +66,10 @@
          </el-select>
        </el-form-item>

-        <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
+        <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderId')" prop="workOrderId">
          <el-select
            v-model="dataForm.workOrderId"
-            :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])"
+            :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderId')])"
            clearable
            :style="{width: '100%'}"
          >
--- a/src/views/QualityManager/scrap/index.vue
+++ b/src/views/QualityManager/scrap/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 11:24:48
+ * @LastEditTime: 2022-03-04 10:40:51
 * @Description:
 -->
 <template>
@ -11,10 +11,10 @@
      :model="formData"
      :inline="true"
      size="medium"
-      label-width="80px"
+      label-width="100px"
    >
-      <el-form-item :label="$t('module.basicData.ScrapInfo.PlateId')" prop="substrateId">
-        <el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
+      <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 />
      </el-form-item>
      <el-form-item :label="$t('module.basicData.ScrapInfo.TimePeriod')" prop="time">
        <el-date-picker
@ -38,16 +38,6 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
-        <el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
-          <el-option
-            v-for="(item, index) in orderList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
        <el-button type="primary" @click="addNew()"> {{ 'btn.add' | i18nFilter }} </el-button>
@ -89,7 +79,6 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 import { getEqList } from '@/api/equipment/maintain'
-import { ExecutionInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
 * 表格表头配置项 TypeScript接口注释
@ -124,13 +113,8 @@ const tableProps = [
  //   filter: timeFormatter
  // },
  {
-    prop: 'substrateId',
-    label: i18n.t('module.basicData.ScrapInfo.PlateId'),
-    align: 'center'
-  },
-  {
-    prop: 'workOrderName',
-    label: i18n.t('module.basicData.ScrapInfo.workOrderName'),
+    prop: 'source',
+    label: i18n.t('module.basicData.ScrapInfo.source'),
    align: 'center'
  },
  {
@ -138,6 +122,11 @@ const tableProps = [
    label: i18n.t('module.basicData.ScrapInfo.name'),
    align: 'center'
  },
+  {
+    prop: 'substrateId',
+    label: i18n.t('module.basicData.ScrapInfo.PlateId'),
+    align: 'center'
+  },
  {
    prop: 'registerPersonName',
    label: i18n.t('module.basicData.ScrapInfo.RegisterPerson'),
@ -149,11 +138,6 @@ const tableProps = [
    filter: timeFormatter,
    align: 'center'
  },
-  {
-    prop: 'placeOfRegis',
-    label: i18n.t('module.basicData.ScrapInfo.registrationPlace'),
-    align: 'center'
-  },
  {
    prop: 'scrapReason',
    label: i18n.t('module.basicData.ScrapInfo.cause'),
@ -182,9 +166,7 @@ export default {
      listLoading: true,
      formData: {
        timeSlot: null,
-        substrateId: '',
-        orderId: '',
-        equipmentId: '',
+        basalId: '',
        current: 1,
        size: 10,
        id: ''
@ -196,7 +178,6 @@ export default {
      dict: {
        scrap: []
      },
-      orderList: [],
      device: []
    }
  },
@ -255,13 +236,6 @@ export default {
      if (result1.code === 0) {
        this.device = result1.data.records
      }
-      const result2 = await ExecutionInfoList({
-        current: 1,
-        size: 999
-      })
-      if (result2.code === 0) {
-        this.orderList = result2.data.records
-      }
      const result = await scrapReasonList()
      this.dict.scrap = result
    },
--- a/src/views/basicData/Cache/components/location-add.vue
+++ b/src/views/basicData/Cache/components/location-add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 09:45:30
+ * @LastEditTime: 2022-03-10 21:00:58
 * @Description:
 -->
 <template>
@ -17,7 +17,7 @@
      @getDataList="getList"
      @add="addNew"
    />
-    <div style="title">{{ sheCode }}:{{ shCode }}    {{ sheName }}：{{ shName }}    {{ locaNum }}：{{ num }}
+    <div style="title">货架编码:{{ shCode }}    货架名称：{{ shName }}    库存量：{{ num }}
      <el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
    </div>
    <base-table
@ -102,11 +102,11 @@ const tableProps = [
    label: i18n.t('module.basicData.cache.columnMark'),
    align: 'center'
  },
-  // {
-  //   prop: 'locationType',
-  //   label: i18n.t('module.basicData.cache.locationType'),
-  //   align: 'center'
-  // },
+  {
+    prop: 'locationType',
+    label: i18n.t('module.basicData.cache.locationType'),
+    align: 'center'
+  },
  {
    prop: 'statusName',
    label: i18n.t('module.basicData.cache.status'),
@ -147,17 +147,14 @@ export default {
        size: 990,
        shelfId: '',
        id: ''
-      },
-      sheCode: this.$t('module.basicData.cache.sheCode'),
-      sheName: this.$t('module.basicData.cache.sheName'),
-      locaNum: this.$t('module.basicData.cache.locaNum')
+      }
    }
  },
  created() {
    this.listQuery.shelfId = this.$route.query.id
    this.shCode = this.$route.query.code
    this.shName = this.$route.query.shelfName
-    this.num = this.$route.query.total
+    this.num = this.$route.query.columnNum
    this.getList()
  },
  methods: {
--- a/src/views/basicData/Cache/components/locationAttr-add.vue
+++ b/src/views/basicData/Cache/components/locationAttr-add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 09:54:52
+ * @LastEditTime: 2022-03-10 21:14:13
 * @Description:
 -->
 <template>
@ -20,18 +20,15 @@
      <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.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.cache.rowMark')" prop="layers">
-        <el-input-number v-model="dataForm.layers" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
+        <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.cache.columnMark')" prop="columns">
-        <el-input-number v-model="dataForm.columns" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
+        <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-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>
      <!-- <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> -->
@ -74,6 +71,8 @@ export default {
        code: '',
        locationNameAlias: '',
        rowNum: '',
+        columns: 0,
+        layers: 0,
        status: null,
        locationType: ''
      },
@ -97,13 +96,17 @@ export default {
        ],
        code: [
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
-        ],
-        layers: [
-          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
-        ],
-        columns: [
-          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
        ]
+        // layers: [{
+        // type: 'number',
+        // message: this.$t('module.basicData.cache.warning'),
+        // trigger: "blur"
+        // }],
+        // columns:  [{
+        // type: 'number',
+        // message: this.$t('module.basicData.cache.warning'),
+        // trigger: "blur"
+        // }]
      }
    }
  },
@ -116,7 +119,7 @@ export default {
        if (this.dataForm.id) {
          locationDetail(this.dataForm.id).then(res => {
            this.dataForm = res.data
-            // console.log(this.dataForm)
+            console.log(this.dataForm)
          })
        } else {
          locationCode().then(res => {
@ -170,28 +173,6 @@ export default {
        }
      })
    }
-    // isInt(value){
-    //   for(var i = 0; i < value.length; i++) {
-    //     if(charAt[i] == '.'){
-    //     }
-    //   }
-    // }
-    // isInt(value) {
-    //   let zero = /^0+\d*$/ // 过滤以0开头的数据(不含小数点)
-    //   let dublue = /^0{2,}\.\d+$/ // 过滤小数点前有两个以上0的数字
-    //   let point = /^\d+\.?\d+$/ //  以数字开头,可以允许出现一次或0次小数点,以数字结尾(这里的数字必须有两个)
-    //   let reg = /^[1-9]{1}$/ // 匹配只有一个数字的情况
-    //   if (!value) {
-    //     return false
-    //   }
-    //   if (zero.test(value) || dublue.test(value)) { // 首先过滤掉错误的数据
-    //     return false
-    //   } else if (point.test(value) || reg.test(value)) { // 匹配数据,如果输入的数字只有一位数时用reg匹配
-    //     return true
-    //   } else {
-    //     return false
-    //   }
-    // }
  }
 }
 </script>
--- a/src/views/basicData/Cache/components/locationBtn.vue
+++ b/src/views/basicData/Cache/components/locationBtn.vue
@ -1,7 +1,7 @@
 <!--
 * @Date: 2021-01-07 20:09:37
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 09:48:09
+ * @LastEditTime: 2022-03-10 20:20:44
 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
 * @Description:
 -->
@ -26,7 +26,7 @@ export default {
        query: {
          id: this.injectData.id,
          code: this.injectData.code,
-          total: this.injectData.total,
+          columnNum: this.injectData.columnNum,
          shelfName: this.injectData.shelfName
        }
      })
--- a/src/views/basicData/Cache/components/storageBox-add.vue
+++ b/src/views/basicData/Cache/components/storageBox-add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:23:19
+ * @LastEditTime: 2022-03-09 16:53:31
 * @Description:
 -->
 <template>
@ -59,15 +59,15 @@ export default {
      options: [
        {
          value: 0,
-          label: this.$t('module.basicData.storageBox.normal')
+          label: '正常'
        },
        {
          value: 1,
-          label: this.$t('module.basicData.storageBox.repairing')
+          label: '维修中'
        },
        {
          value: 2,
-          label: this.$t('module.basicData.storageBox.scrapped')
+          label: '报废'
        }
      ],
      dataRule: {
--- a/src/views/basicData/Equipment/components/equipmentInfo-add.vue
+++ b/src/views/basicData/Equipment/components/equipmentInfo-add.vue
@ -58,7 +58,7 @@
              <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-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="EquipmentType">
-              <el-select v-model="dataForm.equipmentType" :placeholder="this.$t('module.basicData.cache.logisticsEquipment')" default>
+              <el-select v-model="dataForm.equipmentType" :placeholder="dataForm.equipmentType">
                <el-option
                  v-for="item in options"
                  :key="item.value"
@ -399,7 +399,7 @@ export default {
        code: '',
        enName: '',
        abbr: '',
-        equipmentType: this.$t('module.basicData.cache.logisticsEquipment'),
+        equipmentType: '',
        spec: '',
        createTime: '',
        enterTime: '',
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/src/views/basicData/Warehouse/CurrentTask.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:35:17
+ * @LastEditTime: 2022-03-04 10:56:41
 * @Description:
 -->
 <template>
@ -47,7 +47,6 @@
      <el-form-item>
        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
        <el-button type="primary" @click="manualTask()"> {{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
-        <el-button type="primary" @click="publishTask()"> {{ $t('module.basicData.Warehouse.publishTask') | i18nFilter }} </el-button>
      </el-form-item>
    </el-form>
    <base-table
@ -73,7 +72,6 @@
    />
    <current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
    <current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
-    <publish-task v-if="publishTaskVisible" ref="publishTask" />
  </div>
 </template>

@ -81,12 +79,11 @@
 import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
 import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
 import CurrentTaskAdd from './components/CurrentTask-add.vue'
-import PublishTask from './components/PublishTask.vue'
 import i18n from '@/lang'
 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'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@ -118,7 +115,6 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
-    filter: timeFormatter,
    align: 'center'
  },
  {
@ -175,13 +171,12 @@ const tableProps = [

 export default {
  name: 'ScrapInfo',
-  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd, PublishTask },
+  components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
  data() {
    return {
      trueWidth: 100,
      addOrUpdateVisible: false,
      manualTaskVisible: false,
-      publishTaskVisible: false,
      tableProps,
      tableBtn,
      list: [],
@ -253,13 +248,6 @@ export default {
      this.$nextTick(() => {
        this.$refs.manualTaskRef.init()
      })
-    },
-    // 发布任务
-    publishTask() {
-      this.publishTaskVisible = true
-      this.$nextTick(() => {
-        this.$refs.publishTask.init()
-      })
    }
  }
 }
--- a/src/views/basicData/Warehouse/HistoricalTask.vue
+++ b/src/views/basicData/Warehouse/HistoricalTask.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:37:13
+ * @LastEditTime: 2022-01-13 15:49:01
 * @Description:
 -->
 <template>
@ -44,7 +44,7 @@
          />
        </el-select>
      </el-form-item>
-      <!-- <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
+      <el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
        <el-date-picker
          v-model="formData.timeSlot"
          type="daterange"
@ -55,7 +55,7 @@
          :range-separator="$t('module.orderManage.order.To')"
          clearable
        />
-      </el-form-item> -->
+      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
      </el-form-item>
@ -92,7 +92,7 @@ import i18n from '@/lang'
 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'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@ -124,27 +124,31 @@ const tableProps = [
  {
    prop: 'createTime',
    label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
-    filter: timeFormatter,
    align: 'center'
  },
  {
-    prop: 'taskSource',
-    label: i18n.t('module.basicData.Warehouse.TaskSource'),
+    prop: 'status',
+    label: i18n.t('module.basicData.Warehouse.TaskStatus'),
    align: 'center'
  },
+  // {
+  //   prop: 'taskType',
+  //   label: i18n.t('module.basicData.Warehouse.TaskType'),
+  //   align: 'center'
+  // },
  {
-    prop: 'taskType',
-    label: i18n.t('module.basicData.Warehouse.TaskType'),
+    prop: 'name',
+    label: i18n.t('module.basicData.Warehouse.VehicleName'),
    align: 'center'
  },
+  // {
+  //   prop: 'substrateNo',
+  //   label: i18n.t('module.basicData.Warehouse.BoxStatus'),
+  //   align: 'center'
+  // },
  {
-    prop: 'fullCode',
-    label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
-    align: 'center'
-  },
-  {
-    prop: 'emptyCode',
-    label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
+    prop: 'wcode',
+    label: i18n.t('module.basicData.Warehouse.BoxNumber'),
    align: 'center'
  },
  {
@ -158,23 +162,18 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'anotherCurrLocation',
-    label: i18n.t('module.basicData.Warehouse.StartLocation'),
-    align: 'center'
-  },
-  {
-    prop: 'anotherTargetLocation',
-    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
+    prop: 'updateTime',
+    label: i18n.t('module.basicData.Warehouse.CompletionTime'),
    align: 'center'
  },
  {
    prop: 'currLocation',
-    label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'),
+    label: i18n.t('module.basicData.Warehouse.StartLocation'),
    align: 'center'
  },
  {
-    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.VehicleName'),
+    prop: 'targetLocation',
+    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
    align: 'center'
  }
 ]
@ -195,9 +194,9 @@ export default {
        taskType: '',
        status: '',
        equipmentId: '',
-        // timeSlot: [],
-        // endTime: '',
-        // startTime: '',
+        timeSlot: [],
+        endTime: '',
+        startTime: '',
        current: 1,
        size: 10
      },
@ -232,13 +231,13 @@ export default {
  },
  methods: {
    getList() {
-      // if (this.formData.timeSlot) {
-      //   this.formData.startTime = this.formData.timeSlot[0]
-      //   this.formData.endTime = this.formData.timeSlot[1]
-      // } else {
-      //   this.formData.startTime = ''
-      //   this.formData.endTime = ''
-      // }
+      if (this.formData.timeSlot) {
+        this.formData.startTime = this.formData.timeSlot[0]
+        this.formData.endTime = this.formData.timeSlot[1]
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+      }
      this.listLoading = true
      HistoricalTaskList(this.formData).then(response => {
        if (response.data.records) {
--- a/src/views/basicData/Warehouse/ProcessStorageManagement.vue
+++ b/src/views/basicData/Warehouse/ProcessStorageManagement.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:35:21
+ * @LastEditTime: 2022-03-04 15:45:23
 * @Description:
 -->
 <template>
@ -15,9 +15,9 @@
      size="medium"
      label-width="100px"
    >
-      <el-form-item :label="$t('module.art.processList.processName')" prop="key">
+      <el-form-item :label="$t('module.art.processList.processName')" prop="processId">
        <el-select
-          v-model="listQuery.key"
+          v-model="listQuery.processId"
          :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
          clearable
          filterable
@ -27,7 +27,7 @@
            v-for="(item, index) in processArr"
            :key="index"
            :label="item.name"
-            :value="item.name"
+            :value="item.id"
          />
        </el-select>
      </el-form-item>
@ -64,8 +64,8 @@ import { list } from '@/api/art-manage/process'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-import i18n from '@/lang'
 import { timeFormatter } from '@/filters'
+import i18n from '@/lang'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@ -133,7 +133,7 @@ export default {
      listQuery: {
        current: 1,
        size: 10,
-        key: ''
+        processId: ''
      }
    }
  },
@ -160,23 +160,29 @@ export default {
      })
    },
    getList() {
-      this.listLoading = true
-      list(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
+      // this.listLoading = true
+      // ExecutionInfoList(this.listQuery).then(response => {
+      //   if (response.data.records) {
+      //     this.list = response.data.records
+      //   } else {
+      //     this.list.splice(0, this.list.length)
+      //   }
+      //   this.total = response.data.total
+      this.list = [
+        {
+          code: 11,
+          name: '11'
        }
-        this.total = response.data.total
-        this.listLoading = false
-      })
+      ]
+      this.listLoading = false
+      // })
    },
    // 新增 / 修改
    addNew(id) {
      this.$router.push({
        name: 'ProcessStorageManagementInfo',
        query: {
-          id
+          dictTypeId: id
        }
      })
    }
--- a/src/views/basicData/Warehouse/StorageBoxInfo.vue
+++ b/src/views/basicData/Warehouse/StorageBoxInfo.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 09:33:28
+ * @LastEditTime: 2022-01-18 14:30:25
 * @Description:
 -->
 <template>
@ -92,7 +92,7 @@ const tableProps = [
 ]

 export default {
-  name: 'ScrapInfo',
+  name: 'StorageBoxInfo',
  components: { Pagination, BaseTable },
  filters: {
    statusFilter(status) {
@ -123,18 +123,15 @@ export default {
  },
  created() {
    this.getList()
-    this.init()
+    const listQuery1 = {
+      current: 1,
+      size: 100
+    }
+    StorageBoxRackCode(listQuery1).then(res => {
+      this.storageBoxList = res.data.records
+    })
  },
  methods: {
-    init() {
-      const listQuery1 = {
-        current: 1,
-        size: 100
-      }
-      StorageBoxRackCode(listQuery1).then(res => {
-        this.storageBoxList = res.data.records
-      })
-    },
    getList() {
      this.listLoading = true
      StorageBoxInfoList(this.listQuery).then(response => {
--- a/src/views/basicData/Warehouse/components/CurrentTask-add.vue
+++ b/src/views/basicData/Warehouse/components/CurrentTask-add.vue
@ -2,12 +2,12 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:55:22
+ * @LastEditTime: 2022-03-04 11:05:23
 * @Description:
 -->
 <template>
  <el-dialog
-    :title="$t('module.basicData.Warehouse.PerformTaskManual')"
+    :title="'btn.see' | i18nFilter"
    :visible.sync="visible"
  >
    <el-row :gutter="10">
@ -22,66 +22,27 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
-                <el-select
-                  v-model="dataForm.taskCode"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.StorageBoxNumber')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in storageBoxList"
-                    :key="index"
-                    :label="item.code"
-                    :value="item.code"
-                  />
-                </el-select>
+                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
-                <el-input v-model="dataForm.orderName" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
-                <el-select
-                  v-model="dataForm.fullCode"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in processArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
-                <el-select
-                  v-model="dataForm.TaskStatus"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskStatus')])"
-                  clearable
-                  filterable
-                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in TaskStatusArr"
-                    :key="index"
-                    :label="item.dataName"
-                    :value="item.dataCode"
-                  />
-                </el-select>
+              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
+                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
-                <el-input v-model="dataForm.remark" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
          </el-row>
@ -90,35 +51,26 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
-                <el-input v-model="dataForm.createTime" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
-                <el-input v-model="dataForm.taskType" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
-                <el-input v-model="dataForm.emptyCode" :style="{width: '100%'}" />
+                <el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
              </el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
-                <el-select
+                <el-input
                  v-model="dataForm.anotherCurrLocation"
-                  :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.NextOperation')])"
-                  clearable
-                  filterable
+                  readonly
                  :style="{width: '100%'}"
-                >
-                  <el-option
-                    v-for="(item, index) in processArr"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                />
              </el-form-item>
            </el-col>
          </el-row>
@ -134,23 +86,17 @@

 <script>
 // import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
-import { list } from '@/api/art-manage/process'
-import { dataDictionaryDataList } from '@/api/basicData/dataDictionary'
-import { StorageBoxRackCode } from '@/api/basicData/Warehouse/StorageBoxInfo'

 export default {
  data() {
    return {
      visible: false,
-      processArr: [],
-      TaskStatusArr: [],
-      storageBoxList: [],
      dataForm: {
        id: '',
        taskCode: undefined,
        orderName: undefined,
        fullCode: undefined,
-        TaskStatus: undefined,
+        name: undefined,
        remark: undefined,
        field119: undefined,
        createTime: undefined,
@ -170,32 +116,6 @@ export default {
    init(id) {
      this.dataForm.id = id
      this.visible = true
-      const lparams = {
-        current: 1,
-        size: 999
-      }
-      list(lparams).then(response => {
-        if (response.data.records) {
-          this.processArr = response.data.records
-        } else {
-          this.processArr.splice(0, this.list.length)
-        }
-        this.total = response.data.total
-      })
-      StorageBoxRackCode(lparams).then(res => {
-        this.storageBoxList = res.data.records
-      })
-      dataDictionaryDataList({
-        current: 1,
-        size: 999,
-        dictTypeId: '6'
-      }).then(response => {
-        if (response.data.records) {
-          this.TaskStatusArr = response.data.records
-        } else {
-          this.TaskStatusArr.splice(0, this.scrapsArr.length)
-        }
-      })
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
      })
--- a/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
+++ b/src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 14:15:30
+ * @LastEditTime: 2022-03-09 09:57:41
 * @Description:
 -->
 <template>
@ -18,21 +18,21 @@
      :table-data="list"
      :is-loading="listLoading"
    >
-      <!-- <method-btn
+      <method-btn
        slot="handleBtn"
        :width="trueWidth"
        :method-list="tableBtn"
        @clickBtn="handleClick"
-      /> -->
+      />
    </base-table>
  </div>
 </template>

 <script>
-import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import i18n from '@/lang'
 import BaseTable from '@/components/BaseTable'
-// import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
 /**
 * 表格表头配置项 TypeScript接口注释
 * tableConfig<ConfigItem> = []
@ -49,16 +49,17 @@ import BaseTable from '@/components/BaseTable'
 *
 */

-// const tableBtn = [
-//   {
-//     type: 'delete',
-//     btnName: 'btn.delete'
-//   }
-// ]
+const tableBtn = [
+  {
+    type: 'delete',
+    btnName: 'btn.delete'
+  }
+]
 const tableProps = [
  {
    prop: 'code',
    label: i18n.t('module.basicData.cache.LocationCode'),
+    filter: timeFormatter,
    align: 'center'
  },
  {
@ -75,7 +76,7 @@ const tableProps = [

 export default {
  name: 'Shelf',
-  components: { BaseTable },
+  components: { BaseTable, MethodBtn },
  filters: {
    statusFilter(status) {
      const statusMap = {
@ -88,7 +89,7 @@ export default {
  },
  data() {
    return {
-      // tableBtn,
+      tableBtn,
      trueWidth: 200,
      tableProps,
      list: [],
@ -96,12 +97,12 @@ export default {
      listQuery: {
        current: 1,
        size: 990,
-        workSequenId: ''
+        areaId: ''
      }
    }
  },
  created() {
-    this.listQuery.workSequenId = this.$route.query.id
+    this.listQuery.areaId = this.$route.query.id
    this.getList()
  },
  methods: {
@ -125,23 +126,23 @@ export default {
        }).catch(() => {})
      }
    },
-    getList() {
+    getList(key) {
      this.listLoading = true
-      locationByProcessList(this.listQuery).then(response => {
-        if (response.data.records) {
-          this.list = response.data.records
-        } else {
-          this.list.splice(0, this.list.length)
-        }
-        this.listLoading = false
-      })
+      // shelfList(this.listQuery).then(response => {
+      //   if (response.data.records) {
+      //     this.list = response.data.records
+      //   } else {
+      //     this.list.splice(0, this.list.length)
+      //   }
+      this.listLoading = false
+      // })
    },
    // 新增 / 修改
-    addNew() {
+    addNew(id) {
      this.$router.push({
        name: 'ProcessStorageLink',
        query: {
-          id: this.listQuery.workSequenId
+          dictTypeId: id
        }
      })
    },
--- a/src/views/basicData/Warehouse/components/PublishTask.vue
+++ b/src/views/basicData/Warehouse/components/PublishTask.vue
@ -1,75 +0,0 @@
-<!--
- * @Author: gtz
- * @Date: 2022-03-12 14:17:55
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:23:43
- * @Description: file content
- * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\PublishTask.vue
-->
-<template>
-  <el-dialog
-    :title="'btn.see' | i18nFilter"
-    :visible.sync="visible"
-  >
-    <el-row :gutter="10">
-      <el-form
-        ref="dataForm"
-        :model="dataForm"
-        :rules="dataRule"
-        size="medium"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-form-item :label="$t('module.basicData.Warehouse.startPosition')" prop="startPosition">
-          <el-input v-model="dataForm.startPosition" readonly :style="{width: '100%'}" />
-        </el-form-item>
-        <el-form-item :label="$t('module.basicData.Warehouse.endPosition')" prop="endPosition">
-          <el-input v-model="dataForm.endPosition" readonly :style="{width: '100%'}" />
-        </el-form-item>
-        <el-form-item :label="$t('module.basicData.Warehouse.taskType')" prop="taskType">
-          <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
-      <el-button type="primary" @click="visible = false">{{ 'btn.submit' | i18nFilter }} </el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
-
-export default {
-  data() {
-    return {
-      visible: false,
-      dataForm: {
-        startPosition: null,
-        endPosition: null,
-        taskType: null
-      },
-      dataRule: {
-        startPosition: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.startPosition')]), trigger: 'blur' }
-        ],
-        endPosition: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.endPosition')]), trigger: 'blur' }
-        ],
-        taskType: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.Warehouse.taskType')]), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init() {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
-    }
-  }
-}
-</script>
--- a/src/views/basicData/Warehouse/components/processStorageLink.vue
+++ b/src/views/basicData/Warehouse/components/processStorageLink.vue
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 14:27:57
+ * @LastEditTime: 2022-03-09 15:17:46
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@ -38,8 +38,6 @@
          <el-button type="primary" size="mini" @click="submitLinkList">{{
            "btn.submit" | i18nFilter
          }}</el-button>
-          <el-button type="warning" size="mini" @click="init()">{{ 'btn.reset' | i18nFilter }}</el-button>
-          <el-button type="success" size="mini" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
        </div>
        <div class="dashboard-legend-search">
          <el-select
@ -106,7 +104,7 @@
                          ? '#A2A8B5'
                          : '',
                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
                          ? '1px solid red' : ''
                    }"
                    @click="
@ -117,14 +115,32 @@
                      )
                    "
                  >
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div
+                      v-if="
+                        z.portList[
+                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                        ].attribute !== 3
+                      "
+                      class="dashboard-layout-item-cricle"
+                      :style="{
+                        background:
+                          cassetteStatusObj[
+                            z.portList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].cassetteList[0].status
+                          ]
+                      }"
+                    />
+                    {{
+                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
+                        .name
+                    }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
+                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
                }}
              </div>
            </el-col>
@ -187,7 +203,7 @@
                          ? '#A2A8B5'
                          : '',
                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
                          ? '1px solid red' : ''
                    }"
                    @click="
@ -198,8 +214,26 @@
                      )
                    "
                  >
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div
+                      v-if="
+                        z.portList[
+                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                        ].attribute !== 3
+                      "
+                      class="dashboard-layout-item-cricle"
+                      :style="{
+                        background:
+                          cassetteStatusObj[
+                            z.portList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].cassetteList[0].status
+                          ]
+                      }"
+                    />
+                    {{
+                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
+                        .name
+                    }}
                  </div>
                </el-col>
              </el-row>
@ -236,7 +270,7 @@
                          ? '#A2A8B5'
                          : '',
                      border:
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        selectStorageList.some(StorageItem=>StorageItem.id===z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
                          ? '1px solid red' : ''
                    }"
                    @click="
@ -247,14 +281,32 @@
                      )
                    "
                  >
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div
+                      v-if="
+                        z.portList[
+                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                        ].attribute !== 3
+                      "
+                      class="dashboard-layout-item-cricle"
+                      :style="{
+                        background:
+                          cassetteStatusObj[
+                            z.portList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].cassetteList[0].status
+                          ]
+                      }"
+                    />
+                    {{
+                      z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)]
+                        .name
+                    }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
                {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
+                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
                }}
              </div>
            </el-col>
@ -271,18 +323,17 @@
 </template>

 <script>
-import { batchListAdd } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import testdata from './testdata'
 import processStorageType from './processStorageType'

 export default {
-  name: 'ProcessStorageLink1',
+  name: 'Dashboard',
  components: { processStorageType },
  data() {
    return testdata
  },
  created() {
-    this.id = this.$route.query.id
+    console.log(this.shelfList)
    this.totalPage = Math.ceil(
      this.shelfList[0].rowList[0].portList.length / 80
    )
@ -294,18 +345,18 @@ export default {
    },
    setType(item) {
      if (item.attribute !== 3) {
-        if (this.selectStorageList.findIndex(StorageItem => StorageItem.locationId === item.id) + 1) {
-          this.selectStorageList.splice(this.selectStorageList.findIndex(StorageItem => StorageItem.locationId === item.id), 1)
+        if (this.selectStorageList.findIndex(StorageItem => StorageItem.id === item.id) + 1) {
+          this.selectStorageList.splice(this.selectStorageList.findIndex(StorageItem => StorageItem.id === item.id), 1)
        } else {
          this.typeVisible = true
          this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id, item.name)
+            this.$refs.typeRef.init(item.id)
          })
        }
      }
    },
-    setStorageList(locationId, locationName, dataForm) {
-      const obj = Object.assign({ locationId, locationName }, dataForm)
+    setStorageList(id, dataForm) {
+      const obj = Object.assign({ id }, dataForm)
      this.selectStorageList.push(obj)
    },
    handleChange(v) {
@ -313,32 +364,14 @@ export default {
    },
    submitLinkList() {
      const tipArr = this.selectStorageList.map(item => {
-        return item.locationName
+        return item.id
      })
-      const obj = {
-        workSequenId: this.id,
-        processLocationStorageList: this.selectStorageList
-      }
      this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
        confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
        cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
        type: 'warning'
      }).then(() => {
-        batchListAdd(obj).then(res => {
-          this.$message({
-            message: this.$t('module.basicData.visual.success'),
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-              this.selectStorageList.splice(0, this.selectStorageList.length)
-            }
-          })
-        })
      }).catch(() => {})
-    },
-    goback() {
-      this.selectStorageList.splice(0, this.selectStorageList.length)
-      this.$router.go(-1)
    }
  }
 }
--- a/src/views/basicData/Warehouse/components/processStorageType.vue
+++ b/src/views/basicData/Warehouse/components/processStorageType.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 11:02:46
+ * @LastEditTime: 2022-03-10 14:27:47
 * @Description:
 -->
 <template>
@ -18,13 +18,13 @@
      label-width="110px"
      label-position="left"
    >
-      <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">
-        <el-radio v-model="dataForm.portAttrId" :label="1">Working Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="2">Buffer Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="3">Exception Port</el-radio>
+      <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="storageType">
+        <el-radio v-model="dataForm.storageType" :label="1">Working Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="2">Buffer Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="3">Exception Port</el-radio>
      </el-form-item>
-      <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageId">
-        <el-select v-model="dataForm.storageId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
+      <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
+        <el-select v-model="dataForm.storageBoxName" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
          <el-option
            v-for="item in storageBoxArr"
            :key="item.id"
@ -48,14 +48,13 @@ export default {
  data() {
    return {
      visible: false,
-      locationId: '',
-      locationName: '',
+      storageId: '',
      dataForm: {
-        portAttrId: 1,
-        storageId: ''
+        storageType: 1,
+        storageBoxName: ''
      },
      dataRule: {
-        storageId: [
+        storageBoxName: [
          {
            required: true,
            message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
@ -66,9 +65,8 @@ export default {
    }
  },
  methods: {
-    init(id, name) {
-      this.locationId = id
-      this.locationName = name
+    init(id) {
+      this.storageId = id
      const listQuery = {
        current: 1,
        size: 999
@ -80,9 +78,6 @@ export default {
          this.storageBoxArr.splice(0, this.list.length)
        }
      })
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-      })
      this.visible = true
    },
    // 表单提交
@ -90,7 +85,7 @@ export default {
      this.$refs['dataForm'].validate((valid) => {
        if (valid) {
          this.visible = false
-          this.$emit('refreshDataList', this.locationId, this.locationName, this.dataForm)
+          this.$emit('refreshDataList', this.storageId, this.dataForm)
        }
      })
    }
--- a/src/views/basicData/Warehouse/components/testdata.js
+++ b/src/views/basicData/Warehouse/components/testdata.js
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
 * @LastEditors: gtz
- * @LastEditTime: 2022-03-15 16:47:57
+ * @LastEditTime: 2022-03-11 09:06:18
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@ -11,7 +11,7 @@
    <el-card class="dashboard-main">
      <el-row class="dashboard-title">
        <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
+        <div class="dashboard-header-title">WMS库存信息</div>
      </el-row>
      <el-row class="dashboard-legend">
        <div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
@ -24,7 +24,7 @@
        </div>
        <div class="dashboard-legend-search">
          <el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
-            <el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
+            <el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
          </el-select>
        </div>
      </el-row>
@ -35,13 +35,13 @@
              <el-row>
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
+                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
@ -54,21 +54,21 @@
              <el-row v-if="item < Math.ceil((shelfList[0].rowList[0].portList.length - (current - 1) * 80) / 20)">
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
                  </div>
                </el-col>
              </el-row>
              <el-row v-else>
                <el-col v-for="z in i.rowList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
                  <div v-for="x in shelfList[0].rowList[0].portList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}">
-                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0] ? cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status] : ''}" />
-                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    <div v-if="z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: cassetteStatusObj[z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteList[0].status]}" />
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
                  </div>
                </el-col>
              </el-row>
              <div class="dashboard-layout-footer">
-                {{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
+                {{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
              </div>
            </el-col>
          </el-row>
--- a/src/views/dashboard/testdata.js
+++ b/src/views/dashboard/testdata.js
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:50:00
+ * @LastEditTime: 2022-03-11 09:05:38
 * @Description:
 -->
 <template>
@ -114,7 +114,7 @@
 </template>

 <script>
-import { ExecutionInfoDetail } from '@/api/orderManage/00A'
+import { ProcessInfoDetail } from '@/api/orderManage/00A'

 export default {
  data() {
@ -146,7 +146,7 @@ export default {
      this.$nextTick(() => {
        this.$refs['dataForm'].resetFields()
        if (this.dataForm.id) {
-          ExecutionInfoDetail(this.dataForm.id).then(res => {
+          ProcessInfoDetail(this.dataForm.id).then(res => {
            res.data.status = this.statusfilter('orderStatus', res.data.status)
            res.data.type = this.statusfilter('orderType', res.data.type)
            res.data.priority = this.statusfilter('priority', res.data.priority)
--- a/src/views/report-manage/components/viewSubstrate.vue
+++ b/src/views/report-manage/components/viewSubstrate.vue
@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-05 15:55:45
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-11 11:08:53
+ * @LastEditTime: 2022-03-07 09:28:21
 -->
 <template>
  <div class="app-container">
@ -12,7 +12,7 @@
      <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">{{ storageCode }}:{{ num }}
+    <div style="title">存储箱号:{{ num }}
      <el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
    </div>
    <base-table
@ -104,7 +104,6 @@ export default {
    return {
      addOrUpdateVisible: false,
      num: '',
-      storageCode: this.$t('module.basicData.visual.TipsBefore'),
      tableBtn,
      trueWidth: 200,
      tableProps,
@ -149,7 +148,7 @@ export default {
    },
    getList() {
      this.listLoading = true
-      this.num = this.listQuery.storageBoxCode
+      this.num = this.listQuery.substrateCode
      this.listQuery.code = this.$route.query.code
      console.log(this.listQuery)
      listSubstrate(this.listQuery).then(response => {