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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-22 10:35:16
+ * @LastEditors: fzq
+ * @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',
@@ -362,11 +360,6 @@ export default {
     publishTask: 'Publish The Task',
     startPosition: 'Start',
     endPosition: 'End',
-    taskType: 'Task Type',
-    ExWarehouse: 'Ex Warehouse',
-    InWarehouse: 'In Warehouse',
-    Circulation: 'Circulation',
-    Initialization: 'Initialization',
-    Damage: 'Damage'
+    taskType: 'Task Type'
   }
 }

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-22 10:34:57
+ * @LastEditors: fzq
+ * @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: '存储箱名称',
@@ -366,11 +365,6 @@ export default {
     publishTask: '发布任务',
     startPosition: '起点',
     endPosition: '终点',
-    taskType: '任务类型',
-    ExWarehouse: '出库',
-    InWarehouse: '入库',
-    Circulation: '流转',
-    Initialization: '初始化',
-    Damage: '损坏'
+    taskType: '任务类型'
   }
 }

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'
   }
 ]
 

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

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>

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-22 10:36:05
+ * @LastEditTime: 2022-03-16 09:45:43
  * @Description:
 -->
 <template>
@@ -194,20 +194,20 @@ export default {
         size: 10
       },
       taskTypeList: [{
-        'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
+        'label': '出库',
         'value': 0
       }, {
-        'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
+        'label': '入库',
         'value': 1
       }, {
-        'label': i18n.t('module.basicData.Warehouse.Circulation'),
+        'label': '流转',
         'value': 2
       }],
       TaskStatusList: [{
-        'label': i18n.t('module.basicData.Warehouse.Initialization'),
+        'label': '初始化',
         'value': 0
       }, {
-        'label': i18n.t('module.basicData.Warehouse.Damage'),
+        'label': '损坏',
         'value': 1
       }],
       VehicleNameList: [{

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">

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,

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