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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 10:10:59
+ * @LastEditTime: 2022-03-15 18:33:48
  * @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',

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 10:10:43
+ * @LastEditTime: 2022-03-15 18:33:48
  * @Description: file content
  */
 export default {
@@ -31,7 +31,6 @@ export default {
     Tips: '提示',
     TipsBefore: '确定删除',
     TipsStorageBefore: '确定添加库位:',
-    PleaseAddLocationFirst: '请先添加库位!',
     Description: '描述',
     Remarks: '备注',
     Or: '或',

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-16 14:11:09
+ * @LastEditTime: 2022-03-11 10:55:27
  * @Description:
 -->
 <template>
@@ -226,7 +226,7 @@ export default {
             this.dataForm = res.data
           })
         } else {
-          this.dataForm.registerTime = this.moment()
+          this.dataForm.registerTime = this.moment().format('YYYY-MM-DD HH:mm:ss')
         }
       })
     },

src/views/QualityManager/scrap/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:54:40
+ * @LastEditTime: 2022-03-11 11:24:48
  * @Description:
 -->
 <template>
@@ -11,6 +11,7 @@
       :model="formData"
       :inline="true"
       size="medium"
+      label-width="80px"
     >
       <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 />

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:45:43
+ * @LastEditTime: 2022-03-14 10:35:17
  * @Description:
 -->
 <template>
@@ -12,6 +12,7 @@
       :model="formData"
       :inline="true"
       size="medium"
+      label-width="100px"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
         <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>

src/views/basicData/Warehouse/HistoricalTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:46:13
+ * @LastEditTime: 2022-03-14 10:37:13
  * @Description:
 -->
 <template>
@@ -12,6 +12,7 @@
       :model="formData"
       :inline="true"
       size="medium"
+      label-width="100px"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
         <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>

src/views/basicData/Warehouse/ProcessStorageManagement.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:46:19
+ * @LastEditTime: 2022-03-14 10:35:21
  * @Description:
 -->
 <template>
@@ -13,6 +13,7 @@
       :model="listQuery"
       :inline="true"
       size="medium"
+      label-width="100px"
     >
       <el-form-item :label="$t('module.art.processList.processName')" prop="key">
         <el-select

src/views/basicData/Warehouse/StorageBoxInfo.vue

@@ -2,12 +2,12 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:45:26
+ * @LastEditTime: 2022-03-14 09:33:28
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
+    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
       <el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="code">
         <el-select
           v-model="listQuery.code"

src/views/basicData/Warehouse/StorageBoxRack.vue

@@ -2,12 +2,12 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:46:26
+ * @LastEditTime: 2022-01-17 14:06:53
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
+    <el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
       <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
         <el-select
           v-model="listQuery.currLocationId"

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:49:10
+ * @LastEditTime: 2022-03-14 10:55:22
  * @Description:
 -->
 <template>
@@ -15,7 +15,7 @@
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="170px"
+        label-width="110px"
         label-position="left"
       >
         <el-col :span="12">

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:50:12
+ * @LastEditTime: 2022-01-14 15:55:39
  * @Description:
 -->
 <template>
@@ -15,7 +15,7 @@
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="160px"
+        label-width="110px"
         label-position="left"
       >
         <el-col :span="8">

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

@@ -2,21 +2,20 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:50:58
+ * @LastEditTime: 2022-01-13 16:22:39
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
-    width="60%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="170px"
+        label-width="110px"
         label-position="left"
       >
         <el-col :span="8">

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-16 09:52:07
+ * @LastEditTime: 2022-03-15 14:15:30
  * @Description:
 -->
 <template>
@@ -65,6 +65,11 @@ const tableProps = [
     prop: 'name',
     label: i18n.t('module.basicData.cache.LocationName'),
     align: 'center'
+  },
+  {
+    prop: 'shelfName',
+    label: i18n.t('module.basicData.cache.locationType'),
+    align: 'center'
   }
 ]
 

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2022-03-12 14:17:55
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 14:18:33
+ * @LastEditTime: 2022-03-12 14:23:43
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\PublishTask.vue
 -->
@@ -21,13 +21,13 @@
         label-position="left"
       >
         <el-form-item :label="$t('module.basicData.Warehouse.startPosition')" prop="startPosition">
-          <el-input v-model="dataForm.startPosition" :style="{width: '100%'}" />
+          <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" :style="{width: '100%'}" />
+          <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" :style="{width: '100%'}" />
+          <el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
         </el-form-item>
       </el-form>
     </el-row>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 09:47:25
+ * @LastEditTime: 2022-03-10 18:44:36
  * @Description:
 -->
 <template>
@@ -10,7 +10,7 @@
     :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
     :visible.sync="visible"
   >
-    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmit()">
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
       <el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
         <el-select
           v-model="dataForm.currLocationId"

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-16 10:11:10
+ * @LastEditTime: 2022-03-15 17:03:28
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -302,37 +302,29 @@ export default {
       console.log(v)
     },
     submitLinkList() {
-      if (this.selectStorageList.length) {
+      const tipArr = this.selectStorageList.map(item => {
-        const tipArr = this.selectStorageList.map(item => {
+        return item.locationName
-          return item.locationName
+      })
-        })
+      const obj = {
-        const obj = {
+        workSequenId: this.id,
-          workSequenId: this.id,
+        processLocationStorageList: this.selectStorageList
-          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(() => {})
-      } else {
-        this.$message({
-          message: this.$t('module.basicData.visual.PleaseAddLocationFirst'),
-          type: 'warning',
-          duration: 1500
-        })
       }
+      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)

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-16 09:47:01
+ * @LastEditTime: 2022-03-15 11:02:46
  * @Description:
 -->
 <template>
@@ -15,6 +15,7 @@
       :model="dataForm"
       size="medium"
       :rules="dataRule"
+      label-width="110px"
       label-position="left"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">

src/views/basicData/Warehouse/components/testdata.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 15:47:47
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:43:36
+ * @LastEditTime: 2022-03-15 10:52:46
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
  */
@@ -2605,7 +2605,7 @@ export default {
   selectStorageList: [],
   typeVisible: false,
   id: '',
-  bottomIndex: ['module.dashboard.first', 'module.dashboard.second'],
+  bottomIndex: ['一', '二'],
   current: 1,
   totalPage: 1
 }

src/views/orderManage/components/ExecutionInfoDetail.vue

@@ -2,21 +2,20 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 14:17:40
+ * @LastEditTime: 2022-03-15 10:50:00
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
-    width="70%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="180px"
+        label-width="110px"
         label-position="left"
       >
         <el-col :span="8">
@@ -116,7 +115,6 @@
 
 <script>
 import { ExecutionInfoDetail } from '@/api/orderManage/00A'
-import { timeFormatter } from '@/filters'
 
 export default {
   data() {
@@ -125,6 +123,7 @@ export default {
       dataForm: {
         id: 0,
         name: undefined,
+        createTime: undefined,
         priority: '',
         actualQuantity: '',
         startProduceTime: '',
@@ -152,8 +151,6 @@ export default {
             res.data.type = this.statusfilter('orderType', res.data.type)
             res.data.priority = this.statusfilter('priority', res.data.priority)
             res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
-            res.data.finishProduceTime = timeFormatter(res.data.finishProduceTime)
-            res.data.startProduceTime = timeFormatter(res.data.startProduceTime)
             res.data.ProcessOrNot = res.data.processId ? '是' : '否'
             this.dataForm = res.data
           })

src/views/orderManage/components/ProcessInfoDetail.vue

@@ -2,21 +2,20 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 14:17:37
+ * @LastEditTime: 2022-03-09 16:40:11
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.see' | i18nFilter"
     :visible.sync="visible"
-    width="70%"
   >
     <el-row :gutter="10">
       <el-form
         ref="dataForm"
         :model="dataForm"
         size="medium"
-        label-width="180px"
+        label-width="110px"
         label-position="left"
       >
         <el-col :span="8">
@@ -106,7 +105,6 @@
 
 <script>
 import { ProcessInfoDetail } from '@/api/orderManage/00A'
-import { timeFormatter } from '@/filters'
 
 export default {
   data() {
@@ -115,6 +113,7 @@ export default {
       dataForm: {
         id: 0,
         name: undefined,
+        createTime: undefined,
         priority: '',
         actualQuantity: '',
         startProduceTime: '',
@@ -141,7 +140,6 @@ export default {
             res.data.type = this.statusfilter('orderType', res.data.type)
             res.data.priority = this.statusfilter('priority', res.data.priority)
             res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
-            res.data.startProduceTime = timeFormatter(res.data.startProduceTime)
             this.dataForm = res.data
           })
         }

src/views/orderManage/components/processLinkBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 10:02:41
+ * @LastEditTime: 2022-03-10 14:25:50
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -13,7 +13,7 @@
       width="160"
     >
       <div>
-        <el-select v-model="value" :placeholder="$t('module.basicData.Warehouse.RelateProcess')">
+        <el-select v-model="value" placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.id"
@@ -23,8 +23,8 @@
         </el-select>
       </div>
       <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
+        <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-        <el-button type="primary" size="mini" @click="emitClick">{{ 'btn.confirm' | i18nFilter }}</el-button>
+        <el-button type="primary" size="mini" @click="emitClick">确定</el-button>
       </div>
       <el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button>
     </el-popover>

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-16 16:11:55
+ * @LastEditTime: 2022-03-07 09:19:34
 -->
 <template>
   <!-- <el-dialog
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { updateSubstrate } from '@/api/report-manage/report'
+import { updateSubstrate, listSubstrate } from '@/api/report-manage/report'
 
 export default {
   props: {
@@ -55,18 +55,15 @@ export default {
     return {
       visible: false,
       dataForm: {
-        // substrateCode: '',
+        id: '',
-        // location: '',
+        substrateCode: '',
-        // storeTime: '',
+        location: '',
-        // substrateStatus: '',
+        storeTime: '',
-        // code: '',
+        substrateStatus: '',
-        // storageBoxId: '',
+        code: '',
-        // storageCode: '',
+        storageBoxId: '',
-        // interCode: '',
+        storageCode: '',
-        // id: '',
+        interCode: ''
-        // current: 1,
-        // size: 10,
-        // locationStorageSubID: ''
       },
       list: {
         id: '',
@@ -110,25 +107,22 @@ export default {
     //     })
     //   })
     // },
-    init(data) {
+    init(id) {
       // this.dataForm.id = id || ''
-      // console.log(this.$route.query)
+      this.dataForm.storageBoxId = this.$route.query.id
-      // this.dataForm.id = this.$route.query.id
+      this.dataForm.storageCode = this.$route.query.code
-      // this.dataForm.substrateCode = this.$route.query.substrateCode
-      // this.dataForm.locationStorageSubID = this.$route.query.locationStorageSubID
-      this.dataForm = data
       this.visible = true
       // console.log(this.dataForm)
-      // listSubstrate(this.dataForm).then(res => {
+      listSubstrate(this.dataForm).then(res => {
-      //   // console.log(res)
+        console.log(res.data[0])
-      //   this.dataForm.id = res.data[0].id
+        this.dataForm.id = res.data[0].id
-      //   this.dataForm.location = res.data[0].location
+        this.dataForm.location = res.data[0].location
-      //   this.dataForm.storeTime = res.data[0].storeTime
+        this.dataForm.storeTime = res.data[0].storeTime
-      //   this.dataForm.substrateCode = res.data[0].substrateCode
+        this.dataForm.substrateCode = res.data[0].substrateCode
-      //   this.dataForm.substrateStatus = res.data[0].substrateStatus
+        this.dataForm.substrateStatus = res.data[0].substrateStatus
-      //   this.dataForm.interCode = res.data[0].interCode
+        this.dataForm.interCode = res.data[0].interCode
-      //   // console.log(this.dataForm)
+        // console.log(this.dataForm)
-      // })
+      })
     },
     // 表单提交
     dataFormSubmit() {
@@ -138,10 +132,10 @@ export default {
             'substrateStatus': this.dataForm.substrateStatus,
             'storeTime': this.dataForm.storeTime,
             'id': this.dataForm.id,
-            'code': this.dataForm.substrateCode,
+            'substrateCode': this.dataForm.substrateCode,
             'location': this.dataForm.location,
             'interCode': this.dataForm.interCode,
-            'storageBoxFid': this.dataForm.storageBoxFid
+            'storageBoxId': this.dataForm.storageBoxId
           }
           console.log(data)
           updateSubstrate(data).then(res => {

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

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 14:35:07
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 16:13:58
+ * @LastEditTime: 2022-03-05 16:44:43
 -->
 <template>
   <span>
@@ -26,8 +26,7 @@ export default {
         name: 'viewSubstrate',
         query: {
           id: this.injectData.id,
-          code: this.injectData.code,
+          code: this.injectData.code
-          locationStorageSubID: this.injectData.locationStorageSubID
         }
       })
     }

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-16 16:09:15
+ * @LastEditTime: 2022-03-11 11:08:53
 -->
 <template>
   <div class="app-container">
@@ -29,7 +29,7 @@
         @clickBtn="handleClick"
       />
     </base-table>
-    <edit-substrate v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
+    <edit-substrate v-if="addOrUpdateVisible" :id="listQuery.id" ref="addOrUpdate" @refreshDataList="getList" />
   </div>
 </template>
 
@@ -104,7 +104,7 @@ export default {
     return {
       addOrUpdateVisible: false,
       num: '',
-      storageCode: this.$t('module.basicData.visual.storageCode'),
+      storageCode: this.$t('module.basicData.visual.TipsBefore'),
       tableBtn,
       trueWidth: 200,
       tableProps,
@@ -113,17 +113,14 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        locationStorageSubID: ''
+        storageBoxCode: '',
-        // storageBoxCode: '',
+        storageBoxId: ''
-        // storageBoxId: ''
+      }
-      },
-      count: 0
     }
   },
   created() {
     this.listQuery.storageBoxCode = this.$route.query.code
-    // this.listQuery.storageBoxId = this.$route.query.id
+    this.listQuery.storageBoxId = this.$route.query.id
-    this.listQuery.locationStorageSubID = this.$route.query.locationStorageSubID
     this.getList()
   },
   methods: {
@@ -134,7 +131,7 @@ export default {
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'
         }).then(() => {
-          // console.log(raw.data)
+        //   console.log(raw.data)
           deleSubstrate(raw.data).then(response => {
             this.$message({
               message: this.$t('module.basicData.visual.success'),
@@ -147,18 +144,16 @@ export default {
           })
         }).catch(() => {})
       } else {
-        // this.count = raw.data._pageIndex
+        this.addNew(raw.data.id)
-        // console.log(this.count)
-        this.addNew(raw.data)
       }
     },
     getList() {
       this.listLoading = true
       this.num = this.listQuery.storageBoxCode
       this.listQuery.code = this.$route.query.code
-      // console.log(this.listQuery)
+      console.log(this.listQuery)
       listSubstrate(this.listQuery).then(response => {
-        // console.log(response)
+        console.log(response)
         if (response.data) {
           this.list = response.data
           console.log(this.list)