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
-  })
-}

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-12 14:22:52
+ * @LastEditTime: 2022-03-11 08:28:27
  * @Description: file content
  */
 export default {
@@ -255,7 +255,7 @@ export default {
     entryType: 'Manual/Automatic',
     automatic: 'automatic',
     manual: 'Manual',
-    workOrderName: 'Work Order Name'
+    workOrderId: 'workOrderId'
   },
   productPool: {
     productName: 'Product Name',
@@ -343,10 +343,6 @@ export default {
     PerformTaskManual: 'Perform Task Manual',
     processStorageLink: 'Process Storage Link',
     SelectStorageType: 'Select Storage Type',
-    LocationStorageSetting: 'Location Storage Setting',
+    LocationStorageSetting: 'Location Storage Setting'
-    publishTask: 'Publish The Task',
-    startPosition: 'Start',
-    endPosition: 'End',
-    taskType: 'Task Type'
   }
 }

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-12 14:23:06
+ * @LastEditTime: 2022-03-11 08:28:40
  */
 export default {
   visual: {
@@ -247,7 +247,7 @@ export default {
     entryType: '手动/自动',
     automatic: '自动',
     manual: '手动',
-    workOrderName: '工单名称'
+    workOrderId: '工单名称'
   },
   processLocation: {
     sequence: '顺序',
@@ -349,10 +349,6 @@ export default {
     PerformTaskManual: '手动执行任务',
     processStorageLink: '工序关联库位',
     SelectStorageType: '选择库位类型',
-    LocationStorageSetting: '库位存储箱设置',
+    LocationStorageSetting: '库位存储箱设置'
-    publishTask: '发布任务',
-    startPosition: '起点',
-    endPosition: '终点',
-    taskType: '任务类型'
   }
 }

src/router/index.js

@@ -281,7 +281,6 @@ export const constantRoutes = [
       },
       {
         path: '/StorageBoxRack',
-        hidden: true,
         component: () =>
           import('@/views/basicData/Warehouse/StorageBoxRack'),
         name: 'StorageBoxRack',

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%'}"
           >

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-form-item v-if="false" :label="$t('module.basicData.ScrapInfo.PlateId')" prop="basalId">
-        <el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
+        <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',
+    prop: 'source',
-    label: i18n.t('module.basicData.ScrapInfo.PlateId'),
+    label: i18n.t('module.basicData.ScrapInfo.source'),
-    align: 'center'
-  },
-  {
-    prop: 'workOrderName',
-    label: i18n.t('module.basicData.ScrapInfo.workOrderName'),
     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: '',
+        basalId: '',
-        orderId: '',
-        equipmentId: '',
         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
     },

src/views/basicData/Warehouse/CurrentTask.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: gtz
+ * @LastEditors: zwq
- * @LastEditTime: 2022-03-12 14:21:37
+ * @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,7 +79,6 @@
 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
@@ -174,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: [],
@@ -252,13 +248,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.manualTaskRef.init()
       })
-    },
-    // 发布任务
-    publishTask() {
-      this.publishTaskVisible = true
-      this.$nextTick(() => {
-        this.$refs.publishTask.init()
-      })
     }
   }
 }

src/views/basicData/Warehouse/ProcessStorageManagement.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-11 10:31:39
+ * @LastEditTime: 2022-03-04 15:45:23
  * @Description:
 -->
 <template>
@@ -64,6 +64,7 @@ import { list } from '@/api/art-manage/process'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
+import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -101,6 +102,7 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.art.eqName'),
+    filter: timeFormatter,
     align: 'center'
   }
 ]
@@ -158,23 +160,29 @@ export default {
       })
     },
     getList() {
-      this.listLoading = true
+      // this.listLoading = true
-      list(this.listQuery).then(response => {
+      // ExecutionInfoList(this.listQuery).then(response => {
-        if (response.data.records) {
+      //   if (response.data.records) {
-          this.list = response.data.records
+      //     this.list = response.data.records
-        } else {
+      //   } else {
-          this.list.splice(0, this.list.length)
+      //     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
-      })
+      // })
     },
     // 新增 / 修改
     addNew(id) {
       this.$router.push({
         name: 'ProcessStorageManagementInfo',
         query: {
-          id
+          dictTypeId: id
         }
       })
     }

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-11 16:29:46
+ * @LastEditTime: 2022-03-09 09:57:41
  * @Description:
 -->
 <template>
@@ -18,21 +18,20 @@
       :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接口注释
@@ -50,12 +49,12 @@ import { timeFormatter } from '@/filters'
  *
  */
 
-// const tableBtn = [
+const tableBtn = [
-//   {
+  {
-//     type: 'delete',
+    type: 'delete',
-//     btnName: 'btn.delete'
+    btnName: 'btn.delete'
-//   }
+  }
-// ]
+]
 const tableProps = [
   {
     prop: 'code',
@@ -77,7 +76,7 @@ const tableProps = [
 
 export default {
   name: 'Shelf',
-  components: { BaseTable },
+  components: { BaseTable, MethodBtn },
   filters: {
     statusFilter(status) {
       const statusMap = {
@@ -90,7 +89,7 @@ export default {
   },
   data() {
     return {
-      // tableBtn,
+      tableBtn,
       trueWidth: 200,
       tableProps,
       list: [],
@@ -98,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: {
@@ -127,23 +126,23 @@ export default {
         }).catch(() => {})
       }
     },
-    getList() {
+    getList(key) {
       this.listLoading = true
-      locationByProcessList(this.listQuery).then(response => {
+      // shelfList(this.listQuery).then(response => {
-        if (response.data.records) {
+      //   if (response.data.records) {
-          this.list = response.data.records
+      //     this.list = response.data.records
-        } else {
+      //   } else {
-          this.list.splice(0, this.list.length)
+      //     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
         }
       })
     },

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>

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-11 16:33:41
+ * @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="
@@ -142,7 +140,7 @@
               </el-row>
               <div class="dashboard-layout-footer">
                 {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
+                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
                 }}
               </div>
             </el-col>
@@ -205,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="
@@ -272,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="
@@ -308,7 +306,7 @@
               </el-row>
               <div class="dashboard-layout-footer">
                 {{
-                  "第" + bottomIndex[index] + "排(" + ((current - 1) * 4 + item) + ")"
+                  "第" + (index + 1) + "排(" + ((current - 1) * 4 + item) + ")"
                 }}
               </div>
             </el-col>
@@ -325,7 +323,6 @@
 </template>
 
 <script>
-import { batchListAdd } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import testdata from './testdata'
 import processStorageType from './processStorageType'
 
@@ -336,7 +333,7 @@ export default {
     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
     )
@@ -348,8 +345,8 @@ export default {
     },
     setType(item) {
       if (item.attribute !== 3) {
-        if (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.locationId === item.id), 1)
+          this.selectStorageList.splice(this.selectStorageList.findIndex(StorageItem => StorageItem.id === item.id), 1)
         } else {
           this.typeVisible = true
           this.$nextTick(() => {
@@ -358,8 +355,8 @@ export default {
         }
       }
     },
-    setStorageList(locationId, dataForm) {
+    setStorageList(id, dataForm) {
-      const obj = Object.assign({ locationId }, dataForm)
+      const obj = Object.assign({ id }, dataForm)
       this.selectStorageList.push(obj)
     },
     handleChange(v) {
@@ -367,32 +364,14 @@ export default {
     },
     submitLinkList() {
       const tipArr = this.selectStorageList.map(item => {
-        return item.locationId
+        return item.id
       })
-      const obj = {
-        id: 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)
     }
   }
 }

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-11 14:48:18
+ * @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-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="storageType">
-        <el-radio v-model="dataForm.portAttrId" :label="1">Working Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="1">Working Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="2">Buffer Port</el-radio>
+        <el-radio v-model="dataForm.storageType" :label="2">Buffer Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="3">Exception 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-form-item :label="$t('module.basicData.storageBox.name')" prop="storageBoxName">
-        <el-select v-model="dataForm.storageId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
+        <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,13 +48,13 @@ export default {
   data() {
     return {
       visible: false,
-      locationId: '',
+      storageId: '',
       dataForm: {
-        portAttrId: 1,
+        storageType: 1,
-        storageId: ''
+        storageBoxName: ''
       },
       dataRule: {
-        storageId: [
+        storageBoxName: [
           {
             required: true,
             message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.storageBox.name')]),
@@ -66,7 +66,7 @@ export default {
   },
   methods: {
     init(id) {
-      this.locationId = id
+      this.storageId = id
       const listQuery = {
         current: 1,
         size: 999
@@ -85,7 +85,7 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.visible = false
-          this.$emit('refreshDataList', this.locationId, this.dataForm)
+          this.$emit('refreshDataList', this.storageId, this.dataForm)
         }
       })
     }

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-11 10:46:18
+ * @LastEditTime: 2022-03-09 13:53:23
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
  */
@@ -2950,8 +2950,6 @@ export default {
   },
   selectStorageList: [],
   typeVisible: false,
-  id: '',
-  bottomIndex: ['一', '二'],
   current: 1,
   totalPage: 1
 }