'修改存储箱字段'

Merge pull request '修改bug' (#79 ) from zwq into develop
2022-03-28 11:13:51 +08:00 · 2022-03-28 11:12:03 +08:00 · 2022-03-22 11:27:14 +08:00 · 2022-03-22 11:26:34 +08:00 · 2022-03-21 09:12:51 +08:00 · 2022-03-20 09:50:51 +08:00
13 changed files with 73 additions and 33 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-18 14:03:12
+ * @LastEditTime: 2022-03-28 11:13:15
 * @Description: file content
 */
 export default {
@@ -31,6 +31,7 @@ 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',
@@ -55,7 +56,8 @@ export default {
    location: 'Location',
    locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
    locationInfo: 'Location Point Info',
-    storageCode: 'storageBoxCode'
+    storageCode: 'storageBoxCode',
+    storageBoxFid: 'StorageBox FID Code'
  },
  factory: {
    placeholderName: 'Name Or Code',
@@ -175,7 +177,8 @@ export default {
    rowMark: 'Row Mark',
    status: 'Status',
    man: 'Man',
-    woman: 'Woman'
+    woman: 'Woman',
+    locationNumber: 'Location Number'
  },
  storageBox: {
    name: 'Name',
@@ -360,6 +363,11 @@ export default {
    publishTask: 'Publish The Task',
    startPosition: 'Start',
    endPosition: 'End',
-    taskType: 'Task Type'
+    taskType: 'Task Type',
+    ExWarehouse: 'Ex Warehouse',
+    InWarehouse: 'In Warehouse',
+    Circulation: 'Circulation',
+    Initialization: 'Initialization',
+    Damage: 'Damage'
  }
 }
--- 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-18 14:56:18
+ * @LastEditTime: 2022-03-28 11:13:13
 * * @Description: file content
 */
 export default {
@@ -56,7 +56,8 @@ export default {
    location: '库位',
    locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
    locationInfo: '库位点信息',
-    storageCode: '存储箱号'
+    storageCode: '存储箱号',
+    storageBoxFid: '存储箱名FID编码'
  },
  factory: {
    placeholderName: '名称或编码',
@@ -163,7 +164,8 @@ export default {
    sheName: '货架名',
    locaNum: '库存数量',
    man: '男',
-    woman: '女'
+    woman: '女',
+    locationNumber: '库位编号'
  },
  storageBox: {
    name: '存储箱名称',
@@ -365,6 +367,11 @@ export default {
    publishTask: '发布任务',
    startPosition: '起点',
    endPosition: '终点',
-    taskType: '任务类型'
+    taskType: '任务类型',
+    ExWarehouse: '出库',
+    InWarehouse: '入库',
+    Circulation: '流转',
+    Initialization: '初始化',
+    Damage: '损坏'
  }
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -216,6 +216,7 @@ export const constantRoutes = [
        path: 'staff',
        component: () => import('@/views/basicData/GroupModule/staff'),
        name: 'staff',
+        hidden: true,
        meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
      },
      {
--- 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-18 13:53:50
+ * @LastEditTime: 2022-03-19 10:25:46
 * @Description:
 -->
 <template>
@@ -111,6 +111,11 @@ 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-15 09:54:52
+ * @LastEditTime: 2022-03-23 11:03:08
 * @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,6 +44,9 @@
            :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">
@@ -75,7 +78,8 @@ export default {
        locationNameAlias: '',
        rowNum: '',
        status: null,
-        locationType: ''
+        locationType: '',
+        locationNumber: 0
      },
      options: [
        {
@@ -99,10 +103,13 @@ export default {
          { 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' }
+          { required: true, 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' }
+          { 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' }
        ]
      }
    }
@@ -138,7 +145,8 @@ export default {
            'shelfId': this.shelfId,
            'id': this.dataForm.id,
            'status': this.dataForm.status,
-            'locationType': this.dataForm.locationType
+            'locationType': this.dataForm.locationType,
+            'locationNumber': this.dataForm.locationNumber
          }
          if (this.dataForm.id) {
            locationUpdate(data).then(res => {
--- a/src/views/basicData/Cache/components/storageBox-add.vue
+++ b/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-23 11:04:20
 * @Description:
 -->
 <template>
@@ -30,6 +30,9 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item :label="$t('module.basicData.visual.storageBoxFid')" prop="storageBoxFid">
+        <el-input v-model="dataForm.storageBoxFid" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.storageBoxFid')])" clearable />
+      </el-form-item>
      <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="note">
        <el-input v-model="dataForm.note" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
      </el-form-item>
@@ -54,7 +57,8 @@ export default {
        code: '',
        status: '',
        enName: '',
-        note: ''
+        note: '',
+        storageBoxFid: ''
      },
      options: [
        {
--- a/src/views/basicData/Cache/storageBox.vue
+++ b/src/views/basicData/Cache/storageBox.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2020-12-29 15:41:11
 * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 10:55:34
+ * @LastEditTime: 2022-03-23 11:06:20
 * @Description:
 -->
 <template>
@@ -101,6 +101,11 @@ const tableProps = [
    filter: basicData('storage'),
    align: 'center'
  },
+  {
+    prop: 'storageBoxFid',
+    label: i18n.t('module.basicData.visual.storageBoxFid'),
+    align: 'center'
+  },
  {
    prop: 'note',
    label: i18n.t('module.basicData.storageBox.remark'),
@@ -173,6 +178,7 @@ export default {
      storageBoxList(this.listQuery).then(response => {
        if (response.data.records) {
          this.list = response.data.records
+          console.log(this.list)
        } else {
          this.list.splice(0, this.list.length)
        }
--- 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-10 13:43:01
+ * @LastEditTime: 2022-03-19 10:20:40
 * @Description:
 -->
 <template>
--- a/src/views/basicData/Warehouse/CurrentTask.vue
+++ b/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-22 10:36:05
 * @Description:
 -->
 <template>
@@ -194,20 +194,20 @@ export default {
        size: 10
      },
      taskTypeList: [{
-        'label': '出库',
+        'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
        'value': 0
      }, {
-        'label': '入库',
+        'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
        'value': 1
      }, {
-        'label': '流转',
+        'label': i18n.t('module.basicData.Warehouse.Circulation'),
        'value': 2
      }],
      TaskStatusList: [{
-        'label': '初始化',
+        'label': i18n.t('module.basicData.Warehouse.Initialization'),
        'value': 0
      }, {
-        'label': '损坏',
+        'label': i18n.t('module.basicData.Warehouse.Damage'),
        'value': 1
      }],
      VehicleNameList: [{
--- 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-16 10:02:41
+ * @LastEditTime: 2022-03-19 13:47:06
 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
 * @Description:
 -->
@@ -59,6 +59,7 @@ 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-18 14:55:13
+ * @LastEditTime: 2022-03-20 09:31:14
 -->
 <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-18 14:46:26
+ * @LastEditTime: 2022-03-20 09:35:03
 -->
 <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="locationName">
-        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
+      <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>
      <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,
-            'locationName': this.dataForm.locationName,
+            'subPosition': this.dataForm.subPosition,
            // '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-18 14:39:56
+ * @LastEditTime: 2022-03-20 09:35:05
 -->
 <template>
  <div class="app-container">
@@ -71,7 +71,7 @@ const tableProps = [
    align: 'center'
  },
  {
-    prop: 'locationName',
+    prop: 'subPosition',
    label: i18n.t('module.report.substrate.location'),
    align: 'center'
  },
Author	SHA1	Message	Date
Fanzink	d8336aced0	'修改存储箱字段'	2022-03-28 11:13:51 +08:00
Fanzink	43983bc929	'修改存储箱字段'	2022-03-28 11:12:03 +08:00
朱文强	6d3309ed2b	Merge pull request '修改bug' (#79 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #79	2022-03-22 11:27:14 +08:00
zwq	cae8938e22	修改bug	2022-03-22 11:26:34 +08:00
朱文强	03b13c77aa	Merge pull request 'fzq' (#78 ) from fzq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #78	2022-03-21 09:12:51 +08:00
Fanzink	985ec95bc6	Merge branch 'develop' into fzq	2022-03-20 09:50:51 +08:00
Fanzink	453f66b7b3	'更新字段'	2022-03-20 09:50:14 +08:00
朱文强	47793c38da	Merge pull request '修改bug' (#77 ) from zwq into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #77	2022-03-19 13:52:17 +08:00
zwq	dcb7801d24	修改bug	2022-03-19 13:49:04 +08:00
高天泽	f59fc1a594	Merge pull request 'gtz' (#76 ) from gtz into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #76	2022-03-18 16:37:14 +08:00