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

@@ -3,10 +3,10 @@
  * @Date: 2021-03-04 16:13:51
 <<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:38
+ * @LastEditTime: 2022-03-11 11:13:47
 =======
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:58:20
+ * @LastEditTime: 2022-03-12 14:22:52
 >>>>>>> develop
  * @Description: file content
  */
@@ -186,10 +186,7 @@ export default {
     remark: 'Remark',
     PositionNo: 'PositionNo',
     PositionCode: 'PositionCode',
-    PositionCodeAlias: 'PositionCodeAlias',
+    PositionCodeAlias: 'PositionCodeAlias'
-    scrapped: 'Scrapped',
-    normal: 'Normal',
-    repairing: 'Repairing'
   },
   equipment: {
     EquipmentName: 'Equipment Name',

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

@@ -3,11 +3,11 @@
  * @Date: 2021-03-04 16:13:51
 <<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:20
+ * @LastEditTime: 2022-03-11 11:13:22
  * @Description: file content
 =======
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:58:12
+ * @LastEditTime: 2022-03-12 14:23:06
 >>>>>>> develop
  */
 export default {
@@ -177,11 +177,7 @@ export default {
     remark: '备注',
     PositionNo: '位置序号',
     PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名',
+    PositionCodeAlias: '位置编码别名'
-    scrapped: '报废',
-    normal: '正常',
-    repairing: '维修中'
-
   },
   equipment: {
     shortName: '名称缩写',

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: [
@@ -497,7 +497,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: [
       {

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-11 11:14:02
  * @Description:
 -->
 <template>
@@ -157,7 +157,7 @@ export default {
     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: {

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-11 11:03:31
  * @Description:
 -->
 <template>
@@ -20,14 +20,11 @@
       <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-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
@@ -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>

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

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: {

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: '',

src/views/basicData/Warehouse/CurrentTask.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 10:35:17
+ * @LastEditTime: 2022-03-12 14:21:37
  * @Description:
 -->
 <template>
@@ -86,7 +86,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> = []
@@ -118,7 +118,6 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.basicData.Warehouse.ExecutionTime'),
-    filter: timeFormatter,
     align: 'center'
   },
   {

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',
+    prop: 'status',
-    label: i18n.t('module.basicData.Warehouse.TaskSource'),
+    label: i18n.t('module.basicData.Warehouse.TaskStatus'),
     align: 'center'
   },
+  // {
+  //   prop: 'taskType',
+  //   label: i18n.t('module.basicData.Warehouse.TaskType'),
+  //   align: 'center'
+  // },
   {
-    prop: 'taskType',
+    prop: 'name',
-    label: i18n.t('module.basicData.Warehouse.TaskType'),
+    label: i18n.t('module.basicData.Warehouse.VehicleName'),
     align: 'center'
   },
+  // {
+  //   prop: 'substrateNo',
+  //   label: i18n.t('module.basicData.Warehouse.BoxStatus'),
+  //   align: 'center'
+  // },
   {
-    prop: 'fullCode',
+    prop: 'wcode',
-    label: i18n.t('module.basicData.Warehouse.TaskBoxNumber'),
+    label: i18n.t('module.basicData.Warehouse.BoxNumber'),
-    align: 'center'
-  },
-  {
-    prop: 'emptyCode',
-    label: i18n.t('module.basicData.Warehouse.FullBoxNumber'),
     align: 'center'
   },
   {
@@ -158,23 +162,18 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'anotherCurrLocation',
+    prop: 'updateTime',
-    label: i18n.t('module.basicData.Warehouse.StartLocation'),
+    label: i18n.t('module.basicData.Warehouse.CompletionTime'),
-    align: 'center'
-  },
-  {
-    prop: 'anotherTargetLocation',
-    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
     align: 'center'
   },
   {
     prop: 'currLocation',
-    label: i18n.t('module.basicData.Warehouse.FullBoxStartLocation'),
+    label: i18n.t('module.basicData.Warehouse.StartLocation'),
     align: 'center'
   },
   {
-    prop: 'name',
+    prop: 'targetLocation',
-    label: i18n.t('module.basicData.Warehouse.VehicleName'),
+    label: i18n.t('module.basicData.Warehouse.TargetLocation'),
     align: 'center'
   }
 ]
@@ -195,9 +194,9 @@ export default {
         taskType: '',
         status: '',
         equipmentId: '',
-        // timeSlot: [],
+        timeSlot: [],
-        // endTime: '',
+        endTime: '',
-        // startTime: '',
+        startTime: '',
         current: 1,
         size: 10
       },
@@ -232,13 +231,13 @@ export default {
   },
   methods: {
     getList() {
-      // if (this.formData.timeSlot) {
+      if (this.formData.timeSlot) {
-      //   this.formData.startTime = this.formData.timeSlot[0]
+        this.formData.startTime = this.formData.timeSlot[0]
-      //   this.formData.endTime = this.formData.timeSlot[1]
+        this.formData.endTime = this.formData.timeSlot[1]
-      // } else {
+      } else {
-      //   this.formData.startTime = ''
+        this.formData.startTime = ''
-      //   this.formData.endTime = ''
+        this.formData.endTime = ''
-      // }
+      }
       this.listLoading = true
       HistoricalTaskList(this.formData).then(response => {
         if (response.data.records) {

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-11 10:31:39
  * @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>
@@ -65,7 +65,6 @@ 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'
 /**
  * 表格表头配置项 TypeScript接口注释
  * tableConfig<ConfigItem> = []
@@ -102,7 +101,6 @@ const tableProps = [
   {
     prop: 'createTime',
     label: i18n.t('module.art.eqName'),
-    filter: timeFormatter,
     align: 'center'
   }
 ]
@@ -133,7 +131,7 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        key: ''
+        processId: ''
       }
     }
   },

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,10 +123,6 @@ export default {
   },
   created() {
     this.getList()
-    this.init()
-  },
-  methods: {
-    init() {
     const listQuery1 = {
       current: 1,
       size: 100
@@ -135,6 +131,7 @@ export default {
       this.storageBoxList = res.data.records
     })
   },
+  methods: {
     getList() {
       this.listLoading = true
       StorageBoxInfoList(this.listQuery).then(response => {

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
+                <el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
-                  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-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
+                <el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
-                  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-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="TaskStatus">
+              <el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
-                <el-select
+                <el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
-                  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>
             </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')])"
+                  readonly
-                  clearable
-                  filterable
                   :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()
       })

src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-14 16:03:15
+ * @LastEditTime: 2022-03-11 09:06:18
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -35,8 +35,8 @@
               <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] : ''}" />
+                    <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)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
                   </div>
                 </el-col>
               </el-row>
@@ -54,16 +54,16 @@
               <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] : ''}" />
+                    <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)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    {{ 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] : ''}" />
+                    <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)].attribute !== 3 ? z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                    {{ z.portList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name }}
                   </div>
                 </el-col>
               </el-row>