Merge branch 'develop' into fzq

Reviewed-on: #82

src/api/orderManage/00A.js

@@ -2,13 +2,13 @@
  * @Author: zwq
  * @Date: 2022-01-17 14:55:09
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:13:22
+ * @LastEditTime: 2022-03-28 13:52:12
  * @Description:
  */
 
 import request from '@/utils/request'
 
-export function ProcessInfoList(data) { // 获取工单工艺列表
+export function ProcessInfoList(data) { // 获取工单列表
   return request({
     url: '/api/wms/work/order/page',
     method: 'post',

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

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: '损坏'
   }
 }

src/router/index.js

@@ -57,19 +57,6 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/dashboard',
-    children: [
-      {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true }
-      }
-    ]
-  },
   // {
   //   path: '/',
   //   component: () => import('@/views/ChoicePart'),
@@ -91,6 +78,20 @@ export const constantRoutes = [
     component: () => import('@/views/error-page/401'),
     hidden: true
   },
+  {
+    path: '/dashboard',
+    component: Layout,
+    redirect: '/dashboard',
+    name: 'Dash',
+    children: [
+      {
+        path: 'dashboard',
+        component: () => import('@/views/dashboard/index'),
+        name: 'Dashboard',
+        meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
+      }
+    ]
+  },
   {
     path: '/',
     component: Layout,
@@ -215,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 }
       },
       {
@@ -516,7 +518,6 @@ export const constantRoutes = [
         path: 'menumanager',
         component: () => import('@/views/MenuManager'),
         name: 'MenuManager',
-        hidden: true,
         meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {

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-28 13:52:30
  * @Description:
 -->
 <template>
@@ -37,8 +37,8 @@
           />
         </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-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
+        <el-select v-model="formData.workOrderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
           <el-option
             v-for="(item, index) in orderList"
             :key="index"
@@ -88,7 +88,7 @@ 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 { ProcessInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -182,7 +182,7 @@ export default {
       formData: {
         timeSlot: null,
         substrateId: '',
-        orderId: '',
+        workOrderId: '',
         equipmentId: '',
         current: 1,
         size: 10,
@@ -254,7 +254,7 @@ export default {
       if (result1.code === 0) {
         this.device = result1.data.records
       }
-      const result2 = await ExecutionInfoList({
+      const result2 = await ProcessInfoList({
         current: 1,
         size: 999
       })

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

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

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

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

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>

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

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-18 09:25:04
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-18 16:33:59
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue
 -->
@@ -104,13 +104,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -135,7 +135,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -164,7 +164,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -233,13 +233,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -264,7 +264,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -293,7 +293,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -325,13 +325,13 @@
                       cursor:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? 'not-allowed'
                           : 'pointer',
                       color:
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute === 3
+                        ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
                       border: selectStorageList.some(
@@ -356,7 +356,7 @@
                       v-if="
                         z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                        ].attribute !== 3
+                        ].attribute !== '3'
                       "
                       class="dashboard-layout-item-cricle"
                       :style="{
@@ -385,7 +385,7 @@
                     {{
                       z.portVoList[
                         (current - 1) * 80 + (item - 1) * 20 + (x - 1)
-                      ].attribute !== 3
+                      ].attribute !== '3'
                         ? z.portVoList[
                           (current - 1) * 80 + (item - 1) * 20 + (x - 1)
                         ].name
@@ -457,7 +457,7 @@ export default {
       this.selectStorageList.splice(0, this.selectStorageList.length)
     },
     setType(item) {
-      if (item.attribute !== 3) {
+      if (item.attribute !== '3') {
         if (
           this.selectStorageList.findIndex(
             StorageItem => StorageItem.locationId === item.id

src/views/dashboard/components/PortDetail.vue

@@ -1,32 +1,52 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-17 10:49:54
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-04-02 15:57:14
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.detail' | i18nFilter"
     :visible.sync="visible"
+    width="70%"
   >
+    <el-row :gutter="10">
       <el-form ref="dataForm" :model="dataForm" label-width="150px">
+        <el-col :span="8">
           <el-form-item :label="$t('module.dashboard.name')" prop="name">
             {{ dataForm.name }}
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('module.dashboard.attribute')" prop="attribute">
             {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
-        {{ dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
+            {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
             {{ dataForm.workOrderNo }}
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="$t('module.dashboard.storageBoxCode')" prop="storageBoxCode">
             {{ dataForm.storageBoxCode }}
           </el-form-item>
+        </el-col>
       </el-form>
+    </el-row>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
     </span>
@@ -34,11 +54,56 @@
 </template>
 
 <script>
+import i18n from '@/lang'
+import { listSubstrate } from '@/api/report-manage/report'
+import BaseTable from '@/components/BaseTable'
+
+const tableProps = [
+  {
+    prop: 'substrateCode',
+    label: i18n.t('module.report.substrate.substrateCode'),
+    align: 'center'
+  },
+  {
+    prop: 'subPosition',
+    label: i18n.t('module.report.substrate.location'),
+    align: 'center'
+  },
+  {
+    prop: 'storeTime',
+    label: i18n.t('module.report.substrate.storeTime'),
+    align: 'center'
+  },
+  {
+    prop: 'status',
+    label: i18n.t('module.report.substrate.substrateStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'subStorageStatusName',
+    label: i18n.t('module.report.substrate.subStorageStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'machineHandID',
+    label: i18n.t('module.report.substrate.machineHandID'),
+    align: 'center'
+  }
+]
 
 export default {
+  components: { BaseTable },
   data() {
     return {
       visible: false,
+      tableProps,
+      list: [],
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 500,
+        locationStorageSubID: ''
+      },
       dataForm: {
         code: null,
         createTime: null,
@@ -69,6 +134,23 @@ export default {
       console.log(data)
       this.visible = true
       this.dataForm = data
+      this.listQuery.locationStorageSubID = data.locationStorageSubId
+      this.listLoading = true
+      listSubstrate(this.listQuery).then(response => {
+        if (response.data) {
+          this.list = response.data
+          for (var x = 0; x < this.list.length; x++) {
+            if (this.list[x].subStorageStatus === 1) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.load')
+            } else if (this.list[x].subStorageStatus === 2) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.unload')
+            }
+          }
+        } else {
+          this.list.splice(0, this.list.length)
+        }
+        this.listLoading = false
+      })
     }
   }
 }

src/views/dashboard/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 20:07:40
+ * @LastEditTime: 2022-03-18 16:29:33
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
 -->
@@ -35,9 +35,9 @@
             <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
               <el-row>
                 <el-col v-for="z in i.rowVoList" :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.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
@@ -54,17 +54,17 @@
             <el-col v-for="(i, index) in shelfVoList" :key="item + 'shelf' + i.id" :span="12" class="dashboard-layout-shelf">
               <el-row v-if="item < Math.ceil((shelfVoList[0].rowVoList[0].portVoList.length - (current - 1) * 80) / 20)">
                 <el-col v-for="z in i.rowVoList" :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.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in 20" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>
               <el-row v-else>
                 <el-col v-for="z in i.rowVoList" :key="item + 'shelf' + i + 'row' + z.id" :span="12" class="dashboard-layout-row">
-                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === 3 ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
-                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== 3 ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                  <div v-for="x in shelfVoList[0].rowVoList[0].portVoList.length - (item - 1) * 20 - (current - 1) * 80" :key="item + 'shelf' + i + 'row' + z + 'item' + x" class="dashboard-layout-item" :style="{background: portAttributeObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute], cursor: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute === '3' ? '#A2A8B5' : ''}" @click="handlePort(z, x)">
+                    <div v-if="z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3'" class="dashboard-layout-item-cricle" :style="{background: z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0] ? cassetteStatusObj[z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].cassetteVoList[0].status] : ''}" />
+                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
                   </div>
                 </el-col>
               </el-row>

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

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-05-30 13:40:33
 -->
 <template>
   <div class="app-container">
@@ -223,6 +223,7 @@ export default {
         //   link.click()
         //   URL.revokeObjectURL(link.href)
         // }
+        this.getList()
       })
     }
     // 新增 / 修改

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,

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