merge

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/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/ProcessStorageManagement-info.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:52:07
+ * @LastEditTime: 2022-03-17 14:50:20
  * @Description:
 -->
 <template>
@@ -62,7 +62,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'name',
+    prop: 'locationName',
     label: i18n.t('module.basicData.cache.LocationName'),
     align: 'center'
   }

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

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 09:16:10
  * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 16:02:21
+ * @LastEditTime: 2022-03-18 16:33:59
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\processStorageLink.vue
 -->
@@ -11,7 +11,9 @@
     <el-card class="dashboard-main">
       <el-row class="dashboard-title">
         <div class="dashboard-header-line" />
-        <div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
+        <div class="dashboard-header-title">
+          {{ $t("module.dashboard.title") }}
+        </div>
       </el-row>
       <el-row class="dashboard-legend">
         <div
@@ -38,15 +40,28 @@
           <el-button type="primary" size="mini" @click="submitLinkList">{{
             "btn.submit" | i18nFilter
           }}</el-button>
-          <el-button type="warning" size="mini" @click="init()">{{ 'btn.reset' | i18nFilter }}</el-button>
+          <el-button type="warning" size="mini" @click="init()">{{
-          <el-button type="success" size="mini" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
+            "btn.reset" | i18nFilter
+          }}</el-button>
+          <el-button type="success" size="mini" @click="goback()">{{
+            "btn.back" | i18nFilter
+          }}</el-button>
         </div>
         <div class="dashboard-legend-search">
           <el-select
             v-model="current"
             size="mini"
             @change="handleChange"
-          ><el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
+          ><el-option
+            v-for="item in totalPage"
+            :key="'select' + item"
+            :label="
+              $t('module.dashboard.pageHeader') +
+                item +
+                $t('module.dashboard.pageFooter')
+            "
+            :value="item"
+          />
           </el-select>
         </div>
       </el-row>
@@ -98,9 +113,15 @@
                         ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
-                      border:
+                      border: selectStorageList.some(
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        StorageItem =>
-                          ? '1px solid red' : ''
+                          StorageItem.locationId ===
+                          z.portVoList[
+                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                          ].id
+                      )
+                        ? '2px dashed red'
+                        : ''
                     }"
                     @click="
                       setType(
@@ -110,13 +131,55 @@
                       )
                     "
                   >
-                    <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
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                      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="
+                        StorageList.some(
+                          StorageItem =>
+                            StorageItem.id ===
+                            z.portVoList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].id
+                        )"
+                      class="dashboard-layout-item-horn"
+                    />
+                    {{
+                      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>
               <div class="dashboard-layout-footer">
-                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
+                {{
+                  $t(bottomIndex[index]) +
+                    "(" +
+                    ((current - 1) * 4 + item) +
+                    ")"
+                }}
               </div>
             </el-col>
           </el-row>
@@ -125,7 +188,9 @@
       <el-row v-else class="dashboard-layout" :gutter="12">
         <el-col
           v-for="item in Math.ceil(
-            (shelfVoList[0].rowVoList[0].portVoList.length - (current - 1) * 80) / 20
+            (shelfVoList[0].rowVoList[0].portVoList.length -
+              (current - 1) * 80) /
+              20
           )"
           :key="'shelfbox' + item"
           class="dashboard-layout-shelf-box"
@@ -177,9 +242,15 @@
                         ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
-                      border:
+                      border: selectStorageList.some(
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        StorageItem =>
-                          ? '1px solid red' : ''
+                          StorageItem.locationId ===
+                          z.portVoList[
+                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                          ].id
+                      )
+                        ? '2px dashed red'
+                        : ''
                     }"
                     @click="
                       setType(
@@ -189,8 +260,45 @@
                       )
                     "
                   >
-                    <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
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                      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="
+                        StorageList.some(
+                          StorageItem =>
+                            StorageItem.id ===
+                            z.portVoList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].id
+                        )"
+                      class="dashboard-layout-item-horn"
+                    />
+                    {{
+                      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>
@@ -226,9 +334,15 @@
                         ].attribute === '3'
                           ? '#A2A8B5'
                           : '',
-                      border:
+                      border: selectStorageList.some(
-                        selectStorageList.some(StorageItem=>StorageItem.locationId===z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].id)
+                        StorageItem =>
-                          ? '1px solid red' : ''
+                          StorageItem.locationId ===
+                          z.portVoList[
+                            (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                          ].id
+                      )
+                        ? '2px dashed red'
+                        : ''
                     }"
                     @click="
                       setType(
@@ -238,13 +352,55 @@
                       )
                     "
                   >
-                    <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
-                    {{ z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].attribute !== '3' ? z.portVoList[(current - 1) * 80 + (item - 1) * 20 + (x - 1)].name : 'XXXX' }}
+                      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="
+                        StorageList.some(
+                          StorageItem =>
+                            StorageItem.id ===
+                            z.portVoList[
+                              (current - 1) * 80 + (item - 1) * 20 + (x - 1)
+                            ].id
+                        )"
+                      class="dashboard-layout-item-horn"
+                    />
+                    {{
+                      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>
               <div class="dashboard-layout-footer">
-                {{ $t(bottomIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
+                {{
+                  $t(bottomIndex[index]) +
+                    "(" +
+                    ((current - 1) * 4 + item) +
+                    ")"
+                }}
               </div>
             </el-col>
           </el-row>
@@ -261,6 +417,7 @@
 
 <script>
 import { getPortList } from '@/api/dashboard'
+import { locationByProcessList } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import { batchListAdd } from '@/api/basicData/Warehouse/StorageBoxInfo'
 import testdata from './testdata'
 import processStorageType from './processStorageType'
@@ -273,25 +430,53 @@ export default {
   },
   created() {
     this.id = this.$route.query.id
-    this.totalPage = Math.ceil(this.shelfVoList[0].rowVoList[0].portVoList.length / 80)
+    this.totalPage = Math.ceil(
+      this.shelfVoList[0].rowVoList[0].portVoList.length / 80
+    )
     this.init()
   },
   methods: {
     init() {
       getPortList().then(res => {
         this.shelfVoList = res.data[0].shelfVoList
-        this.totalPage = Math.ceil(this.shelfVoList[0].rowVoList[0].portVoList.length / 80)
+        this.totalPage = Math.ceil(
+          this.shelfVoList[0].rowVoList[0].portVoList.length / 80
+        )
+      })
+      locationByProcessList({
+        current: 1,
+        size: 990,
+        workSequenId: this.id
+      }).then(response => {
+        if (response.data.records) {
+          this.StorageList = response.data.records
+        } else {
+          this.StorageList.splice(0, this.StorageList.length)
+        }
       })
       this.selectStorageList.splice(0, this.selectStorageList.length)
     },
     setType(item) {
       if (item.attribute !== '3') {
-        if (this.selectStorageList.findIndex(StorageItem => StorageItem.locationId === item.id) + 1) {
+        if (
-          this.selectStorageList.splice(this.selectStorageList.findIndex(StorageItem => StorageItem.locationId === item.id), 1)
+          this.selectStorageList.findIndex(
+            StorageItem => StorageItem.locationId === item.id
+          ) + 1
+        ) {
+          this.selectStorageList.splice(
+            this.selectStorageList.findIndex(
+              StorageItem => StorageItem.locationId === item.id
+            ),
+            1
+          )
         } else {
+          const isExist = this.StorageList.some(
+            StorageItem =>
+              StorageItem.id === item.id
+          )
           this.typeVisible = true
           this.$nextTick(() => {
-            this.$refs.typeRef.init(item.id, item.name)
+            this.$refs.typeRef.init(item.id, item.name, item.attribute, isExist)
           })
         }
       }
@@ -312,22 +497,34 @@ export default {
           workSequenId: this.id,
           processLocationStorageList: this.selectStorageList
         }
-        this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
+        this.$confirm(
-          confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
+          `${this.$t(
-          cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
+            'module.basicData.visual.TipsStorageBefore'
-          type: 'warning'
+          )}[${tipArr.join(',')}]?`,
-        }).then(() => {
+          this.$t('module.basicData.visual.Tips'),
-          batchListAdd(obj).then(res => {
+          {
-            this.$message({
+            confirmButtonText: this.$t(
-              message: this.$t('module.basicData.visual.success'),
+              'module.basicData.visual.confirmButtonText'
-              type: 'success',
+            ),
-              duration: 1500,
+            cancelButtonText: this.$t(
-              onClose: () => {
+              'module.basicData.visual.cancelButtonText'
-                this.init()
+            ),
-              }
+            type: 'warning'
+          }
+        )
+          .then(() => {
+            batchListAdd(obj).then(res => {
+              this.$message({
+                message: this.$t('module.basicData.visual.success'),
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.init()
+                }
+              })
             })
           })
-        }).catch(() => {})
+          .catch(() => {})
       } else {
         this.$message({
           message: this.$t('module.basicData.visual.PleaseAddLocationFirst'),
@@ -427,6 +624,7 @@ export default {
               display: flex;
               align-items: center;
               justify-content: center;
+              position: relative;
               .dashboard-layout-item-cricle {
                 display: inline-block;
                 width: 12px;
@@ -434,6 +632,16 @@ export default {
                 border-radius: 6px;
                 margin-right: 6px;
               }
+              .dashboard-layout-item-horn {
+                position: absolute;
+                width: 0;
+                height: 0;
+                right: 0;
+                top: 0;
+                border-style: solid;
+                border-width: 14px 0px 0px 14px;
+                border-color: #0B58FF transparent transparent transparent;
+              }
             }
           }
         }

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:47:01
+ * @LastEditTime: 2022-03-18 09:39:09
  * @Description:
 -->
 <template>
@@ -18,9 +18,9 @@
       label-position="left"
     >
       <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">
-        <el-radio v-model="dataForm.portAttrId" :label="1">Working Port</el-radio>
+        <el-radio v-model="dataForm.portAttrId" label="1">Working Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="2">Buffer Port</el-radio>
+        <el-radio v-model="dataForm.portAttrId" label="2">Buffer Port</el-radio>
-        <el-radio v-model="dataForm.portAttrId" :label="3">Exception Port</el-radio>
+        <el-radio v-model="dataForm.portAttrId" label="3">Exception Port</el-radio>
       </el-form-item>
       <el-form-item :label="$t('module.basicData.storageBox.name')" prop="storageId">
         <el-select v-model="dataForm.storageId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.storageBox.name')])" clearable>
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+import { getPortDetail } from '@/api/dashboard'
 import { storageBoxList } from '@/api/basicData/Cache/storageBox'
 
 export default {
@@ -50,7 +51,7 @@ export default {
       locationId: '',
       locationName: '',
       dataForm: {
-        portAttrId: 1,
+        portAttrId: '1',
         storageId: ''
       },
       dataRule: {
@@ -65,7 +66,7 @@ export default {
     }
   },
   methods: {
-    init(id, name) {
+    init(id, name, attribute, isExist) {
       this.locationId = id
       this.locationName = name
       const listQuery = {
@@ -81,6 +82,16 @@ export default {
       })
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
+        if (attribute) {
+          this.dataForm.portAttrId = attribute
+        } else {
+          this.dataForm.portAttrId = '1'
+        }
+        if (isExist) {
+          getPortDetail(id).then(res => {
+            if (res.code === 0) { this.dataForm.storageId = res.data.storageBoxId }
+          })
+        }
       })
       this.visible = true
     },

src/views/basicData/Warehouse/components/testdata.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-03 15:47:47
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:43:36
+ * @LastEditTime: 2022-03-17 09:05:02
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
  */
@@ -2603,6 +2603,7 @@ export default {
     4: '#FFA08F'
   },
   selectStorageList: [],
+  StorageList: [],
   typeVisible: false,
   id: '',
   bottomIndex: ['module.dashboard.first', 'module.dashboard.second'],

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)