Merge pull request 'gtz' (#76) from gtz into develop

Reviewed-on: #76

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 10:10:59
+ * @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',

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-04-22 19:48:46
- * @LastEditors: gtz
+ * @LastEditors: fzq
- * @LastEditTime: 2021-04-23 14:36:08
+ * @LastEditTime: 2022-03-18 14:50:00
  * @Description: file content
  */
 
@@ -11,7 +11,35 @@ export default {
     reportName: 'Report name',
     reportSort: 'Report Sort',
     createTime: 'Create Date',
-    operation: 'Operation'
+    operation: 'Operation',
+    storageBoxNumber: 'StorageBox Number',
+    queryFiltering: 'Query Filtering',
+    storageBoxReport: 'StorageBoxReport'
+  },
+  inventory: {
+    code: 'Code',
+    status: 'Status',
+    inprocessCode: 'Inprocess Code',
+    nextprocessCode: 'Next Process Code',
+    currentLocation: 'Current Location',
+    storeTime: 'Store Time',
+    orderName: 'Order Name',
+    substrateDetails: 'Substrate Details',
+    viewSubstrates: 'View Substrates',
+    manual: 'Manual',
+    downl: 'Download'
+  },
+  substrate: {
+    substrateCode: 'SubstrateCode',
+    location: 'Location',
+    storeTime: 'Store Time',
+    substrateStatus: 'Substrate Status',
+    editSubstrate: 'Edit Substrate',
+    interCode: 'Inter Code',
+    subStorageStatus: 'Sub Storage Status',
+    load: 'Load',
+    unload: 'Unload',
+    machineHandID: 'Machine Hand ID'
   },
   reportSort: {
     all: 'All'

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

@@ -1,9 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: zwq
+ * @LastEditors: fzq
- * @LastEditTime: 2022-03-16 10:10:43
+ * @LastEditTime: 2022-03-18 14:56:18
- * @Description: file content
+ * * @Description: file content
  */
 export default {
   visual: {

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

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-04-22 19:48:46
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 16:50:50
+ * @LastEditTime: 2022-03-18 14:49:43
  * @Description: file content
  */
 
@@ -13,7 +13,8 @@ export default {
     createTime: '添加时间',
     operation: '操作',
     storageBoxNumber: '存储箱号',
-    queryFiltering: '查询过滤'
+    queryFiltering: '查询过滤',
+    storageBoxReport: '存储箱报表'
   },
   inventory: {
     code: '存储箱号',
@@ -34,7 +35,11 @@ export default {
     storeTime: '入库时间',
     substrateStatus: '基板状态',
     editSubstrate: '编辑基板',
-    interCode: '内部编码'
+    interCode: '内部编码',
+    subStorageStatus: '存取状态',
+    load: '上片',
+    unload: '下片',
+    machineHandID: '机械手ID'
   },
   reportSort: {
     all: '全部'

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,

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-18 13:53:50
  * @Description:
 -->
 <template>
@@ -143,10 +143,11 @@ export default {
       }],
       listLoading: true,
       listQuery: {
+        name: '',
         current: 1,
-        size: 990,
+        size: 20
-        shelfId: '',
+        // shelfId: '',
-        id: ''
+        // id: ''
       },
       sheCode: this.$t('module.basicData.cache.sheCode'),
       sheName: this.$t('module.basicData.cache.sheName'),
@@ -188,6 +189,7 @@ export default {
       this.listLoading = true
       this.listQuery.name = key
       // shelfId与查询参数id关联
+      console.log(this.listQuery)
       this.listQuery.id = this.listQuery.shelfId
       locationList(this.listQuery).then(response => {
         if (response.data.records) {

src/views/basicData/Equipment/components/equipmentInfo-add.vue

@@ -586,6 +586,7 @@ export default {
               })
             })
           } else {
+            console.log(data)
             equipmentInfoAdd(data).then(res => {
               this.$message({
                 message: this.$t('module.basicData.visual.success'),

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
- * @LastEditors: zwq
+ * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 09:25:04
+ * @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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-17 10:49:54
+ * @LastEditTime: 2022-03-18 16:18:38
  * @Description:
 -->
 <template>
@@ -18,7 +18,7 @@
         {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
       </el-form-item>
       <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-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
         {{ dataForm.workOrderNo }}

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-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] : ''}" />
+                    <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' }}
+                    {{ 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-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] : ''}" />
+                    <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' }}
+                    {{ 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-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] : ''}" />
+                    <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' }}
+                    {{ 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/report-manage/CurrentInventory.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-04 20:54:54
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-07 09:46:36
+ * @LastEditTime: 2022-03-18 14:55:13
 -->
 <template>
   <div class="app-container">
@@ -198,7 +198,8 @@ export default {
         let fileName = ''
         const contentDisposition = res.headers['content-disposition']
         if (contentDisposition) {
-          fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
+          // fileName = contentDisposition.slice(contentDisposition.indexOf('filename=') + 9)
+          fileName = this.$t('module.report.reportList.storageBoxReport') + '.xlsx'
         }
         const blob = new Blob([res.data])
         const reader = new FileReader()

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-16 16:11:55
+ * @LastEditTime: 2022-03-18 14:46:26
 -->
 <template>
   <!-- <el-dialog
@@ -19,17 +19,33 @@
       <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="location">
+      <el-form-item :label="$t('module.report.substrate.location')" prop="locationName">
-        <el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
+        <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 />
       </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="substrateStatus">
+      <el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="status">
-        <el-input v-model="dataForm.substrateStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
+        <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
+      <!-- <el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
         <el-input v-model="dataForm.interCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.interCode')])" clearable />
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('module.report.substrate.subStorageStatus')" prop="subStorageStatus">
+        <el-input v-model="dataForm.subStorageStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.subStorageStatus')])" clearable />
+      </el-form-item> -->
+      <el-form-item :label="$t('module.report.substrate.subStorageStatus')" prop="subStorageStatus">
+        <el-select v-model="dataForm.subStorageStatus" :placeholder="this.$t('module.report.substrate.subStorageStatus')" default>
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('module.report.substrate.machineHandID')" prop="machineHandID">
+        <el-input v-model="dataForm.machineHandID" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.machineHandID')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -56,7 +72,7 @@ export default {
       visible: false,
       dataForm: {
         // substrateCode: '',
-        // location: '',
+        // locationName: '',
         // storeTime: '',
         // substrateStatus: '',
         // code: '',
@@ -68,9 +84,19 @@ export default {
         // size: 10,
         // locationStorageSubID: ''
       },
+      options: [
+        {
+          value: 1,
+          label: this.$t('module.report.substrate.load')
+        },
+        {
+          value: 2,
+          label: this.$t('module.report.substrate.unload')
+        }
+      ],
       list: {
         id: '',
-        location: '',
+        locationName: '',
         storeTime: '',
         substrateCode: '',
         substrateStatus: ''
@@ -78,12 +104,6 @@ export default {
       dataRule: {
         substrateCode: [
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
-        ],
-        code: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
-        ],
-        interCode: [
-          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
         ]
       }
     }
@@ -135,13 +155,15 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           const data = {
-            'substrateStatus': this.dataForm.substrateStatus,
+            'status': this.dataForm.status,
             'storeTime': this.dataForm.storeTime,
             'id': this.dataForm.id,
-            'code': this.dataForm.substrateCode,
+            'substrateCode': this.dataForm.substrateCode,
-            'location': this.dataForm.location,
+            'locationName': this.dataForm.locationName,
-            'interCode': this.dataForm.interCode,
+            // 'interCode': this.dataForm.interCode,
-            'storageBoxFid': this.dataForm.storageBoxFid
+            'storageBoxFid': this.dataForm.storageBoxFid,
+            'machineHandID': this.dataForm.machineHandID,
+            'subStorageStatus': this.dataForm.subStorageStatus
           }
           console.log(data)
           updateSubstrate(data).then(res => {

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-16 16:09:15
+ * @LastEditTime: 2022-03-18 14:39:56
 -->
 <template>
   <div class="app-container">
@@ -71,7 +71,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'location',
+    prop: 'locationName',
     label: i18n.t('module.report.substrate.location'),
     align: 'center'
   },
@@ -81,9 +81,19 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'substrateStatus',
+    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'
   }
 ]
 
@@ -161,6 +171,13 @@ export default {
         // console.log(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')
+            }
+          }
           console.log(this.list)
         } else {
           this.list.splice(0, this.list.length)