13 changed files with 60 additions and 78 deletions
--- 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: fzq
- * @LastEditTime: 2022-03-19 10:24:03
+ * @LastEditTime: 2022-03-18 14:03:12
 * @Description: file content
 */
 export default {
@ -31,7 +31,6 @@ export default {
    Tips: 'Tips',
    TipsBefore: 'Are you sure you want to delete',
    TipsStorageBefore: 'Confirm to add location:',
-    PleaseAddLocationFirst: 'Please Add Location First!',
    Description: 'Description',
    Remarks: 'Remarks',
    Yes: 'Yes',
@ -176,8 +175,7 @@ export default {
    rowMark: 'Row Mark',
    status: 'Status',
    man: 'Man',
-    woman: 'Woman',
-    locationNumber: 'Location Number'
+    woman: 'Woman'
  },
  storageBox: {
    name: 'Name',
--- 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: fzq
- * @LastEditTime: 2022-03-20 09:45:01
+ * @LastEditTime: 2022-03-18 14:56:18
 * * @Description: file content
 */
 export default {
@ -163,8 +163,7 @@ export default {
    sheName: '货架名',
    locaNum: '库存数量',
    man: '男',
-    woman: '女',
-    locationNumber: '库位编号'
+    woman: '女'
  },
  storageBox: {
    name: '存储箱名称',
--- a/src/router/index.js
+++ b/src/router/index.js
@ -57,6 +57,19 @@ export const constantRoutes = [
    component: () => import('@/views/login/index'),
    hidden: true
  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/dashboard',
+    children: [
+      {
+        path: 'dashboard',
+        component: () => import('@/views/dashboard/index'),
+        name: 'Dashboard',
+        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true }
+      }
+    ]
+  },
  // {
  //   path: '/',
  //   component: () => import('@/views/ChoicePart'),
@ -78,20 +91,6 @@ export const constantRoutes = [
    component: () => import('@/views/error-page/401'),
    hidden: true
  },
-  {
-    path: '/dashboard',
-    component: Layout,
-    redirect: '/dashboard',
-    name: 'Dash',
-    children: [
-      {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
-      }
-    ]
-  },
  {
    path: '/',
    component: Layout,
--- 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-19 10:25:46
+ * @LastEditTime: 2022-03-18 13:53:50
 * @Description:
 -->
 <template>
@ -111,11 +111,6 @@ const tableProps = [
    prop: 'statusName',
    label: i18n.t('module.basicData.cache.status'),
    align: 'center'
-  },
-  {
-    prop: 'locationNumber',
-    label: i18n.t('module.basicData.cache.locationNumber'),
-    align: 'center'
  }
 ]

--- 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-20 09:36:54
+ * @LastEditTime: 2022-03-15 09:54:52
 * @Description:
 -->
 <template>
@ -35,7 +35,7 @@
      <!-- <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-item :label="$t('module.basicData.cache.status')" prop="status">
+      <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
        <el-select v-model="dataForm.status">
          <el-option
            v-for="item in options"
@ -44,9 +44,6 @@
            :value="item.value"
          />
        </el-select>
-      </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.cache.locationNumber')" prop="locationNumber">
-        <el-input v-model="dataForm.locationNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationNumber')])" clearable />
      </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
@ -78,8 +75,7 @@ export default {
        locationNameAlias: '',
        rowNum: '',
        status: null,
-        locationType: '',
-        locationNumber: 0
+        locationType: ''
      },
      options: [
        {
@ -103,13 +99,10 @@ export default {
          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
        ],
        layers: [
-          { required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
        ],
        columns: [
-          { required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
-        ],
-        locationNumber: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.locationNumber')]), trigger: 'blur' }
+          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
        ]
      }
    }
@ -145,8 +138,7 @@ export default {
            'shelfId': this.shelfId,
            'id': this.dataForm.id,
            'status': this.dataForm.status,
-            'locationType': this.dataForm.locationType,
-            'locationNumber': this.dataForm.locationNumber
+            'locationType': this.dataForm.locationType
          }
          if (this.dataForm.id) {
            locationUpdate(data).then(res => {
--- a/src/views/basicData/GroupModule/staff.vue
+++ b/src/views/basicData/GroupModule/staff.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-19 10:20:40
+ * @LastEditTime: 2022-03-10 13:43:01
 * @Description:
 -->
 <template>
--- a/src/views/basicData/Warehouse/components/processStorageLink.vue
+++ b/src/views/basicData/Warehouse/components/processStorageLink.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: gtz
 * @Date: 2022-03-03 09:16:10
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 16:33:59
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-18 09:25:04
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue
 -->
@ -104,13 +104,13 @@
                      cursor:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? 'not-allowed'
                          : 'pointer',
                      color:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? '#A2A8B5'
                          : '',
                      border: selectStorageList.some(
@ -135,7 +135,7 @@
                      v-if="
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== '3'
+                        ].attribute !== 3
                      "
                      class="dashboard-layout-item-cricle"
                      :style="{
@ -164,7 +164,7 @@
                    {{
                      z.portVoList[
                        (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== '3'
+                      ].attribute !== 3
                        ? z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                        ].name
@ -233,13 +233,13 @@
                      cursor:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? 'not-allowed'
                          : 'pointer',
                      color:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? '#A2A8B5'
                          : '',
                      border: selectStorageList.some(
@ -264,7 +264,7 @@
                      v-if="
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== '3'
+                        ].attribute !== 3
                      "
                      class="dashboard-layout-item-cricle"
                      :style="{
@ -293,7 +293,7 @@
                    {{
                      z.portVoList[
                        (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== '3'
+                      ].attribute !== 3
                        ? z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                        ].name
@ -325,13 +325,13 @@
                      cursor:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? 'not-allowed'
                          : 'pointer',
                      color:
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === '3'
+                        ].attribute === 3
                          ? '#A2A8B5'
                          : '',
                      border: selectStorageList.some(
@ -356,7 +356,7 @@
                      v-if="
                        z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== '3'
+                        ].attribute !== 3
                      "
                      class="dashboard-layout-item-cricle"
                      :style="{
@ -385,7 +385,7 @@
                    {{
                      z.portVoList[
                        (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== '3'
+                      ].attribute !== 3
                        ? z.portVoList[
                          (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                        ].name
@ -457,7 +457,7 @@ export default {
      this.selectStorageList.splice(0, this.selectStorageList.length)
    },
    setType(item) {
-      if (item.attribute !== '3') {
+      if (item.attribute !== 3) {
        if (
          this.selectStorageList.findIndex(
            StorageItem => StorageItem.locationId === item.id
--- a/src/views/dashboard/components/PortDetail.vue
+++ b/src/views/dashboard/components/PortDetail.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 16:37:56
 * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 16:18:38
+ * @LastEditTime: 2022-03-17 10:49:54
 * @Description:
 -->
 <template>
@ -18,7 +18,7 @@
        {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
      </el-form-item>
      <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
-        {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
+        {{ dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
      </el-form-item>
      <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
        {{ dataForm.workOrderNo }}
--- 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-18 16:29:33
+ * @LastEditTime: 2022-03-16 20:07:40
 * @Description: file content
 * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@ -35,9 +35,9 @@
            <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
              <el-row>
                <el-col v-for="z in i.rowVoList" :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.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
@ -54,17 +54,17 @@
            <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
              <el-row v-if="item < Math.ceil((shelfVoList[0].rowVoList[0].portVoList.length - (current - 1) * 80) / 20)">
                <el-col v-for="z in i.rowVoList" :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.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
              <el-row v-else>
                <el-col v-for="z in i.rowVoList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                  </div>
                </el-col>
              </el-row>
--- a/src/views/orderManage/components/processLinkBtn.vue
+++ b/src/views/orderManage/components/processLinkBtn.vue
@ -1,7 +1,7 @@
 <!--
 * @Date: 2021-01-07 20:09:37
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-19 13:47:06
+ * @LastEditTime: 2022-03-16 10:02:41
 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
 * @Description:
 -->
@ -59,7 +59,6 @@ export default {
      }).then(response => {
        this.options = response.data.records
      })
-      this.value = this.injectData.processId
    },
    emitClick() {
      const data = {
--- a/src/views/report-manage/CurrentInventory.vue
+++ b/src/views/report-manage/CurrentInventory.vue
@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-04 20:54:54
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:31:14
+ * @LastEditTime: 2022-03-18 14:55:13
 -->
 <template>
  <div class="app-container">
--- a/src/views/report-manage/components/edit-substrate.vue
+++ b/src/views/report-manage/components/edit-substrate.vue
@ -4,7 +4,7 @@
 * @Author: fzq
 * @Date: 2022-03-05 17:45:46
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:35:03
+ * @LastEditTime: 2022-03-18 14:46:26
 -->
 <template>
  <!-- <el-dialog
@ -19,8 +19,8 @@
      <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="subPosition">
-        <el-input v-model="dataForm.subPosition" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
+      <el-form-item :label="$t('module.report.substrate.location')" prop="locationName">
+        <el-input v-model="dataForm.locationName" :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 />
@ -159,7 +159,7 @@ export default {
            'storeTime': this.dataForm.storeTime,
            'id': this.dataForm.id,
            'substrateCode': this.dataForm.substrateCode,
-            'subPosition': this.dataForm.subPosition,
+            'locationName': this.dataForm.locationName,
            // 'interCode': this.dataForm.interCode,
            'storageBoxFid': this.dataForm.storageBoxFid,
            'machineHandID': this.dataForm.machineHandID,
--- 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-20 09:35:05
+ * @LastEditTime: 2022-03-18 14:39:56
 -->
 <template>
  <div class="app-container">
@ -71,7 +71,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'subPosition',
+    prop: 'locationName',
    label: i18n.t('module.report.substrate.location'),
    align: 'center'
  },